From 2666deec0c36aa0848e53a9059020bec5530a1af Mon Sep 17 00:00:00 2001 From: Eddy Pronk Date: Thu, 30 Jun 2022 05:40:29 +1000 Subject: [PATCH 001/791] [lz4] Patch for CVE-2021-3520 (#25421) * [lz4] Patch for CVE-2021-3520 See https://nvd.nist.gov/vuln/detail/CVE-2021-3520 for more details This is the upstream patch by Jasper Lievisse Adriaanse. "Fix potential memory corruption with negative memmove() size" https://github.com/lz4/lz4/pull/972 * Added license to lz4/vcpkg.json --- ...mory-corruption-with-negative-memmov.patch | 26 +++++++++++++++++++ ports/lz4/portfile.cmake | 2 ++ ports/lz4/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/lz4.json | 5 ++++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100755 ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch diff --git a/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch b/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch new file mode 100755 index 00000000000000..d6f444810c0f08 --- /dev/null +++ b/ports/lz4/0001-Fix-potential-memory-corruption-with-negative-memmov.patch @@ -0,0 +1,26 @@ +From 8301a21773ef61656225e264f4f06ae14462bca7 Mon Sep 17 00:00:00 2001 +From: Jasper Lievisse Adriaanse +Date: Fri, 26 Feb 2021 15:21:20 +0100 +Subject: [PATCH 001/120] Fix potential memory corruption with negative + memmove() size + +--- + lib/lz4.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/lz4.c b/lib/lz4.c +index 5f524d0..c2f504e 100644 +--- a/lib/lz4.c ++++ b/lib/lz4.c +@@ -1749,7 +1749,7 @@ LZ4_decompress_generic( + const size_t dictSize /* note : = 0 if noDict */ + ) + { +- if (src == NULL) { return -1; } ++ if ((src == NULL) || (outputSize < 0)) { return -1; } + + { const BYTE* ip = (const BYTE*) src; + const BYTE* const iend = ip + srcSize; +-- +2.36.1 + diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake index 80bcecc38bfa3c..a2e3b74f9118cb 100644 --- a/ports/lz4/portfile.cmake +++ b/ports/lz4/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.9.3 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c HEAD_REF dev + PATCHES + 0001-Fix-potential-memory-corruption-with-negative-memmov.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/lz4/vcpkg.json b/ports/lz4/vcpkg.json index 5167b44adedbab..597e902dd15c35 100644 --- a/ports/lz4/vcpkg.json +++ b/ports/lz4/vcpkg.json @@ -1,9 +1,10 @@ { "name": "lz4", "version": "1.9.3", - "port-version": 3, + "port-version": 4, "description": "Lossless compression algorithm, providing compression speed at 400 MB/s per core.", "homepage": "https://github.com/lz4/lz4", + "license": "BSD-2-Clause AND GPL-2.0-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index f5f5e62f6a7569..889f5a31ca3e4b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4370,7 +4370,7 @@ }, "lz4": { "baseline": "1.9.3", - "port-version": 3 + "port-version": 4 }, "lzfse": { "baseline": "1.0", diff --git a/versions/l-/lz4.json b/versions/l-/lz4.json index bfb6a07c4989f5..78c007c5756fa3 100644 --- a/versions/l-/lz4.json +++ b/versions/l-/lz4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3b3f8d7799086d118dd166c346665ad71b66c19", + "version": "1.9.3", + "port-version": 4 + }, { "git-tree": "43957fa49e865966b52c6729db11aa067f790d49", "version": "1.9.3", From 032d9d0820db290ce9ff644dabfdf564343013ae Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 29 Jun 2022 13:16:33 -0700 Subject: [PATCH 002/791] Update nodejs to 16.15.1. (#25488) --- scripts/vcpkgTools.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 59fab499168722..9b32fe40643276 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -201,24 +201,24 @@ PowerShell-7.2.4-win-x86.zip - 16.12.0 - node-v16.12.0-win-x64\node.exe - https://nodejs.org/dist/v16.12.0/node-v16.12.0-win-x64.7z - 0bb793fce8140bd59c17f3ac9661b062eac0f611d704117774f5cb2453d717da94b1e8b17d021d47baff598dc023fb7068ed1f8a7678e446260c3db3537fa888 - node-v16.12.0-win-x64.7z + 16.15.1 + node-v16.15.1-win-x64\node.exe + https://nodejs.org/dist/v16.15.1/node-v16.15.1-win-x64.7z + 7ec4bfe2ea6034e1461e306b6372d62c0c5d1060c453ba76a73a5cec38ac26b5952a744caa9071455329caa58eb0a96d26c68854c8915c17610ff27b0cf2c1cf + node-v16.15.1-win-x64.7z - 16.12.0 - node-v16.12.0-linux-x64/bin/node - https://nodejs.org/dist/v16.12.0/node-v16.12.0-linux-x64.tar.gz - 45658083c35c13f2bc4b88d68a12c76213bdaf2235776e041c9937ce912a83cb49d655965568c99a5e139ff5c03b1e460c13ad8ab7f0c5570b531907715f6e0f - node-v16.12.0-linux-x64.tar.gz + 16.15.1 + node-v16.15.1-linux-x64/bin/node + https://nodejs.org/dist/v16.15.1/node-v16.15.1-linux-x64.tar.gz + 5ad3b4b9caeaa8d31503efa99f5a593118a267dec9d4181d019732126ba248ce9a901207115b3f6b899eb5b3f0373c7f77ea95cc92ac625cddf437ee9b8b8919 + node-v16.15.1-linux-x64.tar.gz - 16.12.0 - node-v16.12.0-darwin-x64/bin/node - https://nodejs.org/dist/v16.12.0/node-v16.12.0-darwin-x64.tar.gz - f758a90d3dcc3adf296abbed01b69a3a27e63c2085b7f604d83550714b1ac374f36e73fc02dd31bf60e532205d92e1605a05b35642142d20ac07c4bb98c69f70 - node-v16.12.0-darwin-x64.tar.gz + 16.15.1 + node-v16.15.1-darwin-x64/bin/node + https://nodejs.org/dist/v16.15.1/node-v16.15.1-darwin-x64.tar.gz + 90d0612bbe5467b6cf385c91a68b8daad0057e3e0ccacea44567f5b95b14f7481cb79784185ab1463b4bd990e092ff0f9109576d1a1934b84e1c816582929611 + node-v16.15.1-darwin-x64.tar.gz From a61559a81b9dfdfb3ef9155ef83f68cc339207a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 29 Jun 2022 21:38:17 +0000 Subject: [PATCH 003/791] [openssl] Change repo to github and update to 3.0.4 (#25451) * [openssl] Change repo to github and update to 3.0.4 * version --- ports/openssl/portfile.cmake | 17 ++++++--- ports/openssl/unix/portfile.cmake | 10 +---- ports/openssl/uwp/portfile.cmake | 5 --- ports/openssl/vcpkg.json | 3 +- ports/openssl/windows/flags.patch | 57 +++++++++++++++++----------- ports/openssl/windows/portfile.cmake | 6 --- versions/baseline.json | 4 +- versions/o-/openssl.json | 5 +++ 8 files changed, 56 insertions(+), 51 deletions(-) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 36a8f4b774b913..7ea9843df55a53 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -11,13 +11,18 @@ It can be installed on alpine systems via apk add linux-headers.]] ) endif() -set(OPENSSL_VERSION 3.0.3) +set(OPENSSL_VERSION 3.0.4) -vcpkg_download_distfile( - ARCHIVE - URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" - FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 949472025211fabdaf2564122f0a9a3baef0facb6373e90cf6c4485164a50898050b179722d0b358c4d8cf1787384ea30d5fd03b98757634631d3e8978509b1a +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) + set(OPENSSL_PATCHES "${CMAKE_CURRENT_LIST_DIR}/windows/flags.patch") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO openssl/openssl + REF openssl-${OPENSSL_VERSION} + SHA512 c58b439addbfc0901cb8d99036494bac60d24a4311815b9b7a559f5daaa027d4b83e49e2eb526f0552ec53f09be89081a08c20b8b6f20a2463081cdb071d6faf + PATCHES ${OPENSSL_PATCHES} ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index c1c2b0ecbd940f..319b7e3905a027 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -1,9 +1,3 @@ -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH MASTER_COPY_SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF ${OPENSSL_VERSION} -) - if(CMAKE_HOST_WIN32) vcpkg_acquire_msys(MSYS_ROOT PACKAGES make perl) set(MAKE "${MSYS_ROOT}/usr/bin/make.exe") @@ -18,7 +12,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${CMAKE_CURRENT_LIST_DIR}" OPTIONS - -DSOURCE_PATH=${MASTER_COPY_SOURCE_PATH} + -DSOURCE_PATH=${SOURCE_PATH} -DPERL=${PERL} -DMAKE=${MAKE} -DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY} @@ -35,4 +29,4 @@ foreach(HEADER ${HEADERS}) endforeach() file(INSTALL ${RESOLVED_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/openssl") -file(INSTALL "${MASTER_COPY_SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openssl/uwp/portfile.cmake b/ports/openssl/uwp/portfile.cmake index 6283806314f368..bb8379dceca686 100644 --- a/ports/openssl/uwp/portfile.cmake +++ b/ports/openssl/uwp/portfile.cmake @@ -7,11 +7,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPENSSL_SHARED shared) endif() -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} -) - vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 507ecf971e565c..d407c6e5539cfc 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version": "3.0.3", - "port-version": 2, + "version": "3.0.4", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/ports/openssl/windows/flags.patch b/ports/openssl/windows/flags.patch index 90f0e891078381..69b203c0dd6285 100644 --- a/ports/openssl/windows/flags.patch +++ b/ports/openssl/windows/flags.patch @@ -1,22 +1,35 @@ -diff --git a/Configure b/Configure -index faf57b1..690a9b8 100644 ---- a/Configure -+++ b/Configure -@@ -556,7 +556,7 @@ my $list_separator_re = - # (we supported those before the change to "make variable" support. - my %user = ( - AR => env('AR'), -- ARFLAGS => [], -+ ARFLAGS => [ env('ARFLAGS') || () ], - AS => undef, - ASFLAGS => [], - CC => env('CC'), -@@ -569,7 +569,7 @@ my %user = ( - CPPINCLUDES => [], # Alternative for -I - CROSS_COMPILE => env('CROSS_COMPILE'), - HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'), -- LD => undef, -+ LD => env('LD'), - LDFLAGS => [ env('LDFLAGS') || () ], # -L, -Wl, - LDLIBS => [ env('LDLIBS') || () ], # -l - MT => undef, +diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf +index 66bc81d..2364633 100644 +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf +@@ -1302,7 +1302,7 @@ my %targets = ( + inherit_from => [ "BASE_Windows" ], + template => 1, + CC => "cl", +- CPP => '"$(CC)" /EP /C', ++ CPP => '$(CC) /EP /C', + CFLAGS => "/W3 /wd4090 /nologo", + coutflag => "/Fo", + LD => "link", +diff --git a/Configure b/Configure +index 8b234f6..e031768 100644 +--- a/Configure ++++ b/Configure +@@ -680,7 +680,7 @@ my $list_separator_re = + # (we supported those before the change to "make variable" support. + my %user = ( + AR => env('AR'), +- ARFLAGS => [], ++ ARFLAGS => [ env('ARFLAGS') || () ], + AS => undef, + ASFLAGS => [], + CC => env('CC'), +@@ -693,7 +693,7 @@ my %user = ( + CPPINCLUDES => [], # Alternative for -I + CROSS_COMPILE => env('CROSS_COMPILE'), + HASHBANGPERL=> env('HASHBANGPERL') || env('PERL'), +- LD => undef, ++ LD => env('LD'), + LDFLAGS => [ env('LDFLAGS') || () ], # -L, -Wl, + LDLIBS => [ env('LDLIBS') || () ], # -l + MT => undef, diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 86b6e1957b76ed..b2b6d17af66d01 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -1,9 +1,3 @@ -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/flags.patch" -) - vcpkg_find_acquire_program(NASM) get_filename_component(NASM_EXE_PATH "${NASM}" DIRECTORY) vcpkg_add_to_path(PREPEND "${NASM_EXE_PATH}") diff --git a/versions/baseline.json b/versions/baseline.json index 889f5a31ca3e4b..1801b90d03fa81 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5217,8 +5217,8 @@ "port-version": 1 }, "openssl": { - "baseline": "3.0.3", - "port-version": 2 + "baseline": "3.0.4", + "port-version": 0 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index c312ffc0815879..715d06e2ad578c 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b300461cf187df328c5d2269448840306f64a4e1", + "version": "3.0.4", + "port-version": 0 + }, { "git-tree": "cdd8b7c5c9ebba05598bc90a58f224f13cf0b611", "version": "3.0.3", From 69cd3402c0010442add4a3ce9fe82b641b4abc3c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 29 Jun 2022 23:47:44 +0200 Subject: [PATCH 004/791] [vcpkg_setup_pkgconfig_path] Fix backup/restore (#25361) * Unit-test vcpkg_backup/restore_env_vars * Unit-test z_vcpkg_setup/restore_pkgconfig_path * Fix z_vcpkg_setup_pkgconfig_path env var backup * Move parent-scoping into vcpkg_backup_env_variables command * Test repeated restore * Unset z_vcpkg_backup_env_variables_arg_vars * Documentation updates * Inline pkgconfig env vars backup * Revert obsolete changes * Fix typo * Remove duplicate doc file --- .../z_vcpkg_setup_pkgconfig_path.cmake.md | 11 ------ .../cmake/z_vcpkg_setup_pkgconfig_path.cmake | 16 +++++++- .../test_ports/unit-test-cmake/portfile.cmake | 38 +++++++++++++++++++ .../test-vcpkg_backup_restore_env_vars.cmake | 38 +++++++++++++++++++ .../test-z_vcpkg_setup_pkgconfig_path.cmake | 22 +++++++++++ scripts/test_ports/unit-test-cmake/vcpkg.json | 10 ++++- 6 files changed, 121 insertions(+), 14 deletions(-) delete mode 100644 docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md create mode 100644 scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake create mode 100644 scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake diff --git a/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md b/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md deleted file mode 100644 index f1a9290a614d75..00000000000000 --- a/docs/maintainers/internal/z_vcpkg_setup_pkgconfig_path.cmake.md +++ /dev/null @@ -1,11 +0,0 @@ -# z_vcpkg_setup_pkgconfig_path - -Setup the generated pkgconfig file path to PKG_CONFIG_PATH environment variable or restore PKG_CONFIG_PATH environment variable. - -```cmake -z_vcpkg_setup_pkgconfig_path(BASE_DIRS <"${CURRENT_INSTALLED_DIR}" ...>) -z_vcpkg_restore_pkgconfig_path() -``` - -`z_vcpkg_setup_pkgconfig_path` prepends `lib/pkgconfig` and `share/pkgconfig` directories for the given `BASE_DIRS` to the `PKG_CONFIG_PATH` environment variable. It creates or updates a backup of the previous value. -`z_vcpkg_restore_pkgconfig_path` shall be called when leaving the scope which called `z_vcpkg_setup_pkgconfig_path` in order to restore the original value from the backup. diff --git a/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake b/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake index 369fe77b2f8710..628b71b0183ff0 100644 --- a/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake +++ b/scripts/cmake/z_vcpkg_setup_pkgconfig_path.cmake @@ -8,7 +8,13 @@ function(z_vcpkg_setup_pkgconfig_path) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - vcpkg_backup_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) + foreach(envvar IN ITEMS PKG_CONFIG PKG_CONFIG_PATH) + if(DEFINED ENV{${envvar}}) + set("z_vcpkg_env_backup_${envvar}" "$ENV{${envvar}}" PARENT_SCOPE) + else() + unset("z_vcpkg_env_backup_${envvar}" PARENT_SCOPE) + endif() + endforeach() vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(pkgconfig_path "${PKGCONFIG}" DIRECTORY) @@ -31,5 +37,11 @@ function(z_vcpkg_restore_pkgconfig_path) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) + foreach(envvar IN ITEMS PKG_CONFIG PKG_CONFIG_PATH) + if(DEFINED z_vcpkg_env_backup_${envvar}) + set("ENV{${envvar}}" "${z_vcpkg_env_backup_${envvar}}") + else() + unset("ENV{${envvar}}") + endif() + endforeach() endfunction() diff --git a/scripts/test_ports/unit-test-cmake/portfile.cmake b/scripts/test_ports/unit-test-cmake/portfile.cmake index 96cc06f63c6b2e..c1f0e85a9770ea 100644 --- a/scripts/test_ports/unit-test-cmake/portfile.cmake +++ b/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -113,6 +113,38 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) endif() endfunction() +function(unit_test_check_variable_not_equal utcve_test utcve_variable utcve_value) + cmake_language(EVAL CODE "${utcve_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + unset_fatal_error() + set_has_error() + message(STATUS "${utcve_test} had an unexpected FATAL_ERROR; + expected: \"${utcve_value}\"") + message(STATUS "FATAL_ERROR: ${Z_VCPKG_UNIT_TEST_FATAL_ERROR}") + return() + endif() + + unit_test_match(utcve "${utcve_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) + if(utcve_MATCHED) + if("${utcve_CMAKE_MATCH_1}" STREQUAL "ENV") + set(utcve_actual_value "$ENV{${utcve_CMAKE_MATCH_2}}") + elseif("${utcve_CMAKE_MATCH_1}" STREQUAL "CACHE") + set(utcve_actual_value "$CACHE{${utcve_CMAKE_MATCH_2}}") + else() + _message(FATAL_ERROR "unexpected value for CMAKE_MATCH_1: ${utcve_CMAKE_MATCH_1}") + endif() + else() + set(utcve_actual_value "${${utcve_variable}}") + endif() + + if("${utcve_actual_value}" STREQUAL "${utcve_value}") + message(STATUS "${utcve_test} failed to change ${utcve_variable}; + unchanged: \"${utcve_value}\"") + set_has_error() + return() + endif() +endfunction() + function(unit_test_ensure_success utcve_test) cmake_language(EVAL CODE "${utcve_test}") if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) @@ -147,6 +179,12 @@ endif() if("merge-libs" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_cmake_config_fixup_merge.cmake") endif() +if("backup-restore-env-vars" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_backup_restore_env_vars.cmake") +endif() +if("setup-pkgconfig-path" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_setup_pkgconfig_path.cmake") +endif() if(Z_VCPKG_UNIT_TEST_HAS_ERROR) _message(FATAL_ERROR "At least one test failed") diff --git a/scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake b/scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake new file mode 100644 index 00000000000000..ae010b3c6d8d90 --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/test-vcpkg_backup_restore_env_vars.cmake @@ -0,0 +1,38 @@ +# vcpkg_backup_env_variables(VARS ) +# vcpkg_restore_env_variables(VARS ) +# These functions used scoped variables and cannot be called in unit_test_check_*. + +set(ENV{A} [[::a;::b]]) +set(ENV{B} [[]]) + +# Backup doesn't change variables. +vcpkg_backup_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) + +# Restore restores. +set(ENV{A} [[::a;::b;::c]]) +set(ENV{B} [[::1]]) +vcpkg_restore_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) + +# Restore can be called more than once. +set(ENV{A} [[::a;::b;::c]]) +set(ENV{B} [[::1]]) +vcpkg_restore_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) + +# Backups are scoped. +function(change_and_backup) + set(ENV{A} [[::a;::b;::c]]) + set(ENV{B} [[::1]]) + vcpkg_backup_env_variables(VARS A B) + # no further change, no restore, in this scope +endfunction() +vcpkg_backup_env_variables(VARS A B) +change_and_backup() +vcpkg_restore_env_variables(VARS A B) +unit_test_check_variable_equal([[]] ENV{A} [[::a;::b]]) +unit_test_check_variable_equal([[]] ENV{B} [[]]) diff --git a/scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake b/scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake new file mode 100644 index 00000000000000..3ae9c865771089 --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/test-z_vcpkg_setup_pkgconfig_path.cmake @@ -0,0 +1,22 @@ +# z_vcpkg_setup_pkgconfig_path(BASE_DIR ) +# z_vcpkg_restore_pkgconfig_path() + +# These functions use vcpkg_backup/restore_env_variables which use scoped variables +# and cannot be called in unit_test_check_*. + +set(ENV{PKG_CONFIG} "/a/pkgconf") +set(ENV{PKG_CONFIG_PATH} "1") +set(saved_path "$ENV{PATH}") + +z_vcpkg_setup_pkgconfig_path(BASE_DIRS "/2") +unit_test_check_variable_equal([[]] ENV{PKG_CONFIG} [[/a/pkgconf]]) +unit_test_check_variable_not_equal([[]] ENV{PKG_CONFIG_PATH} "1") + +z_vcpkg_restore_pkgconfig_path() +unit_test_check_variable_equal([[]] ENV{PKG_CONFIG} [[/a/pkgconf]]) +unit_test_check_variable_equal([[]] ENV{PKG_CONFIG_PATH} "1") + +# z_vcpkg_setup_pkgconfig_path changes PATH but it is not restored. +# It is hard to see which side effects a restore would have, so +# this is expected behaviour for now. +unit_test_check_variable_not_equal([[]] ENV{PATH} "${saved_path}") diff --git a/scripts/test_ports/unit-test-cmake/vcpkg.json b/scripts/test_ports/unit-test-cmake/vcpkg.json index 32696b4402e602..378765428a42d2 100644 --- a/scripts/test_ports/unit-test-cmake/vcpkg.json +++ b/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -4,13 +4,18 @@ "description": "Ensures that the CMake scripts are unit tested.", "supports": "x64", "default-features": [ + "backup-restore-env-vars", "function-arguments", "host-path-list", "list", "merge-libs", - "minimum-required" + "minimum-required", + "setup-pkgconfig-path" ], "features": { + "backup-restore-env-vars": { + "description": "Test the vcpkg_backup/restore_env_vars functions" + }, "function-arguments": { "description": "Test the z_vcpkg_function_arguments function" }, @@ -31,6 +36,9 @@ }, "minimum-required": { "description": "Test the vcpkg_minimum_required function" + }, + "setup-pkgconfig-path": { + "description": "Test the z_vcpkg_setup/restore_pkgconfig_path functions" } } } From 339a9f5e1347976d69e369e4ec99e8e59d321acc Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 30 Jun 2022 06:48:26 +0800 Subject: [PATCH 005/791] [nanogui] add glad support (#25169) * add glad support * use Glad in windows * Fix glad linkage issue * update * add license * format * update license --- ports/nanogui/fix-glad-dependence.patch | 101 ++++++++++++++++++++++++ ports/nanogui/portfile.cmake | 26 ++++-- ports/nanogui/vcpkg.json | 17 +++- versions/baseline.json | 2 +- versions/n-/nanogui.json | 5 ++ 5 files changed, 141 insertions(+), 10 deletions(-) create mode 100644 ports/nanogui/fix-glad-dependence.patch diff --git a/ports/nanogui/fix-glad-dependence.patch b/ports/nanogui/fix-glad-dependence.patch new file mode 100644 index 00000000000000..03a3475ccde01f --- /dev/null +++ b/ports/nanogui/fix-glad-dependence.patch @@ -0,0 +1,101 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3fe6f5d..22dc16f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,7 +87,7 @@ endif() + + # Shared library mode: add dllimport/dllexport flags to all symbols + if (NANOGUI_BUILD_SHARED) +- list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_SHARED -DNVG_SHARED -DGLAD_GLAPI_EXPORT) ++ list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_SHARED -DNVG_SHARED) + endif() + + if (MSVC) +@@ -196,21 +196,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + endif() + endif() + +-if (NANOGUI_USE_GLAD) +- # Build and include GLAD on Windows +- list(APPEND LIBNANOGUI_EXTRA_SOURCE +- "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/src/glad.c" +- "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include/glad/glad.h" +- "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include/KHR/khrplatform.h") +- if (MSVC) +- set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/src/glad.c" +- PROPERTIES COMPILE_FLAGS "/wd4055 ") +- endif() +- include_directories(ext/glad/include) +- list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_GLAD) +- list(APPEND NANOGUI_EXTRA_INCS "${CMAKE_CURRENT_SOURCE_DIR}/ext/glad/include") +-endif() +- + list(APPEND NANOGUI_EXTRA_INCS + "${CMAKE_CURRENT_SOURCE_DIR}/ext/glfw/include" + "${CMAKE_CURRENT_SOURCE_DIR}/ext/nanovg/src" +@@ -299,8 +284,6 @@ if (APPLE) + add_compile_options(-fobjc-arc) + endif() + +-add_definitions(${NANOGUI_EXTRA_DEFS}) +- + # Compile main NanoGUI library + add_library(nanogui-obj OBJECT + # Merge NanoVG into the NanoGUI library +@@ -373,6 +356,14 @@ find_package(Eigen3 CONFIG REQUIRED) + find_package(glfw3 CONFIG REQUIRED) + target_link_libraries(nanogui glfw nanovg::nanovg Eigen3::Eigen) + ++if (NANOGUI_USE_GLAD) ++ find_package(glad CONFIG REQUIRED) ++ target_link_libraries(nanogui glad::glad) ++ list(APPEND NANOGUI_EXTRA_DEFS -DNANOGUI_GLAD) ++endif() ++ ++add_definitions(${NANOGUI_EXTRA_DEFS}) ++ + if (NANOGUI_BUILD_SHARED) + set_property(TARGET nanogui-obj PROPERTY POSITION_INDEPENDENT_CODE ON) + endif() +@@ -380,11 +371,6 @@ endif() + # Compile/link flags for NanoGUI + set_property(TARGET nanogui-obj APPEND PROPERTY COMPILE_DEFINITIONS "NANOGUI_BUILD;NVG_BUILD") + +-if (NANOGUI_USE_GLAD AND NANOGUI_BUILD_SHARED) +- set_property(TARGET nanogui-obj APPEND PROPERTY COMPILE_DEFINITIONS +- "GLAD_GLAPI_EXPORT;GLAD_GLAPI_EXPORT_BUILD") +-endif() +- + if (NANOGUI_BUILD_SHARED) + target_link_libraries(nanogui ${NANOGUI_EXTRA_LIBS}) + endif() +diff --git a/include/nanogui/opengl.h b/include/nanogui/opengl.h +index f5abcb2..1c20653 100644 +--- a/include/nanogui/opengl.h ++++ b/include/nanogui/opengl.h +@@ -17,10 +17,6 @@ + + #ifndef DOXYGEN_SHOULD_SKIP_THIS + #if defined(NANOGUI_GLAD) +- #if defined(NANOGUI_SHARED) && !defined(GLAD_GLAPI_EXPORT) +- #define GLAD_GLAPI_EXPORT +- #endif +- + #include + #else + #if defined(__APPLE__) +diff --git a/src/example3.cpp b/src/example3.cpp +index 3d2ecfa..72deaa8 100644 +--- a/src/example3.cpp ++++ b/src/example3.cpp +@@ -14,10 +14,6 @@ + // GLFW + // + #if defined(NANOGUI_GLAD) +- #if defined(NANOGUI_SHARED) && !defined(GLAD_GLAPI_EXPORT) +- #define GLAD_GLAPI_EXPORT +- #endif +- + #include + #else + #if defined(__APPLE__) diff --git a/ports/nanogui/portfile.cmake b/ports/nanogui/portfile.cmake index 937c2c0a00d94e..390f54bd454951 100644 --- a/ports/nanogui/portfile.cmake +++ b/ports/nanogui/portfile.cmake @@ -1,3 +1,10 @@ +if (VCPKG_HOST_IS_WINDOWS) + set(USE_GLAD -DNANOGUI_USE_GLAD=ON) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +else() + set(USE_GLAD -DNANOGUI_USE_GLAD=OFF) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wjakob/nanogui @@ -6,18 +13,25 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-cmakelists.patch + fix-glad-dependence.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "example" NANOGUI_BUILD_EXAMPLE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DNANOGUI_EIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 -DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 + ${USE_GLAD} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nanogui/vcpkg.json b/ports/nanogui/vcpkg.json index f075b3dc6a87e2..a53f09f69b8dfe 100644 --- a/ports/nanogui/vcpkg.json +++ b/ports/nanogui/vcpkg.json @@ -1,13 +1,24 @@ { "name": "nanogui", "version-date": "2019-09-23", - "port-version": 3, + "port-version": 4, "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", "homepage": "https://github.com/wjakob/nanogui", + "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ "eigen3", + "glad", "glfw3", - "nanovg" - ] + "nanovg", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "example": { + "description": "Build NanoGUI example application" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 1801b90d03fa81..eff4c418ae0545 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4798,7 +4798,7 @@ }, "nanogui": { "baseline": "2019-09-23", - "port-version": 3 + "port-version": 4 }, "nanomsg": { "baseline": "1.1.5", diff --git a/versions/n-/nanogui.json b/versions/n-/nanogui.json index 25cc3e33a729fd..332617a16955aa 100644 --- a/versions/n-/nanogui.json +++ b/versions/n-/nanogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b0c7f8295a21f967bfd880956f6d51b98d26874", + "version-date": "2019-09-23", + "port-version": 4 + }, { "git-tree": "55a7f3e088fe04ac01f7693c0685770ba865e6ae", "version-date": "2019-09-23", From 82601c43686f3ab5703cec30ee84986bdd146372 Mon Sep 17 00:00:00 2001 From: jureviciusr Date: Thu, 30 Jun 2022 08:09:44 +0200 Subject: [PATCH 006/791] [dv-processing] Add New port for dv processing (#25273) * New port for dv-processing library * formatting manifest * Version update in manifest * Adding to the versioning system * Better compatibility for compiler checking when installing * Version update * Not using archive release anymore; cli11 is now a vcpkg dependency; cmakemod cloned and copied to the correct directory * Version update Co-authored-by: Rokas Jurevicius --- ports/dv-processing/portfile.cmake | 39 +++++++++++++ ports/dv-processing/vcpkg-build.patch | 84 +++++++++++++++++++++++++++ ports/dv-processing/vcpkg.json | 33 +++++++++++ versions/baseline.json | 4 ++ versions/d-/dv-processing.json | 9 +++ 5 files changed, 169 insertions(+) create mode 100644 ports/dv-processing/portfile.cmake create mode 100644 ports/dv-processing/vcpkg-build.patch create mode 100644 ports/dv-processing/vcpkg.json create mode 100644 versions/d-/dv-processing.json diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake new file mode 100644 index 00000000000000..39f7a7f9baf451 --- /dev/null +++ b/ports/dv-processing/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com/inivation + OUT_SOURCE_PATH SOURCE_PATH + REPO dv/dv-processing + REF rel_1.4 + SHA512 c011ca0e6d9842913ff35b0a03f9053bfbc98c090b6936e01f6514b8a35d31ee6d0a821f491be96400113e93967aa2d3e8ab19e558f5c3e9f8eba9ad4e1fe013 + HEAD_REF d4ffab46a2849372789c5a2084821011165086ab + PATCHES + vcpkg-build.patch +) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com/inivation + OUT_SOURCE_PATH CMAKEMOD_SOURCE_PATH + REPO dv/cmakemod + REF a4d7eccfdc5f83e399786a77df79b178b762858b + SHA512 4fe9cc5099ab8b41c982df45cbf9a000b2cb1f1c6ed536685943a60520cff49e262ec43af8187177c50a0df2dfca57e7861bf2e7d07834fc16e85c30eb9a9edb + HEAD_REF a4d7eccfdc5f83e399786a77df79b178b762858b +) + +file(GLOB CMAKEMOD_FILES ${CMAKEMOD_SOURCE_PATH}/*) +file(COPY ${CMAKEMOD_FILES} DESTINATION ${SOURCE_PATH}/cmakemod) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_TESTS=OFF + -DENABLE_SAMPLES=OFF + -DENABLE_PYTHON=OFF + -DBUILD_CONFIG_VCPKG=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "dv-processing" CONFIG_PATH "share/dv-processing") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dv-processing/vcpkg-build.patch b/ports/dv-processing/vcpkg-build.patch new file mode 100644 index 00000000000000..7a9f10636c98a3 --- /dev/null +++ b/ports/dv-processing/vcpkg-build.patch @@ -0,0 +1,84 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7775b5..acf6208 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,11 +27,15 @@ IF(Git_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") + ENDIF() + ENDIF() + ++OPTION(BUILD_CONFIG_VCPKG "Set build environment compatible with VCPKG" OFF) ++ + # Basic setup, useful variables, see docs. + SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmakemod ${CMAKE_MODULE_PATH}) + SET(ENABLE_ALL_WARNINGS ON CACHE BOOL "Turn on all warnings for build" FORCE) + INCLUDE(inivation-setup) + ++# Skip compiler compatibility checks when doing the VCPKG build ++if(NOT BUILD_CONFIG_VCPKG) + # Compiler compatibility testing starts GCC has to be at least version 10 + IF(CC_GCC AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "10.0.0") + MESSAGE( +@@ -56,6 +60,7 @@ IF(NOT CC_GCC AND NOT CC_GCC) + ) + ENDIF() + # Compiler compatibility testing ends ++ENDIF() + + # Boost support. Search in extra directory for custom version. + IF(EXISTS /opt/inivation/boost/) +@@ -87,7 +92,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${CMAKE_CURRENT + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + # Cmake find_package() support. +-IF(CC_MSVC) ++IF(BUILD_CONFIG_VCPKG) + SET(CMAKE_EXPORT_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) + ELSE() + SET(CMAKE_EXPORT_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) +@@ -103,8 +108,13 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/cmakemod/inivation-setup.cmake DESTINATION ${CMAKE_EXPORT_DESTINATION}) + +-# External libraries to build +-ADD_SUBDIRECTORY(tests/external/cli11) ++IF (BUILD_CONFIG_VCPKG) ++ # Find CLI11 as an installed package ++ FIND_PACKAGE(CLI11 CONFIG REQUIRED) ++ELSE() ++ # External CLI11 checked-out as a submodule ++ ADD_SUBDIRECTORY(tests/external/cli11) ++ENDIF() + + # Install header files. + ADD_SUBDIRECTORY(include) +diff --git a/dv-processing-config.cmake.in b/dv-processing-config.cmake.in +index 4dbf635..5557dd2 100644 +--- a/dv-processing-config.cmake.in ++++ b/dv-processing-config.cmake.in +@@ -53,10 +53,9 @@ CHECK_REQUIRED_COMPONENTS(dv-processing) + # properly. + INCLUDE(@PACKAGE_CMAKE_EXPORT_DESTINATION@/inivation-setup.cmake) + +-# MSVC/VCPKG finds this differently. +-IF(CC_MSVC) +- FIND_PACKAGE(lz4 CONFIG REQUIRED) +-ENDIF() ++# MSVC/VCPKG finds this differently, try to find it quietly, so it does not complain on non-vcpkg installations ++# and find the package correctly when used with VCPKG. ++FIND_PACKAGE(lz4 CONFIG QUIET) + + # Compiler compatibility testing starts GCC has to be at least version 10 + IF(CC_GCC AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "10.0.0") +diff --git a/include/dv-processing/CMakeLists.txt b/include/dv-processing/CMakeLists.txt +index b83f4e4..621b3f2 100644 +--- a/include/dv-processing/CMakeLists.txt ++++ b/include/dv-processing/CMakeLists.txt +@@ -23,7 +23,7 @@ IF(CC_MSVC) + ENDIF() + + # Compression support +-IF(CC_MSVC) ++IF(BUILD_CONFIG_VCPKG) + FIND_PACKAGE(lz4 CONFIG REQUIRED) + TARGET_LINK_LIBRARIES(processing INTERFACE lz4::lz4) + ELSE() diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json new file mode 100644 index 00000000000000..937e7332805539 --- /dev/null +++ b/ports/dv-processing/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "dv-processing", + "version": "1.4.0", + "description": "Generic algorithms for event cameras.", + "homepage": "https://gitlab.com/inivation/dv/dv-processing", + "license": "Apache-2.0", + "dependencies": [ + "boost-callable-traits", + "boost-circular-buffer", + "boost-geometry", + "boost-lockfree", + "boost-nowide", + "boost-property-tree", + "boost-stacktrace", + "boost-tti", + "cli11", + "eigen3", + "fmt", + "libcaer", + "lz4", + "opencv4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib", + "zstd" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index eff4c418ae0545..42b691909d9488 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1992,6 +1992,10 @@ "baseline": "2.5.0", "port-version": 2 }, + "dv-processing": { + "baseline": "1.4.0", + "port-version": 0 + }, "dx": { "baseline": "1.0.1", "port-version": 2 diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json new file mode 100644 index 00000000000000..1378d9c07e800f --- /dev/null +++ b/versions/d-/dv-processing.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "757cc58887fefa1c48349b91bfaab2e3947b65d9", + "version": "1.4.0", + "port-version": 0 + } + ] +} From a830d3f27b746f6663d16c64672c6f7029ea96ad Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 1 Jul 2022 03:49:52 +0800 Subject: [PATCH 007/791] [daw-json-link] update to v3.0.0 (#25494) * [daw-json-link] update to v3.0.0 * update version --- ports/daw-header-libraries/portfile.cmake | 4 ++-- ports/daw-header-libraries/vcpkg.json | 2 +- ports/daw-json-link/portfile.cmake | 4 ++-- ports/daw-json-link/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/daw-header-libraries.json | 5 +++++ versions/d-/daw-json-link.json | 5 +++++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index da89659fb64598..d2b78b32ceb2ce 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries - REF 7115af99360fec13278b54662fd07f43675a78ae #v2.46.0 - SHA512 0a760e6adb4e10ecc8f14cf83f2fd8f85ec554647b9f4eb6c35b84aa068ed4bba71fdd02bffef78e889c07f5a8589f10fbc6c71e5fe8f5d05ef8fc6e4511b5d0 + REF 67637711bc87f959b6d52adab56a819765b94ae1 #v2.46.2 + SHA512 f9f55ba15b33f2bb5b71fa8a87a189deaa377b848188008d56e884d19d863b4b98ad705d84811f17e2a14e60cc52b8a492fac525a19076e71ecd9dcbdad55dfc HEAD_REF master ) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 3c0a1bf69b71fd..6fc0282fb92dd6 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-header-libraries", - "version": "2.46.0", + "version": "2.46.2", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", "license": "BSL-1.0", diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index e9a330ebf4b675..885418a0f8b182 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link - REF b90116a13ca3e2ce37e6890b309d1fd2c1979ae3 #v2.14.0 - SHA512 d185e0849592d5a871d453a8a27a265c51d5aafb6284b03c64400a9e316afa3f502bd9a1983aed5cfd58509a212e2eb1293887dd672523e71c89c2ec089235ce + REF 76ef0c71a308bf2286b7ac34df4883b14017d02c #v3.0.0 + SHA512 d416f17af7b9d8adf7a7fafdec6b3f8c17275ca778dc5bc71748c3b705ac248c0a51ae02ae9b6b7a1aecd00d814c44d77849be1784d02476a4aaaa680f9db830 HEAD_REF master ) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index e00baf48d57098..13376e52faba65 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-json-link", - "version": "2.14.0", + "version": "3.0.0", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 42b691909d9488..4e473a47117366 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1817,11 +1817,11 @@ "port-version": 0 }, "daw-header-libraries": { - "baseline": "2.46.0", + "baseline": "2.46.2", "port-version": 0 }, "daw-json-link": { - "baseline": "2.14.0", + "baseline": "3.0.0", "port-version": 0 }, "daw-utf-range": { diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index 3cac9f38e59e14..aa8fe6b9de198f 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14d1e3a6c6a143089ec1590f343144aa2c6790d9", + "version": "2.46.2", + "port-version": 0 + }, { "git-tree": "a57c2a8a8ba7fb8017df838e23547eb1933e26b9", "version": "2.46.0", diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 5cfb663126b2c0..77d074a66e9aab 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bcb9a264b390f98488474d1172379e2494f509b", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "9020ee8ee80ac4543a61adb46a83b6b49f6562d4", "version": "2.14.0", From 7d9eff519dd9816da2e0a9a534d8787fdb252c3e Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Thu, 30 Jun 2022 21:50:40 +0200 Subject: [PATCH 008/791] [librdkafka] Upgrade librdkafka up to 1.9.0 (#25462) * Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * [librdkafka] Upgrade up to 1.9.0 * [librdkafka] Upgrade up to 1.9.0 * [librdkafka] Upgrade up to 1.9.0 Co-authored-by: Alexander Smyslov Co-authored-by: Smyslov Alexander Nikolayevich --- ports/librdkafka/portfile.cmake | 4 ++-- ports/librdkafka/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/librdkafka.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 27dee9a2752010..131b1f8d44601b 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO edenhill/librdkafka - REF v1.8.2 - SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22 + REF v1.9.0 + SHA512 d7bff9ef29befa2cb35b52003f7b7da4425f284600dd268b268a36fb1b915917b26cb1a3e78da40eec78cbb12e2f745d2c1e88ac82f19d2beb38aa20b511438f HEAD_REF master PATCHES lz4.patch ) diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 8ab425445c515a..6f410f01bf8e2f 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,7 +1,6 @@ { "name": "librdkafka", - "version": "1.8.2", - "port-version": 2, + "version": "1.9.0", "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4e473a47117366..1610c8bd3c802b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3981,8 +3981,8 @@ "port-version": 7 }, "librdkafka": { - "baseline": "1.8.2", - "port-version": 2 + "baseline": "1.9.0", + "port-version": 0 }, "libressl": { "baseline": "3.4.2", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index ff08e20cbdf18b..db6a1960127bd0 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8d629ff07daf495ff89cf9c3632fce7273a80c0", + "version": "1.9.0", + "port-version": 0 + }, { "git-tree": "0583e5dcb6a79a29685250e2b43ca1cd2a798d96", "version": "1.8.2", From 250d199aa1e246e386858422abbd44b57a25f701 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 1 Jul 2022 03:52:49 +0800 Subject: [PATCH 009/791] [sqlite3] Remove the restriction of using find_dependency(Threads) only under static linking (#25460) * [sqlite3] Remove the restriction of using find_dependency(Threads) only under static linking * x-add-version Co-authored-by: Cheney-Wang --- ports/sqlite3/sqlite3-config.in.cmake | 2 +- ports/sqlite3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sqlite3/sqlite3-config.in.cmake b/ports/sqlite3/sqlite3-config.in.cmake index e7e26bf2cde563..fac63e6c058a2f 100644 --- a/ports/sqlite3/sqlite3-config.in.cmake +++ b/ports/sqlite3/sqlite3-config.in.cmake @@ -1,5 +1,5 @@ -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) +if(NOT WIN32) include(CMakeFindDependencyMacro) find_dependency(Threads) endif() diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index f59f84fc6d0341..c53804b7009c50 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlite3", "version": "3.37.2", - "port-version": 1, + "port-version": 2, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://github.com/sqlite/sqlite", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index 1610c8bd3c802b..400bfcbff16ced 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6802,7 +6802,7 @@ }, "sqlite3": { "baseline": "3.37.2", - "port-version": 1 + "port-version": 2 }, "sqlitecpp": { "baseline": "3.1.1", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 419fec4f39e3e7..db836a2df92a0e 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b96d4235bae7daf0cf3f65f66f9c28f9290628a", + "version": "3.37.2", + "port-version": 2 + }, { "git-tree": "f49ad405225c6326558adb79f2082814002a8cda", "version": "3.37.2", From 6d994a670d0ef525a52dc32add04ec81ccd024ef Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Thu, 30 Jun 2022 22:01:24 +0200 Subject: [PATCH 010/791] [QT] arm64-windows build (#25418) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * QT arm64-windows build (WIP) * Updated versions * Undo changes made to graphviz in error * Only remove OpenGL for ARM * Update version database * Update version database * updated libs not compatible with uwp+arm * Update version database * Enable QT in CI * qt5-base not compat * Update ports/qtapplicationmanager/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/qt5-imageformats/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Updated versions Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/jasper/vcpkg.json | 24 +++++++++++++++---- ports/libraw/vcpkg.json | 3 ++- ports/osg/vcpkg.json | 3 ++- ports/qt5-imageformats/portfile.cmake | 17 ++++++++++--- ports/qt5-imageformats/vcpkg.json | 1 + ports/qtapplicationmanager/portfile.cmake | 1 + .../stack-walker-arm64.patch | 19 +++++++++++++++ ports/qtapplicationmanager/vcpkg.json | 2 +- ports/qtwebengine/vcpkg.json | 4 ++-- versions/baseline.json | 12 +++++----- versions/j-/jasper.json | 5 ++++ versions/l-/libraw.json | 5 ++++ versions/o-/osg.json | 5 ++++ versions/q-/qt5-imageformats.json | 5 ++++ versions/q-/qtapplicationmanager.json | 5 ++++ versions/q-/qtwebengine.json | 5 ++++ 16 files changed, 98 insertions(+), 18 deletions(-) create mode 100644 ports/qtapplicationmanager/stack-walker-arm64.patch diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json index 7d225aadf7d3f7..d15f884e8674a8 100644 --- a/ports/jasper/vcpkg.json +++ b/ports/jasper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "jasper", "version": "2.0.33", - "port-version": 3, + "port-version": 4, "description": "Open source implementation of the JPEG-2000 Part-1 standard", "homepage": "https://github.com/mdadams/jasper", "dependencies": [ @@ -16,17 +16,33 @@ } ], "default-features": [ - "opengl" + "default-features" ], "features": { + "default-features": { + "description": "Platform-dependent default features", + "dependencies": [ + { + "name": "jasper", + "default-features": false, + "features": [ + "opengl" + ], + "platform": "!(windows & arm)" + } + ] + }, "opengl": { "description": "Enable the use of the OpenGL/GLUT Library", "dependencies": [ { "name": "freeglut", - "platform": "!osx" + "platform": "!osx & !(windows & arm)" }, - "opengl" + { + "name": "opengl", + "platform": "!(windows & arm)" + } ] } } diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json index af3d6c63cae467..060758065b0184 100644 --- a/ports/libraw/vcpkg.json +++ b/ports/libraw/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libraw", "version-string": "201903", - "port-version": 7, + "port-version": 8, "description": "raw image decoder library", "homepage": "https://www.libraw.org", + "supports": "!arm & !uwp", "dependencies": [ "jasper", "lcms", diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 00a16a7ca67be4..007d9eedeafda1 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,9 +1,10 @@ { "name": "osg", "version": "3.6.5", - "port-version": 13, + "port-version": 14, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://github.com/openscenegraph/OpenSceneGraph", + "supports": "!arm & !uwp", "dependencies": [ { "name": "expat", diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake index 04c41716eb940d..4d99e45ac43a37 100644 --- a/ports/qt5-imageformats/portfile.cmake +++ b/ports/qt5-imageformats/portfile.cmake @@ -18,7 +18,12 @@ find_library(ZLIB_DEBUG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/de find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -if(NOT VCPKG_TARGET_IS_OSX) + +if(NOT VCPKG_TARGET_IS_OSX AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")) + set(FREEGLUT_NEEDED ON) +endif() + +if(FREEGLUT_NEEDED) find_library(FREEGLUT_RELEASE NAMES freeglut glut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut glutd glut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) endif() @@ -45,10 +50,16 @@ endif() set(OPT_REL "TIFF_LIBS=${TIFF_RELEASE} ${LZMA_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}" "WEBP_LIBS=${WEBPDECODER_RELEASE} ${WEBPDEMUX_RELEASE} ${WEBPMUX_RELEASE} ${WEBP_RELEASE}" - "JASPER_LIBS=${JASPER_RELEASE} ${FREEGLUT_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies + "JASPER_LIBS=${JASPER_RELEASE} ${JPEG_RELEASE} ${ZLIB_RELEASE}") # This will still fail if LIBWEBP is installed with all available features due to the missing additional dependencies set(OPT_DBG "TIFF_LIBS=${TIFF_DEBUG} ${LZMA_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}" "WEBP_LIBS=${WEBPDECODER_DEBUG} ${WEBPDEMUX_DEBUG} ${WEBPMUX_DEBUG} ${WEBP_DEBUG}" - "JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") + "JASPER_LIBS=${JASPER_DEBUG} ${JPEG_DEBUG} ${ZLIB_DEBUG}") + +if(FREEGLUT_NEEDED) + set(OPT_REL "${OPT_REL} ${FREEGLUT_RELEASE}") + set(OPT_DBG "${OPT_DBG} ${FREEGLUT_DEBUG}") +endif() + list(APPEND CORE_OPTIONS "WEBP_INCDIR=${CURRENT_INSTALLED_DIR}/include") # Requires libwebp[all] qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) \ No newline at end of file diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index a05efd92222951..fe6f4b63da9940 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-imageformats", "version": "5.15.5", + "port-version": 1, "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 8e190a55eeb3b2..2193463a91e755 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -4,6 +4,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES bump-cmake-version.patch wrapper-fixes.patch + stack-walker-arm64.patch ) set(TOOL_NAMES appman diff --git a/ports/qtapplicationmanager/stack-walker-arm64.patch b/ports/qtapplicationmanager/stack-walker-arm64.patch new file mode 100644 index 00000000000000..4dd674ede3e316 --- /dev/null +++ b/ports/qtapplicationmanager/stack-walker-arm64.patch @@ -0,0 +1,19 @@ +diff --git a/src/3rdparty/stackwalker/stackwalker.cpp b/src/3rdparty/stackwalker/stackwalker.cpp +index 7008ac6..cfa0d0e 100644 +--- a/src/3rdparty/stackwalker/stackwalker.cpp ++++ b/src/3rdparty/stackwalker/stackwalker.cpp +@@ -1121,6 +1121,14 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, + s.AddrBStore.Mode = AddrModeFlat; + s.AddrStack.Offset = c.IntSp; + s.AddrStack.Mode = AddrModeFlat; ++#elif _M_ARM64 ++ imageType = IMAGE_FILE_MACHINE_ARM64; ++ s.AddrPC.Offset = c.Pc; ++ s.AddrPC.Mode = AddrModeFlat; ++ s.AddrFrame.Offset = c.Fp; ++ s.AddrFrame.Mode = AddrModeFlat; ++ s.AddrStack.Offset = c.Sp; ++ s.AddrStack.Mode = AddrModeFlat; + #else + #error "Platform not supported!" + #endif diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index a74a219c734212..8ee852b284f8de 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,10 +1,10 @@ { "name": "qtapplicationmanager", "version": "6.3.0", + "port-version": 1, "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, - "supports": "!(windows & arm)", "dependencies": [ "libarchive", "libyaml", diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 9198d677d58fc3..5560810714260e 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,11 +2,11 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.3.0", - "port-version": 2, + "port-version": 3, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, - "supports": "!static & !((arm | x86) & windows)", + "supports": "!static & !(x86 & windows)", "dependencies": [ { "name": "ffmpeg", diff --git a/versions/baseline.json b/versions/baseline.json index 400bfcbff16ced..dca2fabae5365f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3058,7 +3058,7 @@ }, "jasper": { "baseline": "2.0.33", - "port-version": 3 + "port-version": 4 }, "jbig2dec": { "baseline": "0.19", @@ -3978,7 +3978,7 @@ }, "libraw": { "baseline": "201903", - "port-version": 7 + "port-version": 8 }, "librdkafka": { "baseline": "1.9.0", @@ -5294,7 +5294,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 13 + "port-version": 14 }, "osg-qt": { "baseline": "Qt5", @@ -5786,7 +5786,7 @@ }, "qt5-imageformats": { "baseline": "5.15.5", - "port-version": 0 + "port-version": 1 }, "qt5-location": { "baseline": "5.15.5", @@ -5918,7 +5918,7 @@ }, "qtapplicationmanager": { "baseline": "6.3.0", - "port-version": 0 + "port-version": 1 }, "qtbase": { "baseline": "6.3.0", @@ -6058,7 +6058,7 @@ }, "qtwebengine": { "baseline": "6.3.0", - "port-version": 2 + "port-version": 3 }, "qtwebsockets": { "baseline": "6.3.0", diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index 00ce7cf1ef970b..ebc7042b37fa5a 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cc65b3d32490a3fd1bd1768188b905a873af2ef", + "version": "2.0.33", + "port-version": 4 + }, { "git-tree": "caf8b5e479138be21f8a7782806e9ef5c1dcdb37", "version": "2.0.33", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index 698626379fc7bd..034408d4509a20 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e07b6b8ed70ad198a64027d0e44eab43d116039d", + "version-string": "201903", + "port-version": 8 + }, { "git-tree": "aeb0a198c349fb336ad7cd710aeaf0b1017679a1", "version-string": "201903", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index a5f9145b0f02bc..93f1daec662c93 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a38fb280615f72738ab9ec48d92d8bee28017c9", + "version": "3.6.5", + "port-version": 14 + }, { "git-tree": "fa03ab64f6d05d837a9ce14419d03b36cc8796ea", "version": "3.6.5", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index d89026ccd1e346..3794ec3508f736 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a82ad93d08d83fcf90c4803f142585ac1f27c0da", + "version": "5.15.5", + "port-version": 1 + }, { "git-tree": "40ed4f94629b611c253af93bdd3fe7cad0245717", "version": "5.15.5", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 6a8915e6768aa3..7bbc4f490390ad 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a0462497e72897f08a1220703103e874822af44", + "version": "6.3.0", + "port-version": 1 + }, { "git-tree": "31b3d7a098e8f98ad1ee4d897c164236bfef040c", "version": "6.3.0", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 842e438b99cd35..b4578d278ffcc2 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29b6cc23c91540debb74a38874cdd5985e7dbf59", + "version": "6.3.0", + "port-version": 3 + }, { "git-tree": "fb2bc02591f25285ed7e085bce22001d42ec5d87", "version": "6.3.0", From ec547c15d6b9b426c1d9666adc9a79fd2c46d79e Mon Sep 17 00:00:00 2001 From: Tian L <60599517+tian-lt@users.noreply.github.com> Date: Fri, 1 Jul 2022 04:03:18 +0800 Subject: [PATCH 011/791] [proxy] Add new port (#25445) * new port - proxy * replace deprecated tools * update vcpkg.json * resolve comments * run ./vcpkg x-add-version --all * update description * update git-tree * add quotes * run vcpkg x-add-version --all --- ports/proxy/portfile.cmake | 19 +++++++++++++++++++ ports/proxy/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/p-/proxy.json | 9 +++++++++ 4 files changed, 49 insertions(+) create mode 100644 ports/proxy/portfile.cmake create mode 100644 ports/proxy/vcpkg.json create mode 100644 versions/p-/proxy.json diff --git a/ports/proxy/portfile.cmake b/ports/proxy/portfile.cmake new file mode 100644 index 00000000000000..ef7321cf2c4b09 --- /dev/null +++ b/ports/proxy/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/proxy + REF release/1.0.1 + SHA512 5822064b373d3da8cea884d0c727e98d988252a7324ea9b78fa63fc86ee6afd73852a49f3685842345b86d625380140f80998263a6c8150fe66a30d6ba7e928a + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/proxy/vcpkg.json b/ports/proxy/vcpkg.json new file mode 100644 index 00000000000000..602cf0dd3d6a1a --- /dev/null +++ b/ports/proxy/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "proxy", + "version": "1.0.1", + "description": "A single-header C++20 library that facilitates runtime polymorphism.", + "homepage": "https://github.com/microsoft/proxy", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index dca2fabae5365f..76b52743cf95a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5648,6 +5648,10 @@ "baseline": "1.7.1", "port-version": 0 }, + "proxy": { + "baseline": "1.0.1", + "port-version": 0 + }, "proxygen": { "baseline": "2022.03.21.00", "port-version": 2 diff --git a/versions/p-/proxy.json b/versions/p-/proxy.json new file mode 100644 index 00000000000000..3b2270661531e4 --- /dev/null +++ b/versions/p-/proxy.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f0e6617956cb7c1b38369086d9615ccaad354729", + "version": "1.0.1", + "port-version": 0 + } + ] +} From 2bfe0fa1fc0ff941208df72af692ced9f70110ec Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Thu, 30 Jun 2022 22:36:33 +0200 Subject: [PATCH 012/791] [rapidjson] [ms-gltf] Upgrade up to 2022-06-28 (#21112) * Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * [rapidjson] Upgrade up to 2021-11-01 * [rapidjson] Upgrade up to 2021-11-01 * fix remarks * fix remarks * Update ports/rapidjson/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/rapidjson/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * fix remarks * fix remarks * merge with master * add version * update hash * Update ports/rapidjson/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update ports/rapidjson/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * update hash * Update ports/rapidjson/vcpkg.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * update version * update hash * update hash * update ms-gltf * update ms-gltf * update ms-gltf * update ms-gltf * update ms-gltf * update ms-gltf * update ms-gltf * update ms-gltf * Update ports/rapidjson/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * update hash Co-authored-by: Alexander Smyslov Co-authored-by: Smyslov Alexander Nikolayevich Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/ms-gltf/portfile.cmake | 4 ++-- ports/ms-gltf/vcpkg.json | 4 ++-- ports/rapidjson/portfile.cmake | 4 ++-- ports/rapidjson/vcpkg.json | 4 ++-- versions/baseline.json | 8 ++++---- versions/m-/ms-gltf.json | 5 +++++ versions/r-/rapidjson.json | 6 +++--- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ports/ms-gltf/portfile.cmake b/ports/ms-gltf/portfile.cmake index c59b61bbebac14..d0051a25a35670 100644 --- a/ports/ms-gltf/portfile.cmake +++ b/ports/ms-gltf/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/glTF-SDK - REF ac3e70392feb6aef18a07314669f6af2ebc72787 # r1.9.5.4 - SHA512 389b801ddc6f0b29269bcd1215fa9e63fe46a1f1a8778125c6439e34fe0925d5534b1cdbea30824a4a8aa008015124dc7cc4558daa9522fc6d85e00e8e41e4a9 + REF eaccf166e2718c6133db426545b6d008cb7ad79f # 28-06-2022 + SHA512 112e31d2f42d2fb22060a687f7d33f22e677d8d7eca006eb8c1edef6a61b8bad637df15492665656ea88a5a0b980851eb978a180b4a01d307d1bbc92f63500f1 HEAD_REF master PATCHES fix-install.patch diff --git a/ports/ms-gltf/vcpkg.json b/ports/ms-gltf/vcpkg.json index 34728d11be19e3..53e59a81d7a0af 100644 --- a/ports/ms-gltf/vcpkg.json +++ b/ports/ms-gltf/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ms-gltf", - "version-string": "r1.9.5.4", - "port-version": 1, + "version-date": "2022-06-28", "description": "glTF-SDK is a C++ Software Development Kit for glTF", "homepage": "https://github.com/microsoft/glTF-SDK", + "license": "MIT", "supports": "!linux", "dependencies": [ "rapidjson", diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 9a3ed57f8a01e6..72c1ace3e6f4c5 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/rapidjson - REF ce81bc9edfe773667a7a4454ba81dac72ed4364c # accessed on 2020-09-14 - SHA512 a1bbc5668fca9ee34b05ae424a5177b66beaf7b3b4cdfbb3cb067fc58ce91717b4030e2c268ad32e4aa4a7ef59ab5e3aae05ff71d0d91d463eafa7d2e077df07 + REF 232389d4f1012dddec4ef84861face2d2ba85709 # accessed on 2022-06-28 + SHA512 60bfbfe4884122aa9ae8755531da18ce4a793bb217c06474dd8c5afe0f2f5df280c40be2f303c1740f5af14c7ad5cc2a57f08de5205cc7ab27d6166b0f49130d HEAD_REF master ) diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index 9c0f7d6dc0ed96..4e22feadf6b0e4 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,9 +1,9 @@ { "name": "rapidjson", - "version-date": "2020-09-14", - "port-version": 2, + "version-date": "2022-06-28", "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 76b52743cf95a4..01648e55ad885e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4713,8 +4713,8 @@ "port-version": 1 }, "ms-gltf": { - "baseline": "r1.9.5.4", - "port-version": 1 + "baseline": "2022-06-28", + "port-version": 0 }, "ms-gsl": { "baseline": "4.0.0", @@ -6149,8 +6149,8 @@ "port-version": 0 }, "rapidjson": { - "baseline": "2020-09-14", - "port-version": 2 + "baseline": "2022-06-28", + "port-version": 0 }, "rapidxml": { "baseline": "1.13", diff --git a/versions/m-/ms-gltf.json b/versions/m-/ms-gltf.json index d31cbad7f459f1..87af4d87f9e0e5 100644 --- a/versions/m-/ms-gltf.json +++ b/versions/m-/ms-gltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9a91635168ea77faa39adb73b27483797fa8967", + "version-date": "2022-06-28", + "port-version": 0 + }, { "git-tree": "b287c12480725603087cb1ebd5044a6a4bd6b2cb", "version-string": "r1.9.5.4", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 0199e789ac0eac..4270670caf2302 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "14f78d728ea7cd8b0872521a88e71162325a103f", - "version-date": "2020-09-14", - "port-version": 2 + "git-tree": "36ea3aaadfb5ae8186ef4ab68c231203743e9c3f", + "version-date": "2022-06-28", + "port-version": 0 }, { "git-tree": "6d70aec68e6db30b2fb6b659bc6f1453fe8c80a3", From 881c1b04a40f258b23880f9ef3ba89b6ed5c8ecf Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 1 Jul 2022 05:02:53 +0800 Subject: [PATCH 013/791] [libproxy] Add support !static (#25498) * [libproxy] Add support !static * x-add-version Co-authored-by: Cheney-Wang --- ports/libproxy/portfile.cmake | 5 ----- ports/libproxy/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libproxy.json | 5 +++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 6df28f418fb6f4..00c21c106fe281 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -1,8 +1,3 @@ -# Enable static build in UNIX -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libproxy/libproxy diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index 8979bbdbfae60d..47bff43e7fa44d 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libproxy", "version": "0.4.17", - "port-version": 3, + "port-version": 4, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "license": "LGPL-2.1-only", - "supports": "!uwp", + "supports": "!uwp & !static", "dependencies": [ "libmodman", { diff --git a/versions/baseline.json b/versions/baseline.json index 01648e55ad885e..6a8cd5db6a86e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3954,7 +3954,7 @@ }, "libproxy": { "baseline": "0.4.17", - "port-version": 3 + "port-version": 4 }, "libqcow": { "baseline": "20210419", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index c05418e94282f0..65b432ad95df05 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7aa3e3fbb2539fe4adaaff6056effdc2a97ff14b", + "version": "0.4.17", + "port-version": 4 + }, { "git-tree": "ff241fdc3665ad4d1dce051fcdd8ee8dc8617c86", "version": "0.4.17", From 8af6a4bf98e032de21b13acfd9e9f0ca7fd34c1e Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 1 Jul 2022 11:10:23 -0700 Subject: [PATCH 014/791] [vcpkg baseline][librdkafka] Add feature curl (#25514) * [baseline][librdkafka] Add feature curl * x-add-version * update patch * x-add-wersion Co-authored-by: LilyWangLL --- ports/librdkafka/fix_curl.patch | 16 ++++++++++++++++ ports/librdkafka/portfile.cmake | 7 +++++-- ports/librdkafka/vcpkg.json | 7 +++++++ versions/baseline.json | 2 +- versions/l-/librdkafka.json | 5 +++++ 5 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 ports/librdkafka/fix_curl.patch diff --git a/ports/librdkafka/fix_curl.patch b/ports/librdkafka/fix_curl.patch new file mode 100644 index 00000000000000..b390896a0a1e7c --- /dev/null +++ b/ports/librdkafka/fix_curl.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e911c28..bbeb99b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -206,6 +206,11 @@ if(WITH_ZLIB) + target_link_libraries(rdkafka PUBLIC ZLIB::ZLIB) + endif() + ++if(WITH_CURL) ++ find_package(CURL CONFIG REQUIRED) ++ target_link_libraries(rdkafka PUBLIC CURL::libcurl) ++endif() ++ + if(WITH_ZSTD) + target_link_libraries(rdkafka PRIVATE ${ZSTD_LIBRARY}) + target_include_directories(rdkafka PRIVATE ${ZSTD_INCLUDE_DIR}) diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 131b1f8d44601b..6c0545408c1a6c 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF v1.9.0 SHA512 d7bff9ef29befa2cb35b52003f7b7da4425f284600dd268b268a36fb1b915917b26cb1a3e78da40eec78cbb12e2f745d2c1e88ac82f19d2beb38aa20b511438f HEAD_REF master - PATCHES lz4.patch + PATCHES + lz4.patch + fix_curl.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) @@ -15,10 +17,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zlib WITH_ZLIB zstd WITH_ZSTD snappy WITH_SNAPPY + curl WITH_CURL ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRDKAFKA_BUILD_STATIC=${RDKAFKA_BUILD_STATIC} -DRDKAFKA_BUILD_EXAMPLES=OFF diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 6f410f01bf8e2f..f5ef70938d4941 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,6 +1,7 @@ { "name": "librdkafka", "version": "1.9.0", + "port-version": 1, "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "license": null, @@ -17,6 +18,12 @@ } ], "features": { + "curl": { + "description": "Build with curl", + "dependencies": [ + "curl" + ] + }, "snappy": { "description": "Build with snappy" }, diff --git a/versions/baseline.json b/versions/baseline.json index 6a8cd5db6a86e4..d16a6d1c05b808 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3982,7 +3982,7 @@ }, "librdkafka": { "baseline": "1.9.0", - "port-version": 0 + "port-version": 1 }, "libressl": { "baseline": "3.4.2", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index db6a1960127bd0..3bdd5ea43fda36 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b06cb5f9952eb1e853ea372a57551fc1b40e009", + "version": "1.9.0", + "port-version": 1 + }, { "git-tree": "f8d629ff07daf495ff89cf9c3632fce7273a80c0", "version": "1.9.0", From 18ab388c61befe9ca074d2b78f0b688701418d00 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 2 Jul 2022 02:14:20 +0800 Subject: [PATCH 015/791] [rapidjson] Update hash (#25509) * update hash * update hash * overwrite hash --- ports/rapidjson/portfile.cmake | 2 +- ports/rapidjson/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rapidjson.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 72c1ace3e6f4c5..68d19e2fab9fab 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tencent/rapidjson REF 232389d4f1012dddec4ef84861face2d2ba85709 # accessed on 2022-06-28 - SHA512 60bfbfe4884122aa9ae8755531da18ce4a793bb217c06474dd8c5afe0f2f5df280c40be2f303c1740f5af14c7ad5cc2a57f08de5205cc7ab27d6166b0f49130d + SHA512 0d7d751179abdaa6ebf6167d522651a2d13bc024d20c7e3f775c7397a8aab4cd866a6c91a55521ad7847e910822fcf982625c7308c74f5df663e6fd81336c9fc HEAD_REF master ) diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index 4e22feadf6b0e4..1c20fca4f6b8ec 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rapidjson", "version-date": "2022-06-28", + "port-version": 1, "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index d16a6d1c05b808..4e7e26858ea031 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6150,7 +6150,7 @@ }, "rapidjson": { "baseline": "2022-06-28", - "port-version": 0 + "port-version": 1 }, "rapidxml": { "baseline": "1.13", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 4270670caf2302..1746c55863a37f 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf72eff187a248a24485011d16b0a8259e40ed59", + "version-date": "2022-06-28", + "port-version": 1 + }, { "git-tree": "36ea3aaadfb5ae8186ef4ab68c231203743e9c3f", "version-date": "2022-06-28", From 9f31c7765d2386ba6878147da9a5f959b8b7bd21 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Jul 2022 23:13:10 +0200 Subject: [PATCH 016/791] [libspatialite] Fix mingw crossbuilds (#25513) * Fix mingw cross-builds * Licensing depends on feature set * Update versions --- ports/libspatialite/fix-mingw.patch | 13 +++++++++++++ ports/libspatialite/portfile.cmake | 1 + ports/libspatialite/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libspatialite.json | 5 +++++ 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 ports/libspatialite/fix-mingw.patch diff --git a/ports/libspatialite/fix-mingw.patch b/ports/libspatialite/fix-mingw.patch new file mode 100644 index 00000000000000..0c90851f15064c --- /dev/null +++ b/ports/libspatialite/fix-mingw.patch @@ -0,0 +1,13 @@ +diff --git a/src/gaiageo/gg_shape.c b/src/gaiageo/gg_shape.c +index ee2f1cf..01f2571 100644 +--- a/src/gaiageo/gg_shape.c ++++ b/src/gaiageo/gg_shape.c +@@ -58,7 +58,7 @@ the terms of any one of the MPL, the GPL or the LGPL. + #endif + + #ifdef _WIN32 +-#include ++#include + #endif + + #if OMIT_ICONV == 0 /* if ICONV is disabled no SHP support is available */ diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 6d97e062ab6462..59959dd9ca24a9 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( fix-makefiles.patch fix-linux-configure.patch gaiaconfig-msvc.patch + fix-mingw.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS unused diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 9de45472ba9ef2..46cd4fbd443d7a 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 5, + "port-version": 6, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", - "license": "MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later", + "license": null, "dependencies": [ "geos", "libiconv", diff --git a/versions/baseline.json b/versions/baseline.json index 4e7e26858ea031..599826ba8d2c8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4066,7 +4066,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 5 + "port-version": 6 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 1a7787f3d4858b..c664463066d5ea 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17b2434a466cabf41bd653845871d5b4ec6bfdeb", + "version": "5.0.1", + "port-version": 6 + }, { "git-tree": "27ff74dc3c1f0d6c5e11dbcc110f34e46dae862a", "version": "5.0.1", From cd017422421991abf6f72f5721cb453f2379f5ae Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 1 Jul 2022 23:52:22 +0200 Subject: [PATCH 017/791] [rapidjson] Fix version db (#25526) --- versions/r-/rapidjson.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 1746c55863a37f..0e887e2e84fa6d 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -10,6 +10,11 @@ "version-date": "2022-06-28", "port-version": 0 }, + { + "git-tree": "14f78d728ea7cd8b0872521a88e71162325a103f", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "6d70aec68e6db30b2fb6b659bc6f1453fe8c80a3", "version-date": "2020-09-14", From 0d209ca968e9d07228d2ee56f823689dd95303ab Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 2 Jul 2022 00:48:36 +0200 Subject: [PATCH 018/791] [Qt] 6.3.1 (#25259) * [qtbase] Change qt source downloads to point at GitHub * [qtbase] Rewrite update system to emit tarball data * [qtbase] PR feedback * Update Qt to 6.3.1 * reenable qtlocation ? * v db * move buildtrees - to b in pipeline; trying to get webengine logs * fix patch * v db * remove special handling of arm cross case fixed in windows toolchain * v db * Fix stuff * fix more stuff * fix more stuff * retry * fix regex replacement * fix regex stuff. And qtinterface ref? * more fixes * remove unused variable * v db * Revert scripts/azure-pipelines/test-modified-ports.ps1 * v db fix * revert qtlocation changes * revert v db * v db * v db Co-authored-by: Robert Schumacher --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtapplicationmanager/vcpkg.json | 3 +- ports/qtbase/clang-cl_QGADGET_fix.diff | 37 +++ ports/qtbase/cmake/qt_install_copyright.cmake | 2 + ports/qtbase/cmake/qt_install_submodule.cmake | 83 +++--- ports/qtbase/cmake/qt_port_data.cmake | 37 +++ .../qtbase/cmake/qt_port_details-latest.cmake | 136 --------- ports/qtbase/cmake/qt_port_details.cmake | 271 +++++++++--------- ports/qtbase/dont_force_cmakecache.patch | 58 ---- ports/qtbase/portfile.cmake | 136 ++++----- ports/qtbase/vcpkg.json | 3 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdeviceutilities/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- .../qtimageformats/no_target_promotion.patch | 22 -- ports/qtimageformats/portfile.cmake | 6 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtinterfaceframework/49b44d4.diff | 148 ---------- ports/qtinterfaceframework/portfile.cmake | 3 +- ports/qtinterfaceframework/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtpositioning/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquickcontrols2/vcpkg.json | 3 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtsensors/vcpkg.json | 2 +- ports/qtserialbus/vcpkg.json | 2 +- ports/qtserialport/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/no_src_changes.patch | 41 --- ports/qttools/portfile.cmake | 64 +---- ports/qttools/vcpkg.json | 3 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/portfile.cmake | 29 +- ports/qtwebengine/vcpkg.json | 3 +- ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/vcpkg.json | 2 +- versions/baseline.json | 84 +++--- versions/q-/qt.json | 5 + versions/q-/qt5compat.json | 5 + versions/q-/qtactiveqt.json | 5 + versions/q-/qtapplicationmanager.json | 5 + versions/q-/qtbase.json | 5 + versions/q-/qtcharts.json | 5 + versions/q-/qtcoap.json | 5 + versions/q-/qtconnectivity.json | 5 + versions/q-/qtdatavis3d.json | 5 + versions/q-/qtdeclarative.json | 5 + versions/q-/qtdeviceutilities.json | 5 + versions/q-/qtdoc.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtinterfaceframework.json | 5 + versions/q-/qtlottie.json | 5 + versions/q-/qtmqtt.json | 5 + versions/q-/qtmultimedia.json | 5 + versions/q-/qtnetworkauth.json | 5 + versions/q-/qtopcua.json | 5 + versions/q-/qtpositioning.json | 5 + versions/q-/qtquick3d.json | 5 + versions/q-/qtquickcontrols2.json | 5 + versions/q-/qtquicktimeline.json | 5 + versions/q-/qtremoteobjects.json | 5 + versions/q-/qtscxml.json | 5 + versions/q-/qtsensors.json | 5 + versions/q-/qtserialbus.json | 5 + versions/q-/qtserialport.json | 5 + versions/q-/qtshadertools.json | 5 + versions/q-/qtsvg.json | 5 + versions/q-/qttools.json | 5 + versions/q-/qttranslations.json | 5 + versions/q-/qtvirtualkeyboard.json | 5 + versions/q-/qtwayland.json | 5 + versions/q-/qtwebchannel.json | 5 + versions/q-/qtwebengine.json | 5 + versions/q-/qtwebsockets.json | 5 + versions/q-/qtwebview.json | 5 + 92 files changed, 602 insertions(+), 826 deletions(-) create mode 100644 ports/qtbase/clang-cl_QGADGET_fix.diff create mode 100644 ports/qtbase/cmake/qt_port_data.cmake delete mode 100644 ports/qtbase/cmake/qt_port_details-latest.cmake delete mode 100644 ports/qtbase/dont_force_cmakecache.patch delete mode 100644 ports/qtimageformats/no_target_promotion.patch delete mode 100644 ports/qtinterfaceframework/49b44d4.diff delete mode 100644 ports/qttools/no_src_changes.patch diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 392aa1a9f7f208..4244eb0ae97f94 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 59a13e68c61297..33e8374d195ec4 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.3.0", + "version": "6.3.1", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index f89842ac5db390..a13f93eeabde47 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.3.0", + "version": "6.3.1", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 8ee852b284f8de..bb738963f92758 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.3.0", - "port-version": 1, + "version": "6.3.1", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/clang-cl_QGADGET_fix.diff b/ports/qtbase/clang-cl_QGADGET_fix.diff new file mode 100644 index 00000000000000..709aa9cab8785b --- /dev/null +++ b/ports/qtbase/clang-cl_QGADGET_fix.diff @@ -0,0 +1,37 @@ +diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h +index e40cd85..ba68a01 100644 +--- a/src/corelib/kernel/qmetatype.h ++++ b/src/corelib/kernel/qmetatype.h +@@ -18,5 +18,6 @@ + #endif + ++#include + #include + #include + #include +@@ -826,7 +829,13 @@ + struct IsGadgetHelper { enum { IsRealGadget = false, IsGadgetOrDerivedFrom = false }; }; + + template ++#if defined(__clang__) && (__clang_major__ > 11) ++ // Clang does not reject T::QtGadgetHelper as ambiguous if a class inherits from two QGADGETS ++ // but is not a QGADGET itself ++ struct IsGadgetHelper> ++#else + struct IsGadgetHelper ++#endif + { + template + static char checkType(void (X::*)()); +@@ -841,7 +850,11 @@ + struct IsPointerToGadgetHelper { enum { IsRealGadget = false, IsGadgetOrDerivedFrom = false }; }; + + template ++#if defined(__clang__) && (__clang_major__ > 11) ++ struct IsPointerToGadgetHelper> ++#else + struct IsPointerToGadgetHelper ++#endif + { + using BaseType = T; + template diff --git a/ports/qtbase/cmake/qt_install_copyright.cmake b/ports/qtbase/cmake/qt_install_copyright.cmake index 5215f96758e5f5..18db16c896ed67 100644 --- a/ports/qtbase/cmake/qt_install_copyright.cmake +++ b/ports/qtbase/cmake/qt_install_copyright.cmake @@ -1,3 +1,5 @@ +include_guard(GLOBAL) + #Could probably be the beginning of a vcpkg_install_copyright? function(qt_install_copyright SOURCE_PATH) #Find the relevant license file and install it diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index d193d075de4680..d5bd93f847d7a6 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -1,50 +1,53 @@ +include_guard(GLOBAL) + include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake/vcpkg-port-config.cmake") include("${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-cmake-config/vcpkg-port-config.cmake") include("${CMAKE_CURRENT_LIST_DIR}/qt_install_copyright.cmake") -if(QT_IS_LATEST AND PORT STREQUAL "qtbase") - include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details-latest.cmake") -else() - include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details.cmake") -endif() -#set(PORT_DEBUG ON) - if(NOT DEFINED QT6_DIRECTORY_PREFIX) set(QT6_DIRECTORY_PREFIX "Qt6/") endif() -macro(qt_stop_on_update) - if(QT_UPDATE_VERSION) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "") - return() +function(qt_download_submodule_impl) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "SUBMODULE" "PATCHES") + + if("${_qarg_SUBMODULE}" IN_LIST QT_FROM_QT_GIT) + # qtinterfaceframework is not available in the release, so we fall back to a `git clone`. + vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH + URL "https://code.qt.io/qt/${_qarg_SUBMODULE}.git" + REF "${${_qarg_SUBMODULE}_REF}" + PATCHES ${_qarg_PATCHES} + ) + else() + if(VCPKG_USE_HEAD_VERSION) + set(sha512 SKIP_SHA512) + elseif(NOT DEFINED "${_qarg_SUBMODULE}_HASH") + message(FATAL_ERROR "No information for ${_qarg_SUBMODULE} -- add it to QT_PORTS and run qtbase in QT_UPDATE_VERSION mode first") + else() + set(sha512 SHA512 "${${_qarg_SUBMODULE}_HASH}") + endif() + + qt_get_url_filename("${_qarg_SUBMODULE}" url filename) + vcpkg_download_distfile(archive + URLS "${url}" + FILENAME "${filename}" + ${sha512} + ) + vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${archive}" + PATCHES ${_qarg_PATCHES} + ) endif() -endmacro() + set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() function(qt_download_submodule) - cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" - "" - "PATCHES") + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "" "PATCHES") - if(QT_UPDATE_VERSION) - set(VCPKG_USE_HEAD_VERSION ON) - set(UPDATE_PORT_GIT_OPTIONS - HEAD_REF "${QT_GIT_TAG}") - endif() - - vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL "https://code.qt.io/qt/${PORT}.git" - REF "${${PORT}_REF}" - ${UPDATE_PORT_GIT_OPTIONS} - ${QT_FETCH_REF} - PATCHES ${_qarg_PATCHES} - ) + qt_download_submodule_impl(SUBMODULE "${PORT}" PATCHES ${_qarg_PATCHES}) - if(QT_UPDATE_VERSION) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "") - message(STATUS "VCPKG_HEAD_VERSION:${VCPKG_HEAD_VERSION}") - file(APPEND "${VCPKG_ROOT_DIR}/ports/qtbase/cmake/qt_new_refs.cmake" "set(${PORT}_REF ${VCPKG_HEAD_VERSION})\n") - endif() set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) endfunction() @@ -81,9 +84,6 @@ function(qt_cmake_configure) if(VCPKG_CROSSCOMPILING) list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}") list(APPEND _qarg_OPTIONS "-DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share") - if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged - list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) - endif() endif() # Disable warning for CMAKE_(REQUIRE|DISABLE)_FIND_PACKAGE_ @@ -99,9 +99,7 @@ function(qt_cmake_configure) list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "") list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features}) - if(QT_IS_LATEST) - list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON") - endif() + list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON") if(NOT PORT MATCHES "qtbase") list(APPEND _qarg_OPTIONS "-DQT_MKSPECS_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6/mkspecs") @@ -288,9 +286,6 @@ function(qt_install_submodule) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_download_submodule(PATCHES ${_qis_PATCHES}) - if(QT_UPDATE_VERSION) - return() - endif() if(_qis_DISABLE_NINJA) set(_opt DISABLE_NINJA) @@ -309,3 +304,5 @@ function(qt_install_submodule) qt_install_copyright("${SOURCE_PATH}") set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) endfunction() + +include("${CMAKE_CURRENT_LIST_DIR}/qt_port_details.cmake") diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake new file mode 100644 index 00000000000000..22fc8b31475899 --- /dev/null +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -0,0 +1,37 @@ +set(qtbase_HASH "5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5") +set(qttools_HASH "6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883") +set(qtdeclarative_HASH "547b29dcf26f734b32283677b9e02a43a75f3ab4849e578592031fa37babc09e5b1795e719119ba6b9400ef59b16fd387fb97aa3603454775be4a27e19ff065c") +set(qtsvg_HASH "c040e96d2dc7ef615859dec589e0b0c4e5972c3761dcf9208086b0662bfa1c3d147a10534d62d86fd8c9786a1567f8e9ca196f942a372422fc81cd02f1312c4c") +set(qt5compat_HASH "66196a8d29a2789179904638fcd9ec162d5715e7dc28618b3ef78d07682a05578b6c2e7023144c628b94321a9c1332d39826c13adb1e5db5121406c530c9c35c") +set(qtshadertools_HASH "c9f62139e4407b7bfbec78c231d00fd627be5396056a68c054e6b6ecada8af846198aadcbe2af56bb2c525f2851ecd492195a432e4e084f1db346d2e3722747e") +set(qtquicktimeline_HASH "ad55ed87942ac39c28587e15a5928ed458d5019501a689b7e51d105032d65122ef866a9d39af91c382def54d6e5246a38d16a0906f05fb8d1374e9eecefd2646") +set(qtquick3d_HASH "342a1c558a4eece6e9442e45cc400af58c96fb59614902e0299291ea2c5b1c406d76cd8ec8cf1d8ac0d8b5fc4f2f4637063d1747dcdc54f191a81310df93534e") +set(qttranslations_HASH "1c29842c6fbf669911849649c02415fb911ff187d928604a9bb4473a57aeb463182ed972e0ed0cacba20f8cca8da6733866657edcc22a9a8e9f1cf77ebaba98f") +set(qtwayland_HASH "571654a6abcd865717d4624c65d78e1b911829bba84f609521f349bf896b9475a8ce7759ba6b69e4bc4eef10c31e404c71610816dbee20d1202401efefa2323d") +set(qtdoc_HASH "707f8284b31a9d6bac7a5783e554d641b2092f3571c239207d02e958438d403750216722a9663415e7a2348a8d9afd13f19cfb534d25cdda817c652d1386c011") +set(qtcoap_HASH "4393cdeb0e7a48224b3ea9f63fc4c0594e782fbe2c25a40b3d0cbfd8eb830df740e4489ea5f77947821ef3e6c7744735fc9a2c59a54411b6134e14d71be46cf5") +set(qtopcua_HASH "7dcd6fa710c7c5ef7f41421b12ee4c56ed14ea9da44799ff27ae0c74cda8c41436173d7280afaa34a0284c66540f107ec441ad3bd329a0b98db8814618cd7f45") +set(qtimageformats_HASH "9be2c4dab869c7709775514ee2dbc9d84c8e76b98e8e8a01fcf96355b3309f1830bff57cd9455bc4a33c5f8f0cb948619806dff6f303233c35e5efbdf3cc92f7") +set(qtmqtt_HASH "786e103971ed249b7656261c8844dd84e809246fca65b96b31ba86ee998beefcff9be059fd8c4bc3e2003f3b75b3c3026d7908c96ee4ec5e9ef3629a6280b380") +set(qtnetworkauth_HASH "e7e73c57f9bfebaca7990b5d886682a4fbe5d46c8c952d056514236ae7d6beee4614dc9c957c1fa2526c89c0fc70e7dc8727533d3cc754d367cd7ec749cf2e03") +set(qtactiveqt_HASH "0dfdf0ffe3f0ec1dc31fe8d27d402f07cf44ca85baba1cf6a3db1850347f41bf4ebc9eb85f631787dc6937545e854960c74d39570a7d51ec808b8b6604153c2c") +set(qtdatavis3d_HASH "2d345e42dcb726b8bfa1ca12b0b7feb7f8df6f74f434a8ace58e1d28c3ce9ab4b0877b6918eb9354878ff4a429b56bb5c6cd95a80feeaa38dd67796f5d5171c7") +set(qtdeviceutilities_HASH "9e7b6cc823855f18d97eca8ee1d10f29655cc9492e16deae1ba8d2a9678e716c9bb189ada09e516c1437a0025c9f5aefb899dd44c9063e079bff41a4c0847312") +set(qtlottie_HASH "fbd2513a9c563c8608cf169b7733e5fffa4ec3e42128434175b0737269b1923bdd5f89cad6ccdd4cf7ce857ee7c389b54b91fc1569a264cd0a8f132f7d3ae73b") +set(qtscxml_HASH "b4782c6e9e98dfd8dae0ce75e69db7a3bc2f2764f8f8ee086e05d01e1cd4b824512925d5afc48ed0a6e8d15d43086fefb05b917a28018786726a58ea5bab6a78") +set(qtvirtualkeyboard_HASH "3e5e66b53bd9f0e45069b5423bb1f54cfe5cb36480b1fb5c786a726d7f8fdb69ba122f2b02f34ea6316ea3ae748999884c060c5b8f5ae1dd4fa684252f795234") +set(qtcharts_HASH "c3aa002d9b9d41e55e440127ad84f1413869432ab361c373911a9ef29c25d72fb411f71e950a017f5e97c1d8bef92611fc9558d2619bd73b1e6df2e8963572b0") +set(qtconnectivity_HASH "f35ec394d1be817369959a38528a64dc5a7f060fe37d84363d0b04e14776c796e079787cbe24e7678454a7edf82909d4a3630e614142595dc271fcf10c9a2a0a") +set(qtpositioning_HASH "32cea980147487e5ea6dbd25347b3b37f74fd9d8180d7b463f784eb3877361862e38bfa310e36d83dd9c9eed91b4415812ec9ee7329c96818a32d99a17f76e5f") +set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629") +set(qtmultimedia_HASH "c557a8577a28df1997a07643c125033d6ab0e1d64a2e67b659f51d11d29c5634e7ea1264ad31705889e138521b65b74761ac68399dd94637ced8c5d6d07e03c3") +set(qtremoteobjects_HASH "276f7744a2ee017e408957ab03546cb79f9ea92102b5c1fa28a206136ac14600612ca122c38f45b596ef5b9677563b8ba6ad2e3d778711f35b6d03aff6232eed") +set(qtsensors_HASH "1e095e23e16a7360f5f2dc333ecf6dee448d0b96c93f820e94afcc2f4e9472cd24145f286f8669f9499def45d84281b9bfe2886a1e4da304cbf16e34f3491b6b") +set(qtserialbus_HASH "614c83ae7b5289305d6bb5317e6e102874b76aab2d3de84211584fd0f5a02ff16724d73990b62f73ea79cecf3573b0d98bb5780612c511686940799d70496391") +set(qtserialport_HASH "c774353fe019f9745ab8b6ffbb61f15a08a74368b3b8e7f6e16ab60c43ad9003690c013381515e4895288c3f5c22b956506795a153670e3b0c92c200a5283a9e") +set(qtwebchannel_HASH "d253e087a9e97173a6a97eac46d8dfa740d3c77182dfd57514c14e68e50f6745cd90e9367cbb5f5d0a7c43fcbfc046af0bd9124fb2517d741bb5ab1a5af5bf62") +set(qtwebengine_HASH "e00601a7ec6400551f7707d15cf326340ae8d6a5bb8cda55df4619148414f4b3ca3daabfd7263dd5a2ff2ca8ba64f9e91c9db3f1a50bea4903148c57b6dc81dd") +set(qtwebsockets_HASH "25ab603753fdc1c65585b6aa91d3777f48e0763cff97978478586a0f04d0536b5c4d5853f9218d2a0c3b3d01b1bd9ca7e2f0e90020737c1fc70bdd4a3cd5a30c") +set(qtwebview_HASH "73529993e2ca308c841d731c87180bbdb25df93ccf3e472349c5f141f5212678ebe090898f1ee396c4cf07f9eab46e1c3cc7a5371ef5c0dc8fc0c0b9709b2997") +set(qtinterfaceframework_REF 577d0c7f7a2ab952c6eab2cf5798d18e668cbb64) +set(qtapplicationmanager_HASH "7a74e8275bcb84eb946a04a0efc7bd6173b2c6556392da082c896304ab13df751a4be3d4aaf682026359c240a9f4ea252b90d9089df1509eb256ce8fa79b4bf3") diff --git a/ports/qtbase/cmake/qt_port_details-latest.cmake b/ports/qtbase/cmake/qt_port_details-latest.cmake deleted file mode 100644 index db721335a6d6df..00000000000000 --- a/ports/qtbase/cmake/qt_port_details-latest.cmake +++ /dev/null @@ -1,136 +0,0 @@ -set(QT_VERSION 6.3.0) - -if(PORT MATCHES "qtquickcontrols2") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") - return() -endif() - -### Setting up the git tag. -set(QT_FETCH_REF "") -set(QT_GIT_TAG "v${QT_VERSION}") -if(PORT MATCHES "qtdeviceutilities") - set(QT_FETCH_REF FETCH_REF "6.3.0") - set(QT_GIT_TAG "6.3.0") -endif() -if(PORT MATCHES "qtlocation") - set(QT_FETCH_REF FETCH_REF "${QT_VERSION}") - set(QT_GIT_TAG "${QT_VERSION}") -endif() - -set(QT_IS_LATEST TRUE) -#set(QT_UPDATE_VERSION TRUE) -if(QT_UPDATE_VERSION) - function(vcpkg_extract_source_archive) - endfunction() -endif() - -set(QT_PORTS qt - qtbase - qttools - qtdeclarative - qtsvg - qt5compat - qtshadertools - qtquicktimeline - qtquick3d - qttranslations - qtwayland - qtdoc - qtcoap - qtopcua - qtimageformats - qtmqtt - qtnetworkauth - # qtquickcontrols2 -> moved into qtdeclarative - ## New in 6.1 - qtactiveqt - qtdatavis3d - qtdeviceutilities - qtlottie - qtscxml - qtvirtualkeyboard - qtcharts - ## New in 6.2 - qtconnectivity - qtpositioning - qtlocation - qtmultimedia - qtremoteobjects - qtsensors - qtserialbus - qtserialport - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - ## New in 6.2.2 - qtinterfaceframework - qtapplicationmanager - ) - -foreach(_port IN LISTS QT_PORTS) - set(${_port}_TAG ${QT_GIT_TAG}) -endforeach() -set(qtbase_REF 0668a36d2804b300010d874f5ff4073c25c2784c) -set(qtshadertools_REF e526e8ca88197d82996818db1f00e8a3e07bf584) -set(qtdeclarative_REF cbe89ee41aa219ce7e90143e3cf54283e580f7c1) -set(qt5compat_REF 32db676ab6854633512181b2c40950c98525c5ba) -set(qttools_REF a0a9cf1d1338b3e7f868bc0840e1e9a096c86dfa) # Additional refs below -set(qtcoap_REF 4453575b94836cf1cd52642eceb1d6f5d16b26a9) -set(qtdoc_REF d0da4d47f152dc50fb672bc5011b61a5bbb36f43) -set(qtimageformats_REF 45cfb044698df541ced53e3523799232599712a6) -set(qtmqtt_REF 3174dc30d2b37c74ea685d27ab0030c7392032c0) -set(qtnetworkauth_REF 507214965cbcebbbd563904d615cf7ebc464cc48) -set(qtopcua_REF 2c7051d85f640e9afe6c3f8f718bb2152305467c) -set(qtquicktimeline_REF 16bc2eb9f5e84923dc04c3941f5347cbc1b0e5b0) -set(qtquick3d_REF bf912a678898dcde61f139f63b49e1e42717fa8d) -set(qtsvg_REF cf900932886ebdd3de6c3a4a7e63cf363663eb87) -set(qttranslations_REF 19701f38b9dc10d925c6974833d693b5038e1589) -set(qtwayland_REF 840673bf1849595869873bad15c52a312e849ffb) -### New in 6.1 -set(qtactiveqt_REF 747fdd27c413ea42fb730230331984f388d3826b) -set(qtcharts_REF 03929b43d8e2a5c9b1487fdc6b8a2b067ada16f8) -set(qtdatavis3d_REF 137ebda0932e6faf0fbd61b0beb3cfb4dac8efbd) -set(qtdeviceutilities_REF 0520d7fd121f7773d04a7d3318553ff7fed1b3a9) # -set(qtlottie_REF e68bf89fefd941a930c83e2c29b629fcfea03eb3) -set(qtscxml_REF 4f52a1b6e4f25f3473f42ce249c4c183c5910183) -set(qtvirtualkeyboard_REF 92aee38dab196e8b5ca436f9f20c0fc66d8155d5) -### New in 6.2 -set(qtconnectivity_REF f62954bad729f7853c9fbe2ea0b3235cfae2701a) -set(qtmultimedia_REF 3d2dafab1eb60c17a30cf03213cd2f6f71185137) -set(qtremoteobjects_REF 2c53bf0e9262a24f8fc8553e5004e7d00bc7e556) -set(qtserialport_REF 7e44935b14b783add342a25f426fcdf299279024) -set(qtsensors_REF 3222894c246076c6e7bd151e638ce3eb4ce5c16b) -set(qtserialbus_REF 3ee1694d2a8fb0b755adce4b59001b784e9c301e) -set(qtlocation_REF 0) # Currently empty port -set(qtwebchannel_REF a85e05069a2b17ceb5b6332671a2eef261ec783f) -set(qtwebengine_REF 9158e7652f24800b2b7dbe59b7834687bc1baf13) # Additional refs below -set(qtwebsockets_REF 487116c9a85d8f5a920f47045dfce0b0defd5139) -set(qtwebview_REF d7498a108c67b21c39d8ba775330cc122ce21c1a) -set(qtpositioning_REF f61d2f336892b85cdcd5d508bb4a0db7f768d439) -### New in Qt 6.2.2 -set(qtapplicationmanager_REF 68464eb2b3fa89c69cfc5fc4f19450af61116dd2) # -set(qtinterfaceframework_REF 7ddeb99d6215a4b63102d6a5bc73e50d77ddb3d7) # - -#Submodule stuff: -set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) -set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) -set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) -set(qtwebengine_chromium_REF 2c9916de251f15369fa0f0c6bd3f45f5cf1a6f06) - -if(QT_UPDATE_VERSION) - message(STATUS "Running Qt in automatic version port update mode!") - set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) - if("${PORT}" MATCHES "qtbase") - file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake") - foreach(_current_qt_port IN LISTS QT_PORTS) - set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") - file(READ "${_current_control}" _control_contents) - string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") - string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") - file(WRITE "${_current_control}" "${_control_contents}") - #need to run a vcpkg format-manifest --all after update once - endforeach() - endif() -endif() diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index a33f93b4a37334..6f684aaca5c5a1 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,132 +1,139 @@ -set(QT_VERSION 6.2.4) - -if(PORT MATCHES "qtquickcontrols2") - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") - return() -endif() - -### Setting up the git tag. -set(QT_FETCH_REF "") -set(QT_GIT_TAG "v${QT_VERSION}") -if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager") - # So much for consistency .... - set(QT_FETCH_REF FETCH_REF "${QT_VERSION}") - set(QT_GIT_TAG "${QT_VERSION}") -endif() - -#set(QT_UPDATE_VERSION TRUE) -if(QT_UPDATE_VERSION) - function(vcpkg_extract_source_archive) - endfunction() -endif() - -set(QT_PORTS qt - qtbase - qttools - qtdeclarative - qtsvg - qt5compat - qtshadertools - qtquicktimeline - qtquick3d - qttranslations - qtwayland - qtdoc - qtcoap - qtopcua - qtimageformats - qtmqtt - qtnetworkauth - # qtquickcontrols2 -> moved into qtdeclarative - ## New in 6.1 - qtactiveqt - qtdatavis3d - qtdeviceutilities - qtlottie - qtscxml - qtvirtualkeyboard - qtcharts - ## New in 6.2 - qtconnectivity - qtpositioning - qtlocation - qtmultimedia - qtremoteobjects - qtsensors - qtserialbus - qtserialport - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - ## New in 6.2.2 - qtinterfaceframework - qtapplicationmanager - ) - -foreach(_port IN LISTS QT_PORTS) - set(${_port}_TAG ${QT_GIT_TAG}) -endforeach() -set(qtbase_REF 597359f7d0736917123842dee63a7ae45522eb8e ) -set(qtshadertools_REF d954aeb073375ee1edda4d6b2956c3c79b26b386 ) -set(qtdeclarative_REF 614d85d460fa46e947eeb4281609ce5453a29e5c ) -set(qt5compat_REF c5dab10ba77dd2701dbd2d7b69998fbee90557f2 ) -set(qttools_REF a60e0e5dfb2af83ffb1adda28028b24e21fe9131 ) # Additional refs below -set(qtcoap_REF 29df645fc165087e74b603e7ad20033381006fb5 ) -set(qtdoc_REF 5c70158a15f23224a76b6919ab06eefee6ed187e ) -set(qtimageformats_REF 356fb7846b5bc002b2d34e23253fda1dffed7932 ) -set(qtmqtt_REF 9ad6c48474c2b94c62a518dc3dc7e65d30a6309e ) -set(qtnetworkauth_REF d5ffb7549dd1e6139b746021c4d40053d0f15950 ) -set(qtopcua_REF 4a0dd4334d98bea48acda1e203ab2c31f207bad3 ) -set(qtquicktimeline_REF 6a06bdbaa55d1c165e992732f2e3dc923846b921 ) -set(qtquick3d_REF d126dea81f48386ef24e8b30e1328c40e72c4861 ) -set(qtsvg_REF 77ea18adfb91c591f249f442e0ffc0079023e431 ) -set(qttranslations_REF 87f95df09b1fc388ea15ce208a349d6b1deac2a4 ) -set(qtwayland_REF 6bdaed8301336750dda95823ed0dfac4828ebab6 ) -### New in 6.1 -set(qtactiveqt_REF 5dd7acd1395627e6bd0d87beb148957059c1a3c6 ) -set(qtcharts_REF 7184ea521d04ec13587562c3275ae698fa9a722e ) -set(qtdatavis3d_REF 74c469d4926f59264c5cbc47fe301fe4713aa358 ) -set(qtdeviceutilities_REF f7333510b4dcfe32eb9065a63c434704750d4fb6 ) -set(qtlottie_REF fd61d8e92cfacbd3d10f31b176a7cde911525632 ) -set(qtscxml_REF 63455c888e012fdc682c32fd3d0de96127721bd4 ) -set(qtvirtualkeyboard_REF ffe9bba23ae45662d25ac3d90167d794e0d6c828 ) -### New in 6.2 -set(qtconnectivity_REF f0ac95d1685f4f0f2e72fb42800b17d7738ccefb ) -set(qtmultimedia_REF 3423c7172f948f27ff0512d1d2db4ea97fc0e9c0 ) -set(qtremoteobjects_REF 2d0f27e736211e2a6b9d08345f65c736a17a67eb ) -set(qtserialport_REF c7dc6737a2e98af81900f55f814cf79a6d579779 ) -set(qtsensors_REF 32dda47f507e74ef7ed33290545b762a0c20e532 ) -set(qtserialbus_REF 1ebbf87cbc90c22817785bffc563d4bb86525abc ) -set(qtlocation_REF 0 ) # Currently empty port -set(qtwebchannel_REF e1014dcf9a924d3b8fd3450a3360381a0a8fc6ab ) -set(qtwebengine_REF cc7181c12d1d1605ecab6c448df4a684278d01d8 ) # Additional refs below -set(qtwebsockets_REF fd509016da201ed63122c5ec79355930f2489ee8 ) -set(qtwebview_REF aade84c30fbbc85fe5a8c5e49172a02a7522623d ) -set(qtpositioning_REF 3a68165bc88f9ddd165567d30887147d2d71915b ) -### New in Qt 6.2.2 -set(qtapplicationmanager_REF 2626ae6e9ce84aebd88a163153719c07d7f65b7d ) -set(qtinterfaceframework_REF 71512be8758c75b4b6b0130d6b623f564c6bf227 ) - -#Submodule stuff: -set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38) -set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01) -set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc) -set(qtwebengine_chromium_REF b33b4266df8c333d3d273ae4665d6b322eee33c6) - -if(QT_UPDATE_VERSION) - message(STATUS "Running Qt in automatic version port update mode!") - set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) - if("${PORT}" MATCHES "qtbase") - file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake") - foreach(_current_qt_port IN LISTS QT_PORTS) - set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") - file(READ "${_current_control}" _control_contents) - string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") - string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") - file(WRITE "${_current_control}" "${_control_contents}") - #need to run a vcpkg format-manifest --all after update once - endforeach() - endif() -endif() +### Steps to update the qt6 ports +## 1. Change QT_VERSION below to the new version +## 2. Set QT_UPDATE_VERSION to 1 +## 3. Add any new Qt modules to QT_PORTS +## 4. Run a build of `qtbase` +## 5. Fix any intermediate failures by adding the module into QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, or QT_FROM_QT_GIT as appropriate +## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake +## 7. Set QT_UPDATE_VERSION back to 0 + +set(QT_VERSION 6.3.1) +set(QT_UPDATE_VERSION 0) + +if(PORT MATCHES "(qtquickcontrols2)") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + +if(PORT MATCHES "qtlocation") # No 6.3.1 tag/branch + set(QT_VERSION 6.3.0) +endif() + +### Setting up the git tag. + +set(QT_PORTS qt + qtbase + qttools + qtdeclarative + qtsvg + qt5compat + qtshadertools + qtquicktimeline + qtquick3d + qttranslations + qtwayland + qtdoc + qtcoap + qtopcua + qtimageformats + qtmqtt + qtnetworkauth) + # qtquickcontrols2 -> moved into qtdeclarative +if(QT_VERSION VERSION_GREATER_EQUAL 6.1) + list(APPEND QT_PORTS + ## New in 6.1 + qtactiveqt + qtdatavis3d + qtdeviceutilities + qtlottie + qtscxml + qtvirtualkeyboard + qtcharts) +endif() +if(QT_VERSION VERSION_GREATER_EQUAL 6.2) + list(APPEND QT_PORTS + ## New in 6.2 + qtconnectivity + qtpositioning + qtlocation + qtmultimedia + qtremoteobjects + qtsensors + qtserialbus + qtserialport + qtwebchannel + qtwebengine + qtwebsockets + qtwebview) +endif() +if(QT_VERSION VERSION_GREATER_EQUAL 6.2.2) + list(APPEND QT_PORTS + ## New in 6.2.2 + qtinterfaceframework + qtapplicationmanager) +endif() + +# 1. By default, modules come from the official release +# 2. These modules are mirrored to github and have tags matching the release +set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager) +# 3. These modules are mirrored to github and have branches matching the release +set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation) +# 4. These modules are not mirrored to github and not part of the release +set(QT_FROM_QT_GIT qtinterfaceframework) + +function(qt_get_url_filename qt_port out_url out_filename) + if("${qt_port}" IN_LIST QT_FROM_GITHUB) + set(url "https://github.com/qt/${qt_port}/archive/v${QT_VERSION}.tar.gz") + set(filename "qt-${qt_port}-v${QT_VERSION}.tar.gz") + elseif("${qt_port}" IN_LIST QT_FROM_GITHUB_BRANCH) + set(url "https://github.com/qt/${qt_port}/archive/${QT_VERSION}.tar.gz") + set(filename "qt-${qt_port}-${QT_VERSION}.tar.gz") + else() + string(SUBSTRING "${QT_VERSION}" 0 3 qt_major_minor) + set(url "https://download.qt.io/archive/qt/${qt_major_minor}/${QT_VERSION}/submodules/${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") + set(filename "${qt_port}-everywhere-src-${QT_VERSION}.tar.xz") + endif() + set(${out_url} "${url}" PARENT_SCOPE) + set(${out_filename} "${filename}" PARENT_SCOPE) +endfunction() + +if(QT_UPDATE_VERSION) + if(NOT PORT STREQUAL "qtbase") + message(FATAL_ERROR "QT_UPDATE_VERSION must be used from the root 'qtbase' package") + endif() + set(VCPKG_USE_HEAD_VERSION 1) + set(msg "" CACHE INTERNAL "") + foreach(qt_port IN LISTS QT_PORTS) + set(port_json "${CMAKE_CURRENT_LIST_DIR}/../../${qt_port}/vcpkg.json") + file(READ "${port_json}" _control_contents) + string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") + file(WRITE "${port_json}" "${_control_contents}") + if(qt_port STREQUAL "qt") + continue() + endif() + if("${qt_port}" IN_LIST QT_FROM_QT_GIT) + vcpkg_find_acquire_program(GIT) + execute_process( + COMMAND "${GIT}" ls-remote -t "https://code.qt.io/cgit/qt/${qt_port}.git" "v${QT_VERSION}" + OUTPUT_VARIABLE out + ) + string(SUBSTRING "${out}" 0 40 tag_sha) + string(APPEND msg "set(${qt_port}_REF ${tag_sha})\n") + else() + qt_get_url_filename("${qt_port}" url filename) + vcpkg_download_distfile(archive + URLS "${url}" + FILENAME "${filename}" + SKIP_SHA512 + ) + file(SHA512 "${archive}" hash) + string(APPEND msg "set(${qt_port}_HASH \"${hash}\")\n") + endif() + endforeach() + message("${msg}") + file(WRITE "${CMAKE_CURRENT_LIST_DIR}/qt_port_data_new.cmake" "${msg}") + message(FATAL_ERROR "Done downloading version and emitting hashes.") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/qt_port_data.cmake") diff --git a/ports/qtbase/dont_force_cmakecache.patch b/ports/qtbase/dont_force_cmakecache.patch deleted file mode 100644 index fc5423425dc6c2..00000000000000 --- a/ports/qtbase/dont_force_cmakecache.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake -index 4f8106dfa..bec5c402e 100644 ---- a/cmake/QtPostProcessHelpers.cmake -+++ b/cmake/QtPostProcessHelpers.cmake -@@ -472,7 +472,7 @@ function(qt_generate_install_prefixes out_var) - - foreach(var ${vars}) - get_property(docstring CACHE "${var}" PROPERTY HELPSTRING) -- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n") -+ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" )\n") - endforeach() - - set(${out_var} "${content}" PARENT_SCOPE) -@@ -528,7 +528,7 @@ qt_internal_force_set_cmake_build_type_conditionally( - endif() - if(CMAKE_CONFIGURATION_TYPES) - string(APPEND multi_config_specific -- " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\" FORCE)\n") -+ " set(CMAKE_CONFIGURATION_TYPES \"${CMAKE_CONFIGURATION_TYPES}\" CACHE STRING \"\")\n") - endif() - if(CMAKE_TRY_COMPILE_CONFIGURATION) - string(APPEND multi_config_specific -@@ -655,7 +655,7 @@ endif()\n") - # find_package(Qt6Core) is called in case if the feature was disabled. - string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS " - if(NOT QT_SKIP_BUILD_INTERNALS_PKG_CONFIG_FEATURE) -- set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\" FORCE) -+ set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\") - endif()\n") - - # The OpenSSL root dir needs to be saved so that repos other than qtbase (like qtopcua) can -diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in -index cadf3847c..6ec51fd63 100644 ---- a/cmake/QtBuildInternalsExtra.cmake.in -+++ b/cmake/QtBuildInternalsExtra.cmake.in -@@ -41,11 +41,11 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND - AND "${CMAKE_STAGING_PREFIX}" STREQUAL "" - AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX) - set(CMAKE_STAGING_PREFIX "${qtbi_new_prefix}" CACHE PATH -- "Staging path prefix, prepended onto install directories on the host machine." FORCE) -+ "Staging path prefix, prepended onto install directories on the host machine." ) - set(qtbi_new_prefix "${qtbi_orig_prefix}") - endif() - set(CMAKE_INSTALL_PREFIX "${qtbi_new_prefix}" CACHE PATH -- "Install path prefix, prepended onto install directories." FORCE) -+ "Install path prefix, prepended onto install directories." ) - unset(qtbi_orig_prefix) - unset(qtbi_real_orig_prefix) - unset(qtbi_new_prefix) -@@ -138,7 +138,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value) - AND NOT __qt_toolchain_cmake_build_type_before_project_call - AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE - AND NOT __qt_internal_extras_is_multi_config) -- set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build." FORCE) -+ set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build.") - endif() - endfunction() - diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index d3f48e11849913..a087c84636adcb 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -4,9 +4,6 @@ # 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) -if("latest" IN_LIST FEATURES) - set(QT_IS_LATEST ON) -endif() ## All above goes into the qt_port_hashes in the future include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") @@ -18,21 +15,16 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch + clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. ) 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 - dont_force_cmakecache.patch - ) -else() - list(APPEND ${PORT}_PATCHES - dont_force_cmakecache_latest.patch - ) -endif() +list(APPEND ${PORT}_PATCHES + dont_force_cmakecache_latest.patch + ) if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) message(FATAL_ERROR "${PORT} requires feature doubleconversion on windows!" ) @@ -283,41 +275,35 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} ) # Install CMake helper scripts -if(QT_IS_LATEST) - set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details-latest.cmake") -else() - set(port_details "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_port_details.cmake") -endif() -file(INSTALL - "${port_details}" - DESTINATION - "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME - "qt_port_details.cmake" - ) file(COPY - "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_copyright.cmake" - "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake" + "${CMAKE_CURRENT_LIST_DIR}/cmake/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -qt_stop_on_update() - -set(script_files qt-cmake qt-cmake-private qt-cmake-standalone-test qt-configure-module qt-internal-configure-tests) +set(other_files qt-cmake + qt-cmake-private + qt-cmake-standalone-test + qt-configure-module + qt-internal-configure-tests + ) if(CMAKE_HOST_WIN32) set(script_suffix .bat) else() set(script_suffix) endif() -set(other_files - target_qt.conf - qt-cmake-private-install.cmake - syncqt.pl - android_cmakelist_patcher.sh - android_emulator_launcher.sh - ensure_pro_file.cmake - ) +list(TRANSFORM other_files APPEND "${script_suffix}") + +list(APPEND other_files + android_cmakelist_patcher.sh + android_emulator_launcher.sh + ensure_pro_file.cmake + syncqt.pl + target_qt.conf + qt-cmake-private-install.cmake + qt-testrunner.py + ) + foreach(_config debug release) if(_config MATCHES "debug") set(path_suffix debug/) @@ -328,26 +314,34 @@ foreach(_config debug release) continue() endif() file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}") - foreach(script IN LISTS script_files) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}") - set(target_script "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${script}${script_suffix}") - file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${script}${script_suffix}" "${target_script}") - file(READ "${target_script}" _contents) + foreach(other_file IN LISTS other_files) + if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other_file}") + set(target_file "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other_file}") + file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other_file}" "${target_file}") + file(READ "${target_file}" _contents) if(_config MATCHES "debug") - string(REPLACE "\\..\\share\\" "\\..\\..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "..\\share\\" "..\\..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "../share/" "../../../../share/" _contents "${_contents}") else() - string(REPLACE "\\..\\share\\" "\\..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "..\\share\\" "..\\..\\..\\share\\" _contents "${_contents}") + string(REPLACE "../share/" "../../../share/" _contents "${_contents}") endif() - file(WRITE "${target_script}" "${_contents}") - endif() - endforeach() - foreach(other IN LISTS other_files) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}") - file(RENAME "${CURRENT_PACKAGES_DIR}/${path_suffix}bin/${other}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/${path_suffix}${other}") + string(REGEX REPLACE "set cmake_path=[^\n]+\n" "set cmake_path=cmake\n" _contents "${_contents}") + file(WRITE "${target_file}" "${_contents}") endif() endforeach() endforeach() +# Fixup qt.toolchain.cmake +set(qttoolchain "${CURRENT_PACKAGES_DIR}/share/Qt6/qt.toolchain.cmake") +file(READ "${qttoolchain}" toolchain_contents) +string(REGEX REPLACE "set\\\(__qt_initially_configured_toolchain_file [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(__qt_chainload_toolchain_file [^\\\n]+\\\n" "set(__qt_chainload_toolchain_file \"\${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}\")" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +file(WRITE "${qttoolchain}" "${toolchain_contents}") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script @@ -355,6 +349,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") + else() + message(STATUS "Files in '/bin':${_bin_files}") endif() endif() @@ -395,7 +391,7 @@ configure_file("${_file}" "${CURRENT_PACKAGES_DIR}/tools/Qt6/qt_debug.conf" @ONL if(VCPKG_TARGET_IS_WINDOWS) set(_DLL_FILES brotlicommon brotlidec bz2 freetype harfbuzz libpng16) - set(DLLS_TO_COPY) + set(DLLS_TO_COPY "") foreach(_file IN LISTS _DLL_FILES) if(EXISTS "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") list(APPEND DLLS_TO_COPY "${CURRENT_INSTALLED_DIR}/bin/${_file}.dll") @@ -410,29 +406,21 @@ string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEX string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") file(WRITE "${hostinfofile}" "${_contents}") -if(QT_IS_LATEST) - set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") - if(EXISTS "${configfile}") - file(READ "${configfile}" _contents) - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qmake.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qtpaths.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qtpaths.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.debug.bat"]] _contents "${_contents}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat"]] _contents "${_contents}") - endif() - file(WRITE "${configfile}" "${_contents}") - endif() -else() - set(coretools "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreTools.cmake") - if(EXISTS "${coretools}") - file(READ "${coretools}" _contents) +set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") +if(EXISTS "${configfile}") + file(READ "${configfile}" _contents) + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qmake.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qmake.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qmake.debug.bat"]] _contents "${_contents}") - file(WRITE "${coretools}" "${_contents}") endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/qtpaths.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/qtpaths.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/qtpaths.debug.bat"]] _contents "${_contents}") + endif() + if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") + string(REPLACE [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe"]] [[ "${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat"]] _contents "${_contents}") + endif() + file(WRITE "${configfile}" "${_contents}") endif() + diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 482883605a1db8..176b32d8b36a95 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.3.0", - "port-version": 2, + "version": "6.3.1", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index ef321ae959def6..92a4b8b745c936 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.3.0", + "version": "6.3.1", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 5a3474a9f8bcb6..ee5683a3b8a3e3 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index e6fb60802d52db..5bbf9d5b6bd4a2 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index bbef5e0d56e3c3..51c77a15766dbf 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 98039dc9f52129..8aba191ac9296e 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index ca9d565bf23486..763ce87d319cbe 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.3.0", + "version": "6.3.1", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 2b683ec956f940..09617c848a4709 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/no_target_promotion.patch b/ports/qtimageformats/no_target_promotion.patch deleted file mode 100644 index 73e5f7d4e00395..00000000000000 --- a/ports/qtimageformats/no_target_promotion.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7fdd7ddbd..f189c472c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,7 +9,16 @@ project(QtImageFormats # special case - HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C - ) -- -+find_package(Threads) -+set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) -+find_package(ZLIB) -+if(TARGET ZLIB::ZLIB) -+ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) -+endif() -+find_package(JPEG) -+if(TARGET JPEG::JPEG) -+ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) -+endif() - # special case begin - # Make sure we only use latest private CMake API, aka no compatibility wrappers. - set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) diff --git a/ports/qtimageformats/portfile.cmake b/ports/qtimageformats/portfile.cmake index 80341bd83f0b76..135bd9d8af2f9c 100644 --- a/ports/qtimageformats/portfile.cmake +++ b/ports/qtimageformats/portfile.cmake @@ -2,11 +2,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) - set(${PORT}_PATCHES no_target_promotion.patch) -else() - set(${PORT}_PATCHES no_target_promotion_latest.patch) -endif() +set(${PORT}_PATCHES no_target_promotion_latest.patch) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index fb4eff8a6c271e..2763236d655cdd 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.3.0", + "version": "6.3.1", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/49b44d4.diff b/ports/qtinterfaceframework/49b44d4.diff deleted file mode 100644 index 6bff7b7ae8779d..00000000000000 --- a/ports/qtinterfaceframework/49b44d4.diff +++ /dev/null @@ -1,148 +0,0 @@ -From 49b44d45c9eb5b5b98697f9ebb74204d45f0db38 Mon Sep 17 00:00:00 2001 -From: Dominik Holland -Date: Wed, 06 Apr 2022 15:43:23 +0200 -Subject: [PATCH] ifcodegen: Add a fallback mechanism for too recent python packages - -After the virtualenv is created the generator is now verified to be -working correctly. In case the generator doesn't work, an error -message is shown, which suggests to reconfigure with - --DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE - -The new option will install the minimum required dependencies for -qface. - -Fixes: QTBUG-102348 -Pick-to: 6.2 6.3 -Change-Id: I59aca5848da8928e94c0d33a108735847d9260a2 ---- - -diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt -index 2d9e3a4..317d77f 100644 ---- a/src/tools/ifcodegen/CMakeLists.txt -+++ b/src/tools/ifcodegen/CMakeLists.txt -@@ -22,11 +22,13 @@ - if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") - set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/Scripts/activate.bat) - set(VIRTUALENV_ACTIVATE_COMMAND ${VIRTUALENV_ACTIVATE}) -+ set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/Scripts/python.exe) - set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/Scripts/qface.exe) - set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.bat) - else() - set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/bin/activate) - set(VIRTUALENV_ACTIVATE_COMMAND . ${VIRTUALENV_ACTIVATE}) -+ set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/bin/python) - set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/bin/qface) - set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.sh) - endif() -@@ -63,6 +65,15 @@ - # someone is working on the qface sources - file(GLOB_RECURSE IFCODEGEN_SOURCE_FILES ${IFCODEGEN_SOURCE_DIR}/*.py) - -+ # If the upstream python packages introduce a regression this option can be used to install -+ # the minimum version for all required python package and produce a working setup -+ # Those packages might be outdated and may contain security holes, but they are known to be -+ # working. -+ set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND) -+ if (QT_USE_MINIMAL_QFACE_PACKAGES) -+ set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND COMMAND pip3 install -r ${IFCODEGEN_SOURCE_DIR}/requirements_minimal.txt) -+ endif() -+ - # On the CI we use the special wheel folder when available to not download all packages again on each build - set(PYTHON3_WHEEL_CACHE "$ENV{PYTHON3_WHEEL_CACHE}" CACHE PATH "Python3 wheel cache") - if (EXISTS "${PYTHON3_WHEEL_CACHE}") -@@ -74,6 +85,7 @@ - - add_custom_command(OUTPUT ${IFCODEGEN_BIN} - COMMAND ${VIRTUALENV_ACTIVATE_COMMAND} -+ ${INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND} - COMMAND ${PIP3_INSTALL_COMMAND} - DEPENDS ${VIRTUALENV_ACTIVATE} - ${IFCODEGEN_SOURCE_DIR}/requirements.txt -@@ -82,16 +94,23 @@ - ) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv -- ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun - COMMAND ${DEPLOY_VIRTUALENV} qtif_qface_virtualenv - COMMAND ${CMAKE_COMMAND} -E touch .stamp-deploy_virtualenv -- COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun - DEPENDS ${IFCODEGEN_BIN} - ) - -+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified -+ ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun -+ COMMAND ${VIRTUALENV_PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/verify_generator.py -+ COMMAND ${CMAKE_COMMAND} -E touch .stamp-generator-verified -+ COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv -+ COMMENT "Verifying generator" -+ ) -+ - # main target which just relies on the stamp file to be uptodate - add_custom_target(ifcodegen ALL -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun - ) - # Create the rerun cmake stamp file here to be able to add cmake configure dependency -@@ -109,6 +128,7 @@ - ##################################################################### - - set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified - ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv - ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun - ${VIRTUALENV_PATH} -diff --git a/src/tools/ifcodegen/verify_generator.py b/src/tools/ifcodegen/verify_generator.py -new file mode 100755 -index 0000000..c3f85d6 ---- /dev/null -+++ b/src/tools/ifcodegen/verify_generator.py -@@ -0,0 +1,46 @@ -+#!/usr/bin/env python3 -+############################################################################# -+## -+## Copyright (C) 2022 The Qt Company Ltd. -+## Contact: https://www.qt.io/licensing/ -+## -+## This file is part of the QtInterfaceFramework module of the Qt Toolkit. -+## -+## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -+## Commercial License Usage -+## Licensees holding valid commercial Qt licenses may use this file in -+## accordance with the commercial license agreement provided with the -+## Software or, alternatively, in accordance with the terms contained in -+## a written agreement between you and The Qt Company. For licensing terms -+## and conditions see https://www.qt.io/terms-conditions. For further -+## information use the contact form at https://www.qt.io/contact-us. -+## -+## GNU General Public License Usage -+## Alternatively, this file may be used under the terms of the GNU -+## General Public License version 3 as published by the Free Software -+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -+## included in the packaging of this file. Please review the following -+## information to ensure the GNU General Public License requirements will -+## be met: https://www.gnu.org/licenses/gpl-3.0.html. -+## -+## $QT_END_LICENSE$ -+## -+############################################################################# -+ -+try: -+ import generate -+except Exception as e: -+ raise SystemExit(""" -+ Verifying the generator failed! -+ -+ This might be caused by a too recent python version or -+ too recent python packages. You can try installing older -+ python packages by running configure again with the the -+ following option: -+ -+ -DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE -+ -+ The python error was: -+ -+ {} -+ """.format(e)) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index f788ab7254ef67..3d927c31140d40 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -2,7 +2,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. - 49b44d4.diff) + ) set(TOOL_NAMES ifmedia-simulation-server ifvehiclefunctions-simulation-server @@ -33,7 +33,6 @@ set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_cmake_configure(${_opt} OPTIONS ${FEATURE_OPTIONS} "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. - "-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE" OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index a3c3bf4e7abe9e..9bdb4de2ae2ecd 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 654d11143e0c51..aa2e4621834a31 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.3.0", + "version": "6.3.1", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 962679e2565637..9cca4611145baa 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index dcd5e4e7b37797..3ce8174f8275f1 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 685bcaf022ca8b..55ecdc191194fe 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 6484e6abacb160..2e457f44117b47 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 2d6fa1e4ab8313..b849bf0aed148b 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 6828042ef3ac1e..b5ea85cc878942 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.3.0", + "version": "6.3.1", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index cdc422ec3290b9..786eedf22fc157 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "qtquickcontrols2", - "version-semver": "6.2.0", + "version-string": "deprecated", "description": "Qt Quick Controls 2 (deprecated). Included in qtdeclarative", "homepage": "https://www.qt.io/", + "license": null, "dependencies": [ "qtdeclarative" ] diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index fa1ad823b752f0..fc713be016cc2b 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.3.0", + "version": "6.3.1", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 4c2591f079405f..d1bfa951b4a588 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 01a1d1387829f4..1ef5fd59844dfc 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.3.0", + "version": "6.3.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index e7a799fa694c75..83800ebc1de905 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index 5d26a8a1e4af0c..2a453b51a7518f 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.3.0", + "version": "6.3.1", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index c4bde3e9cc71cd..a699ebbe6e19d0 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 2384a42d46b9fb..94ca111a973147 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.3.0", + "version": "6.3.1", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 4c8bdb3fa41222..3f5090785738bd 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/no_src_changes.patch b/ports/qttools/no_src_changes.patch deleted file mode 100644 index 8b948c26a8a371..00000000000000 --- a/ports/qttools/no_src_changes.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 20bd474..7b69743 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -187,13 +187,13 @@ endif() - if(WIN32) - file(TO_NATIVE_PATH ${XXD_COMMAND} XXD_COMMAND) - file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css MASTER_FILE) -- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc -- COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) -+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc -+ COMMAND type ${MASTER_FILE} | "${XXD_COMMAND}" -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) - else() -- add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc -- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) -+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc -+ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/include/master.css | xxd -i > ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) - endif() --set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) -+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE) - - # Tests - -@@ -218,7 +218,7 @@ if (BUILD_TESTING) - add_executable( - ${TEST_NAME} - ${TEST_LITEHTML} -- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc -+ ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc - ) - - set_target_properties(${TEST_NAME} PROPERTIES -@@ -243,7 +243,7 @@ if (BUILD_TESTING) - endif() - - # set(TEST_NAME ${PROJECT_NAME}_tests) --# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc) -+# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_BINARY_DIR}/src/master.css.inc) - # set_target_properties(${TEST_NAME} PROPERTIES - # CXX_STANDARD 11 - # C_STANDARD 99 diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index bab69a67c22ca3..b13766cef099f8 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -1,7 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES )#fix_static_build.patch) +set(${PORT}_PATCHES) #TODO check features and setup: (means force features!) @@ -77,52 +77,14 @@ elseif(VCPKG_TARGET_IS_OSX) list(APPEND TOOL_NAMES macdeployqt) endif() -### Download third_party modules -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML - URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git - REF "${${PORT}_qlitehtml_REF}" - FETCH_REF master - HEAD_REF master -) -# port 'litehtml' is not in vcpkg! -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH_LITEHTML - REPO litehtml/litehtml - REF "${${PORT}_litehtml_REF}" - SHA512 "${${PORT}_litehtml_HASH}" - HEAD_REF master - PATCHES no_src_changes.patch -) - -##### qt_install_submodule -set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) -set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) - -qt_download_submodule(PATCHES ${${PORT}_PATCHES}) -if(QT_UPDATE_VERSION) - return() -endif() -file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml") -file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml") - - -if(_qis_DISABLE_NINJA) - set(_opt DISABLE_NINJA) -endif() -qt_cmake_configure(${_opt} - OPTIONS ${FEATURE_OPTIONS} +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + ${FEATURE_OPTIONS} -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON - OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} - OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) - -vcpkg_cmake_install(ADD_BIN_TO_PATH) - -qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) - -qt_install_copyright("${SOURCE_PATH}") - -##### qt_install_submodule + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) if(VCPKG_TARGET_IS_OSX) set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app) @@ -134,16 +96,6 @@ if(VCPKG_TARGET_IS_OSX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -if(NOT QT_IS_LATEST) - set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") - if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/windeployqt.exe") - file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/windeployqt.debug.bat" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") - file(READ "${configfile}" _contents) - string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") - file(WRITE "${configfile}" "${_contents}") - endif() -endif() - file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*") list(LENGTH debug_dir debug_dir_elements) if(debug_dir_elements EQUAL 0) diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index cbbda35b61e010..97476b70f508c2 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qttools", - "version": "6.3.0", - "port-version": 1, + "version": "6.3.1", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 135e746583009f..5703f4e1cfb46c 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 69c4aa803aec7f..abc35fc1a52a73 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.3.0", + "version": "6.3.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index e662994d29f079..746cc7ccea848d 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.3.0", + "version": "6.3.1", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 13315f04ecd303..fcb172f1d85caf 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index f228d620affe73..0fcb8ab97a8419 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -1,6 +1,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") +#set(${PORT}_PATCHES 0ce5e91.diff) # ICE Workaround; Needs path adjustments + set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -60,15 +62,8 @@ vcpkg_add_to_path(PREPEND "${FLEX_DIR}") get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${BISON_DIR}") -if(NOT QT_IS_LATEST) - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) - vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") - list(APPEND FEATURE_OPTIONS "-DPython2_EXECUTABLE=${PYTHON2}") -else() - vcpkg_find_acquire_program(PYTHON3) - x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib) -endif() +vcpkg_find_acquire_program(PYTHON3) +x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") set(GPERF "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -95,15 +90,6 @@ if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS) file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}") endif() -### Download third_party modules -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE - URL git://code.qt.io/qt/qtwebengine-chromium.git - REF "${${PORT}_chromium_REF}" - PATCHES - 0ce5e91.diff -) - ##### qt_install_submodule set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) @@ -112,19 +98,12 @@ qt_download_submodule(PATCHES ${${PORT}_PATCHES}) if(QT_UPDATE_VERSION) return() endif() -if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") - file(RENAME "${SOURCE_PATH_WEBENGINE}/chromium" "${SOURCE_PATH}/src/3rdparty/chromium") -endif() -if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") - file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") -endif() qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. OPTIONS ${FEATURE_OPTIONS} -DGPerf_EXECUTABLE=${GPERF} -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} - #-DGn_EXECUTABLE=${GN} -DNodejs_EXECUTABLE=${NODEJS} OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 5560810714260e..47cf3c88a37197 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,8 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.3.0", - "port-version": 3, + "version": "6.3.1", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 3f37294d95f56b..bcca1178983735 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 0842799214b983..a4ddce994273bb 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.3.0", + "version": "6.3.1", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 599826ba8d2c8c..fd625312613839 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5729,7 +5729,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5909,7 +5909,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qt6betablock": { @@ -5917,51 +5917,51 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.3.0", - "port-version": 1 + "baseline": "6.3.1", + "port-version": 0 }, "qtbase": { - "baseline": "6.3.0", - "port-version": 2 + "baseline": "6.3.1", + "port-version": 0 }, "qtcharts": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtcoap": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtdoc": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtimageformats": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtkeychain": { @@ -5977,99 +5977,99 @@ "port-version": 0 }, "qtlottie": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtmqtt": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtopcua": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtpositioning": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtquick3d": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.2.0", + "baseline": "deprecated", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtscxml": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtsensors": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtserialbus": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtserialport": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtshadertools": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtsvg": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qttools": { - "baseline": "6.3.0", - "port-version": 1 + "baseline": "6.3.1", + "port-version": 0 }, "qttranslations": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtwayland": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtwebengine": { - "baseline": "6.3.0", - "port-version": 3 + "baseline": "6.3.1", + "port-version": 0 }, "qtwebsockets": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "qtwebview": { - "baseline": "6.3.0", + "baseline": "6.3.1", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index a75d487a560019..9bdbff55bd8de8 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a008830e0a624fce731b50046e8f3b89c46c340", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "8b4a7a1d86d93bd16d897b76cdf85abeac8e67d3", "version": "6.3.0", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index c33c3f1d0b9fe4..61f970551a5b77 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7272e6150222d29108fa00089066f55ceab215ea", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "0de65b9a2c56a557ec23d71c0f9eb83d1814d01f", "version": "6.3.0", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index ca9603d80d64e7..9c241aaf1a32d7 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c415044d8f956b7f08dd627bbe1afb172ea83bb", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "774c1e6820a5c0271d4f228f7f680664e3407641", "version": "6.3.0", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 7bbc4f490390ad..9020d0e313794e 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "154acc25a743ab1e454fc9c2a801f6eb2d28c8e1", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "0a0462497e72897f08a1220703103e874822af44", "version": "6.3.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 11e682dc5eb09f..018e1b36cf356c 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "436e3f3fbaac28eabd4199c4ac97407bb701e929", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "bad99835f1e2cf63bc1ddcd9d5871e3081964bbc", "version": "6.3.0", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index afca070b925922..63442d02d4ca4e 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a15b7d019195f7598c982e0e04c3af1854c9f2e1", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "5a6b0d90d87f22b85e513ae3aec86a31da8ba345", "version": "6.3.0", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 828fd8e0a794ac..f311cbdeba3552 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffcdc27a6814e5a08af5c618b230c2c144a49c7e", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "9d43d6c903f6d72b54187e9f6657a346929ab515", "version": "6.3.0", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index addefe2357ef2a..94afd1e02a0499 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84a17dffda30f3239e065b5776ff972098613dd7", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "6c7069034cb39a6450178d52a58a0ddffda07b5d", "version": "6.3.0", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index da7d86be7146ed..579f9d24547149 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7aa59175c94525ec18c988c866356882c730cb5", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "a1fd864c050d29e79b16f84029402fcb3840d1a9", "version": "6.3.0", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index ffffb58e8b6f90..3516007e411048 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f07ed79d7c1a7c616539e8243126143cf202b706", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "551991d8ec2c004a196cc0c3e6acc8babe34546f", "version": "6.3.0", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index 795acfe145055c..b1b5ee79842ae3 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02a1198b628b04d7969fbf1f8214428da635555e", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "4945df086d916c7aa24e9ed44ac983b1ef65c84b", "version": "6.3.0", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 2eee1ca53b9a15..ecbb5a2420d115 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78caa376b251d8d5cdd40c5128a2a657308c6d10", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "cb9dbafdcf670a693bbdfb8c9d9f3a6282e8a455", "version": "6.3.0", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index c73d127634f6dd..79d359c227f7b4 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc60f798c304673e062010dcf4b1c3b27bc5d46b", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "8be93de3e45f5a409cb6606b1f9e240468513506", "version": "6.3.0", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index a9fd1a0b451ad0..b27d331c1b9a98 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ddae3f893d3147528593a2b05ad2012416a6a26", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "fdc3b41d77a6ee6160cfc442ddacf03aa91d0481", "version": "6.3.0", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 73f5ebe5371e95..f30efce713b363 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b817b1b9d2907f2eff4b3720adaf5e57d3ba58d8", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "ea1df3762dec91c8fb7709297007be459484e89c", "version": "6.3.0", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 3a4f689df0d61a..1623b03c593a24 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dac98dff234119fbebcd0ad9fa5aba66f331fa67", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "0f29ef7a81aacf9d33e6741138f80be59f69a8a2", "version": "6.3.0", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 69df371935ddd1..cffae3eb23ccce 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa389d9b2b938058dda0c787072eb791a7c6032e", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "21bab604cd34ebe659fdc7b12249d1e69359d939", "version": "6.3.0", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 4e5dabc7bc327d..a42bf72c96799f 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73fb3aef5bcda38a39d0e75b6a64193beea261ce", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "2449ff55a2b817d0f651aa00b2cadc914c0b68ae", "version": "6.3.0", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index c3f649c3127ce5..52d1316fce90cc 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb153569181c4723a0c2c2811e1d9e74e13c75e1", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "8083780556aa4e951599cc798aa4a64a3ccf7341", "version": "6.3.0", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index cb3cf2885343b6..28835c0908b032 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05f02aa08ead77446d353e181062fd78b2253b7b", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "47fd199ee3c949ade116a3c070f2aaaedd2aa91f", "version": "6.3.0", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 9a84e09da26677..7b6d067affcc1e 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3b68a69ca91b7485ada2416293d0a9447d0ba95", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "d5c67539ad28c84e99778aa173cda5950873a6ee", "version": "6.3.0", diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index babcf6e316acdb..2ac3400b97a874 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f018726e72742c98506b024d91adef2e4b95c6e", + "version-string": "deprecated", + "port-version": 0 + }, { "git-tree": "cc6552504db6a9b651a65d98fbeb232152b7a8fe", "version-semver": "6.2.0", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 1cd036b973e29a..76f1959c5495a4 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d92d8af81e01f106e680d66ad1d1a698f40c01d9", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "28a8faa45cb13b376cd881be9494826bb9556009", "version": "6.3.0", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 69dc10ffc0307a..1649e142288204 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9ab5c76eacdd4f7352ff1be88c221335057c91a", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "ce8e5b5c4570cf489ea6dd4e19c454e2e3ab54bb", "version": "6.3.0", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 28d95bcf17761b..e04e91e106290a 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dad48d019ccaba8f0a7579d903cd99c901c74fc5", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "3b64cdc43d7e83cb693720f28c13408a39ad0afa", "version": "6.3.0", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 39a7e985e9782f..877a6d0bc85887 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10b934af8bbfa5f960391ab2bd121194c9aee494", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "8eefc49c6f1c874ba871cbb811e13b54a0fdf7ff", "version": "6.3.0", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 8cd62cd8ae375a..ea824a8892e41d 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac0f2168badd930acb29ef160c7bc408cf0e062c", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "8df6a16221d7abc2af7d76a7c809901e5ae45484", "version": "6.3.0", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index e0803db96c0e51..0b28da0acd7ba0 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7974343d211dd12cb91e9cca217e8f9b04783182", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "c74684c9a5e6b20ae4066a5f1b7af2decec2ced7", "version": "6.3.0", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 1cad19d17f270f..9a2d17e5e5f019 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1ee6d4dc6fe612733391a78b4149393ab82c78b", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "75ac0d075ab14c918db6e38e398fca4bc877c146", "version": "6.3.0", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index e04f0ab9be4a09..375240f15619dd 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc44ba493ec11d3b32c272c115add826353cb707", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "3bc8989c9c61cc741186f5dc7fc4eda94f20f6a4", "version": "6.3.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index a04b333daf417f..5cecc2951a9e86 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7fb1deea8bfdc96c67528333b47b1ffc9c4ad60", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "4bef4075be6e9e33ada53f0e2b3a37329187fa5a", "version": "6.3.0", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 2827646445e3d2..8d09d6956cc6a4 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a11055fa2395cf5885d2f064ae5bead129cd815", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "09befbf6b2bd7001465003cbdd49ae138b754316", "version": "6.3.0", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 07b21571686335..bee56b92a832bc 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd49b655ecb0526706a5aaa81ffdaa05ef74c031", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "5804d29790d75c7a40c1fe9c4f54c3cfd03a5eaa", "version": "6.3.0", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 7f37d926ea69ba..cf9b00bae73b14 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbcba20baf4e7189691d19cea523b0c23b837749", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "9e7c6ecb71e8b4c3b8277f97f461d6f8b017ef1c", "version": "6.3.0", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 03c186376b2285..940fcfc67b6521 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f8c92c126be424363d4de120e17dae54ada0b6b", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "b8c14bb3f3297e816d3f0df2bc0377fce7963c55", "version": "6.3.0", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index b4578d278ffcc2..bc8f1936f433b3 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a44c1faf17e5e071b28369731c24b766656a8a8e", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "29b6cc23c91540debb74a38874cdd5985e7dbf59", "version": "6.3.0", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index e2499a6ceca908..a04496c299bfb6 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da354bd4fff935834b6b2b68e7956f9087b5f64d", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "615c601a62d67874adfb14ae7f1d9859f87a6719", "version": "6.3.0", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 699bcdf62b41d6..cc217d648a615e 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66528f9f10385e04a300e217aa15aa8fd8a82677", + "version": "6.3.1", + "port-version": 0 + }, { "git-tree": "248b7ff0cd48d36410f9fde1119d2624260a4c6a", "version": "6.3.0", From ad606d66cdfa4fa7f26b4a155d35add78b8f60e9 Mon Sep 17 00:00:00 2001 From: Dylan Staley <88163+dstaley@users.noreply.github.com> Date: Fri, 1 Jul 2022 22:37:34 -0700 Subject: [PATCH 019/791] [soxr] fix `arm64-osx` build (#25439) * [soxr] detect arm64 on macOS * [soxr] update versions --- ...{003_detect_arm_on_windows.patch => 003_detect_arm.patch} | 2 +- ports/soxr/portfile.cmake | 2 +- ports/soxr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/soxr.json | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) rename ports/soxr/{003_detect_arm_on_windows.patch => 003_detect_arm.patch} (90%) diff --git a/ports/soxr/003_detect_arm_on_windows.patch b/ports/soxr/003_detect_arm.patch similarity index 90% rename from ports/soxr/003_detect_arm_on_windows.patch rename to ports/soxr/003_detect_arm.patch index f1643fb6347a9c..90d3fd281ce10a 100644 --- a/ports/soxr/003_detect_arm_on_windows.patch +++ b/ports/soxr/003_detect_arm.patch @@ -7,7 +7,7 @@ index 0686bef..e4cb094 100644 ARM NEON support macros */ -#elif !defined(PFFFT_SIMD_DISABLE) && defined(__arm__) -+#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(_M_ARM)) ++#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)) # include typedef float32x4_t v4sf; # define SIMD_SZ 4 diff --git a/ports/soxr/portfile.cmake b/ports/soxr/portfile.cmake index 63070fcb4771fe..a922020dec5337 100644 --- a/ports/soxr/portfile.cmake +++ b/ports/soxr/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_sourceforge( PATCHES 001_initialize-resampler.patch 002_disable_warning.patch - 003_detect_arm_on_windows.patch + 003_detect_arm.patch ) vcpkg_check_features( diff --git a/ports/soxr/vcpkg.json b/ports/soxr/vcpkg.json index ec6f109904f2b1..3a7edcd3aad3f8 100644 --- a/ports/soxr/vcpkg.json +++ b/ports/soxr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "soxr", "version": "0.1.3", - "port-version": 6, + "port-version": 7, "description": "High quality audio resampling", "homepage": "https://sourceforge.net/projects/soxr/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fd625312613839..67c1ef270c5211 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6706,7 +6706,7 @@ }, "soxr": { "baseline": "0.1.3", - "port-version": 6 + "port-version": 7 }, "spaceland": { "baseline": "7.8.2", diff --git a/versions/s-/soxr.json b/versions/s-/soxr.json index 5f0f63d391f52f..84790c0df7690a 100644 --- a/versions/s-/soxr.json +++ b/versions/s-/soxr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eaa72e750312e0bacbd2a02e1a16fcc680489dd", + "version": "0.1.3", + "port-version": 7 + }, { "git-tree": "fca92eeca8f38c1662193dd443e401c5fe7fbfc7", "version": "0.1.3", From 4826ede84084395b0f87476e48ff6d4070eba0e4 Mon Sep 17 00:00:00 2001 From: Jianshen Liu Date: Fri, 1 Jul 2022 22:50:05 -0700 Subject: [PATCH 020/791] [dpdk] Update to version v22.03 (#25374) --- ports/dpdk/CMakeLists.txt | 63 --------- ports/dpdk/FindNuma.cmake | 26 ---- ports/dpdk/dpdkConfig.cmake | 31 ---- ...enable-either-static-or-shared-build.patch | 133 ++++++++++++++++++ ports/dpdk/portfile.cmake | 129 +++++++++++------ .../remove-examples-src-from-datadir.patch | 17 +++ ports/dpdk/stop-building-apps.patch | 13 ++ ports/dpdk/unofficial-dpdk-config.cmake.in | 65 +++++++++ ports/dpdk/usage | 4 +- ports/dpdk/vcpkg.json | 40 +++++- scripts/ci.baseline.txt | 9 -- versions/baseline.json | 4 +- versions/d-/dpdk.json | 5 + 13 files changed, 360 insertions(+), 179 deletions(-) delete mode 100644 ports/dpdk/CMakeLists.txt delete mode 100644 ports/dpdk/FindNuma.cmake delete mode 100644 ports/dpdk/dpdkConfig.cmake create mode 100644 ports/dpdk/enable-either-static-or-shared-build.patch create mode 100644 ports/dpdk/remove-examples-src-from-datadir.patch create mode 100644 ports/dpdk/stop-building-apps.patch create mode 100644 ports/dpdk/unofficial-dpdk-config.cmake.in diff --git a/ports/dpdk/CMakeLists.txt b/ports/dpdk/CMakeLists.txt deleted file mode 100644 index 1952227ae0d65e..00000000000000 --- a/ports/dpdk/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(dpdk C) - -LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") -LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}") - -INCLUDE(ProcessorCount) -PROCESSORCOUNT(PROCS) - -#ARCH can be: i686, x86_64, ppc_64, arm64 -#MACHINE can be: native, power8, armv8a -#EXECENV can be: linuxapp, bsdapp -#TOOLCHAIN can be: gcc, icc - -SET(ARCH x86_64) -SET(MACHINE native) -SET(EXECENV linuxapp) -SET(TOOLCHAIN gcc) - -IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") - SET(ARCH "i686") -ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") - SET(MACHINE arm8a) -ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64") - SET(MACHINE power8) - SET(ARCH ppc_64) -ENDIF () - -IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - SET(EXECENV bsdapp) -ENDIF () - -FIND_PACKAGE(Numa REQUIRED) -FIND_PROGRAM(MAKE make) - -SET(DPDK_CFLAGS "-fPIC") -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - STRING(APPEND ${DPDK_CFLAGS} "-O0 -g") -ENDIF () - -SET(DPDK_TARGET ${ARCH}-${MACHINE}-${EXECENV}-${TOOLCHAIN}) -#SET(DPDK_CONFIG O=${CMAKE_BUILD_TYPE}/build T=${DPDK_TARGET}) -SET(DPDK_CONFIG "T=${DPDK_TARGET}") - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -ADD_CUSTOM_TARGET(dpdk-configure - COMMAND ${MAKE} config ${DPDK_CONFIG} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - VERBATIM - ) - -ADD_CUSTOM_TARGET(dpdk ALL - COMMAND ${MAKE} EXTRA_CFLAGS=\"${DPDK_CFLAGS}\" MAKEFLAGS=\"${DPDK_CONFIG} -j ${PROCS}\" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - ) - -ADD_DEPENDENCIES(dpdk dpdk-configure) - -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/build/lib - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) diff --git a/ports/dpdk/FindNuma.cmake b/ports/dpdk/FindNuma.cmake deleted file mode 100644 index d5bb6143559541..00000000000000 --- a/ports/dpdk/FindNuma.cmake +++ /dev/null @@ -1,26 +0,0 @@ -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PATH(NUMA_ROOT_DIR - NAMES include/numa.h - PATHS ENV NUMA_ROOT - DOC "NUMA library root directory") - -FIND_PATH(NUMA_INCLUDE_DIR - NAMES numa.h - HINTS ${NUMA_ROOT_DIR} - PATH_SUFFIXES include - DOC "NUMA include directory") - -FIND_LIBRARY(NUMA_LIBRARY - NAMES numa - HINTS ${NUMA_ROOT_DIR} - DOC "NUMA library file") - -IF (NUMA_LIBRARY) - GET_FILENAME_COMPONENT(NUMA_LIBRARY_DIR ${NUMA_LIBRARY} PATH) - MARK_AS_ADVANCED(NUMA_INCLUDE_DIR NUMA_LIBRARY_DIR NUMA_LIBRARY) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(NUMA REQUIRED_VARS NUMA_ROOT_DIR NUMA_INCLUDE_DIR NUMA_LIBRARY) -ELSE () - SET(NUMA_FOUND FALSE) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () diff --git a/ports/dpdk/dpdkConfig.cmake b/ports/dpdk/dpdkConfig.cmake deleted file mode 100644 index d60265a77bdeec..00000000000000 --- a/ports/dpdk/dpdkConfig.cmake +++ /dev/null @@ -1,31 +0,0 @@ - -FUNCTION(SET_LIBRARY_TARGET NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - ADD_LIBRARY(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - SET_TARGET_PROPERTIES(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - SET(${NAMESPACE}_${LIB_NAME}_FOUND 1) -ENDFUNCTION() - -GET_FILENAME_COMPONENT(DPDK_ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) -GET_FILENAME_COMPONENT(DPDK_ROOT "${DPDK_ROOT}" PATH) - -SET_LIBRARY_TARGET("DPDK" "dpdk" "${DPDK_ROOT}/debug/lib/libdpdk.a" "${DPDK_ROOT}/lib/libdpdk.a" "${DPDK_ROOT}/include/dpdk") - -IF (CMAKE_BUILD_TYPE STREQUAL Debug) - LINK_DIRECTORIES(${DPDK_ROOT}/debug/lib/) -ELSE () - LINK_DIRECTORIES(${DPDK_ROOT}/lib/) -ENDIF () - -FILE(GLOB DPDK_LIBS ${DPDK_ROOT}/lib/librte*.*) -FOREACH (LIB_FILE_NAME ${DPDK_LIBS}) - GET_FILENAME_COMPONENT(LIB_NAME ${LIB_FILE_NAME} NAME_WE) - GET_FILENAME_COMPONENT(FULL_LIB_NAME ${LIB_FILE_NAME} NAME) - STRING(REPLACE "lib" "" LIB_NAME "${LIB_NAME}") - SET_LIBRARY_TARGET("DPDK" "${LIB_NAME}" "${DPDK_ROOT}/debug/lib/${FULL_LIB_NAME}" "${DPDK_ROOT}/lib/${FULL_LIB_NAME}" "${DPDK_ROOT}/include/dpdk") -ENDFOREACH () diff --git a/ports/dpdk/enable-either-static-or-shared-build.patch b/ports/dpdk/enable-either-static-or-shared-build.patch new file mode 100644 index 00000000000000..c281894969bd1f --- /dev/null +++ b/ports/dpdk/enable-either-static-or-shared-build.patch @@ -0,0 +1,133 @@ +diff --git a/drivers/meson.build b/drivers/meson.build +index 1d8123b00c..2de654692d 100644 +--- a/drivers/meson.build ++++ b/drivers/meson.build +@@ -126,14 +126,15 @@ foreach subpath:subdirs + if not build + break + endif +- if not is_variable('shared_rte_' + d) ++ if get_option('default_library') == 'static' and is_variable('static_rte_' + d) ++ static_deps += [get_variable('static_rte_' + d)] ++ elif get_option('default_library') == 'shared' and is_variable('shared_rte_' + d) ++ shared_deps += [get_variable('shared_rte_' + d)] ++ else + build = false + reason = 'missing internal dependency, "@0@"'.format(d) + message('Disabling @1@ [@2@]: missing internal dependency "@0@"' + .format(d, name, 'drivers/' + drv_path)) +- else +- shared_deps += [get_variable('shared_rte_' + d)] +- static_deps += [get_variable('static_rte_' + d)] + endif + endforeach + endif +@@ -158,6 +159,7 @@ foreach subpath:subdirs + + install_headers(headers) + ++ if get_option('default_library') == 'static' + # generate pmdinfo sources by building a temporary + # lib and then running pmdinfogen on the contents of + # that lib. The final lib reuses the object files and +@@ -220,6 +222,13 @@ foreach subpath:subdirs + endif + endif + ++ static_dep = declare_dependency( ++ include_directories: includes, ++ dependencies: static_deps) ++ dpdk_drivers += static_lib ++ set_variable('static_@0@'.format(lib_name), static_dep) ++ ++ else + shared_lib = shared_library(lib_name, sources, + objects: objs, + include_directories: includes, +@@ -237,14 +246,10 @@ foreach subpath:subdirs + shared_dep = declare_dependency(link_with: shared_lib, + include_directories: includes, + dependencies: shared_deps) +- static_dep = declare_dependency( +- include_directories: includes, +- dependencies: static_deps) ++ set_variable('shared_@0@'.format(lib_name), shared_dep) + +- dpdk_drivers += static_lib ++ endif + +- set_variable('shared_@0@'.format(lib_name), shared_dep) +- set_variable('static_@0@'.format(lib_name), static_dep) + dependency_name = ''.join(lib_name.split('rte_')) + if developer_mode + message('drivers/@0@: Defining dependency "@1@"'.format( +diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build +index 8e5e8c1b55..39593cd8a6 100644 +--- a/drivers/net/octeontx/base/meson.build ++++ b/drivers/net/octeontx/base/meson.build +@@ -10,7 +10,7 @@ sources = [ + depends = ['ethdev', 'mempool_octeontx'] + static_objs = [] + foreach d: depends +- if not is_variable('shared_rte_' + d) ++ if get_option('default_library') == 'shared' and not is_variable('shared_rte_' + d) + subdir_done() + endif + static_objs += get_variable('static_rte_' + d) +diff --git a/lib/meson.build b/lib/meson.build +index 24adbe44c9..e614ec57af 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -146,14 +146,15 @@ foreach l:libraries + if not build + break + endif +- if not is_variable('shared_rte_' + d) ++ if get_option('default_library') == 'static' ++ static_deps += [get_variable('static_rte_' + d)] ++ elif is_variable('shared_rte_' + d) ++ shared_deps += [get_variable('shared_rte_' + d)] ++ else + build = false + reason = 'missing internal dependency, "@0@"'.format(d) + message('Disabling @1@ [@2@]: missing internal dependency "@0@"' + .format(d, name, 'lib/' + l)) +- else +- shared_deps += [get_variable('shared_rte_' + d)] +- static_deps += [get_variable('static_rte_' + d)] + endif + endforeach + +@@ -185,6 +186,7 @@ foreach l:libraries + endif + cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=lib.' + l + ++ if get_option('default_library') == 'static' + # first build static lib + static_lib = static_library(libname, + sources, +@@ -246,6 +248,10 @@ foreach l:libraries + output: name + '.sym_chk') + endif + ++ dpdk_static_libraries = [static_lib] + dpdk_static_libraries ++ set_variable('static_rte_' + name, static_dep) ++ ++ else + shared_lib = shared_library(libname, + sources, + objects: objs, +@@ -262,10 +268,10 @@ foreach l:libraries + dependencies: shared_deps) + + dpdk_libraries = [shared_lib] + dpdk_libraries +- dpdk_static_libraries = [static_lib] + dpdk_static_libraries +- + set_variable('shared_rte_' + name, shared_dep) +- set_variable('static_rte_' + name, static_dep) ++ ++ endif ++ + if developer_mode + message('lib/@0@: Defining dependency "@1@"'.format(l, name)) + endif diff --git a/ports/dpdk/portfile.cmake b/ports/dpdk/portfile.cmake index 9ac5fa161f3c58..52b0a697e28e2d 100644 --- a/ports/dpdk/portfile.cmake +++ b/ports/dpdk/portfile.cmake @@ -1,43 +1,86 @@ -IF (NOT VCPKG_CMAKE_SYSTEM_NAME OR NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel dpdk currently only supports Linux/BSD platforms") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO DPDK/dpdk - REF v19.02 - SHA512 e0cc7081b163b4e264b65c1abb7e0f8aa29211539cecc5cf52986699b800eb4d4f2026377c3048c5c3bd2791e41f21645bb655797a3300740aa83633fb87626e - HEAD_REF master -) - -FIND_PATH(NUMA_INCLUDE_DIR NAME numa.h - PATHS ENV NUMA_ROOT - HINTS $ENV{HOME}/local/include /opt/local/include /usr/local/include /usr/include - ) -IF (NOT NUMA_INCLUDE_DIR) - MESSAGE(FATAL_ERROR "Numa library not found.\nTry: 'sudo yum install numactl numactl-devel' (or sudo apt-get install libnuma1 libnuma-dev)") -ENDIF () - -VCPKG_CONFIGURE_CMAKE( - SOURCE_PATH ${CMAKE_CURRENT_LIST_DIR} - PREFER_NINJA - OPTIONS - -DSOURCE_PATH=${SOURCE_PATH} -) - -VCPKG_INSTALL_CMAKE() - -# Headers are symbolic links here, gather all, resolve and copy real files -FILE(GLOB_RECURSE HEADERS FOLLOW_SYMLINKS "${SOURCE_PATH}/build/include/*") -SET(REAL_FILES "") -FOREACH (HEADER ${HEADERS}) - GET_FILENAME_COMPONENT(REAL_FILE "${HEADER}" REALPATH) - LIST(APPEND REAL_FILES "${REAL_FILE}") -ENDFOREACH () - -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -FILE(INSTALL ${REAL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/dpdkConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${SOURCE_PATH}/license/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +if(VCPKG_TARGET_IS_LINUX) + execute_process( + COMMAND uname --kernel-release + OUTPUT_VARIABLE KERNEL_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(KERNEL_VERSION VERSION_LESS 4.4) + message( + WARNING + " Kernel version requires >= 4.4 on Linux (current version: ${KERNEL_VERSION})\n" + " Building may fail or have functional defects. See\n" + " https://doc.dpdk.org/guides/linux_gsg/sys_reqs.html#system-software" + ) + endif() + + execute_process( + COMMAND sh -c "ldd --version | head -n1 | rev | cut -d' ' -f 1 | rev" + OUTPUT_VARIABLE GLIBC_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + + if(GLIBC_VERSION VERSION_LESS 2.7) + message( + FATAL_ERROR + "glibc version requires >= 2.7 (for features related to cpuset)") + endif() +endif() + +set(PORT_VERSION 22.03) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO DPDK/dpdk + REF v${PORT_VERSION} + SHA512 ff80a9f87e71cd743ea5e62f515849bc6746fe7496a0d4b63ecf2bfe0d88da74f0e6c0257c07838c1f9ff41abd81827932b97731fb0fce60d56a8bab7e32347c + HEAD_REF main + PATCHES + enable-either-static-or-shared-build.patch + remove-examples-src-from-datadir.patch + stop-building-apps.patch) + +macro(append_bool_option feature_name option_name) + if("${feature_name}" IN_LIST FEATURES) + list(APPEND DPDK_OPTIONS -D${option_name}=true) + else() + list(APPEND DPDK_OPTIONS -D${option_name}=false) + endif() +endmacro() + +append_bool_option("docs" "enable_docs") +append_bool_option("kmods" "enable_kmods") +append_bool_option("tests" "tests") +append_bool_option("trace" "enable_trace_fp") + +list(APPEND PYTHON_PACKAGES pyelftools) +if("docs" IN_LIST FEATURES) + list(APPEND PYTHON_PACKAGES packaging sphinx) +endif() +x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES ${PYTHON_PACKAGES}) + +vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} OPTIONS + -Ddisable_drivers=regex/cn9k -Dexamples= ${DPDK_OPTIONS}) +vcpkg_install_meson() + +vcpkg_copy_tools(TOOL_NAMES dpdk-devbind.py dpdk-pmdinfo.py dpdk-telemetry.py + dpdk-hugepages.py AUTO_CLEAN) + +vcpkg_fixup_pkgconfig() + +vcpkg_find_acquire_program(PKGCONFIG) +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in" + "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" + @ONLY) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file( + INSTALL "${SOURCE_PATH}/license/README" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +include(CMakePackageConfigHelpers) +write_basic_package_version_file( + "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config-version.cmake" + VERSION ${PORT_VERSION} + COMPATIBILITY AnyNewerVersion) diff --git a/ports/dpdk/remove-examples-src-from-datadir.patch b/ports/dpdk/remove-examples-src-from-datadir.patch new file mode 100644 index 00000000000000..fbbc84a2782355 --- /dev/null +++ b/ports/dpdk/remove-examples-src-from-datadir.patch @@ -0,0 +1,17 @@ +diff --git a/meson.build b/meson.build +index 0541e7f145..00f6e67550 100644 +--- a/meson.build ++++ b/meson.build +@@ -79,9 +79,9 @@ subdir('doc') + # build any examples explicitly requested - useful for developers - and + # install any example code into the appropriate install path + subdir('examples') +-install_subdir('examples', +- install_dir: get_option('datadir') + '/dpdk', +- exclude_files: ex_file_excludes) ++# install_subdir('examples', ++# install_dir: get_option('datadir') + '/dpdk', ++# exclude_files: ex_file_excludes) + + # build kernel modules if enabled + if get_option('enable_kmods') diff --git a/ports/dpdk/stop-building-apps.patch b/ports/dpdk/stop-building-apps.patch new file mode 100644 index 00000000000000..644bd63be4e842 --- /dev/null +++ b/ports/dpdk/stop-building-apps.patch @@ -0,0 +1,13 @@ +diff --git a/app/meson.build b/app/meson.build +index 93d8c15032..389dc13b99 100644 +--- a/app/meson.build ++++ b/app/meson.build +@@ -27,7 +27,7 @@ if get_option('default_library') == 'static' and not is_windows + endif + + foreach app:apps +- build = true ++ build = false + name = app + sources = [] + includes = [] diff --git a/ports/dpdk/unofficial-dpdk-config.cmake.in b/ports/dpdk/unofficial-dpdk-config.cmake.in new file mode 100644 index 00000000000000..90d33c094aecc8 --- /dev/null +++ b/ports/dpdk/unofficial-dpdk-config.cmake.in @@ -0,0 +1,65 @@ +# By default CMAKE_PREFIX_PATH, which contains the VCPKG_INSTALLED_DIR, will be +# appended to the pkg-config search path. Because it is appending and not +# prepeding, system packages may be found first. Specifically prepending the +# vcpkg_pkg_config_path to ENV{PKG_CONFIG_PATH} will prioritize the vcpkg +# packages. +if(NOT VCPKG_PREFER_SYSTEM_LIBS) + if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES + "^[Dd][Ee][Bb][Uu][Gg]$") + set(path_suffix "/debug") + else() + set(path_suffix "") + endif() + set(backup_env_pkg_config_path "$ENV{PKG_CONFIG_PATH}") + # libdpdk.pc and libdpdk-libs.pc are installed to this path + set(ENV{PKG_CONFIG_PATH} + "@CURRENT_INSTALLED_DIR@${path_suffix}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" + ) +else() + unset(backup_env_pkg_config_path) +endif() + +if(DEFINED ENV{PKG_CONFIG}) + set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}") +else() + set(PKG_CONFIG_EXECUTABLE "@PKGCONFIG@") +endif() +find_package(PkgConfig REQUIRED) +pkg_check_modules(LIBDPDK REQUIRED libdpdk>=@PORT_VERSION@) + +if(DEFINED backup_env_pkg_config_path) + set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path}") +endif() + +mark_as_advanced( + LIBDPDK_STATIC_INCLUDE_DIRS + LIBDPDK_INCLUDE_DIRS + LIBDPDK_STATIC_CFLAGS + LIBDPDK_CFLAGS + LIBDPDK_STATIC_LDFLAGS + LIBDPDK_LDFLAGS + LIBDPDK_VERSION) + +add_library(unofficial::@PORT@::dpdk INTERFACE IMPORTED) +unset(LIBDPDK_FOUND) + +if(@VCPKG_LIBRARY_LINKAGE@ STREQUAL "static") + set(INCLUDE_DIRS "${LIBDPDK_STATIC_INCLUDE_DIRS}") + # https://bechsoftware.com/2021/12/05/configuring-dpdk-projects-with-cmake/ + target_compile_options(unofficial::@PORT@::dpdk + INTERFACE ${LIBDPDK_STATIC_CFLAGS}) + target_link_libraries(unofficial::@PORT@::dpdk + INTERFACE ${LIBDPDK_STATIC_LDFLAGS}) +else() + set(INCLUDE_DIRS "${LIBDPDK_INCLUDE_DIRS}") + target_compile_options(unofficial::@PORT@::dpdk INTERFACE ${LIBDPDK_CFLAGS}) + target_link_libraries(unofficial::@PORT@::dpdk INTERFACE ${LIBDPDK_LDFLAGS}) +endif() + +target_include_directories(unofficial::@PORT@::dpdk INTERFACE ${INCLUDE_DIRS}) + +find_package_handle_standard_args( + unofficial-@PORT@ + REQUIRED_VARS INCLUDE_DIRS LIBDPDK_STATIC_CFLAGS LIBDPDK_CFLAGS + LIBDPDK_STATIC_LDFLAGS LIBDPDK_LDFLAGS + VERSION_VAR LIBDPDK_VERSION) diff --git a/ports/dpdk/usage b/ports/dpdk/usage index 6ecb606ddb5703..0dc6cd0010ff35 100644 --- a/ports/dpdk/usage +++ b/ports/dpdk/usage @@ -1,4 +1,4 @@ The package dpdk is compatible with built-in CMake targets: - FIND_PACKAGE(dpdk CONFIGURE REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE DPDK::dpdk) + find_package(unofficial-dpdk REQUIRED CONFIG) + target_link_libraries(main PRIVATE unofficial::dpdk::dpdk) diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json index 111defe838e75b..77fa337376375e 100644 --- a/ports/dpdk/vcpkg.json +++ b/ports/dpdk/vcpkg.json @@ -1,7 +1,41 @@ { "name": "dpdk", - "version-string": "19.02", - "port-version": 1, + "version-string": "22.03", "description": "A set of libraries and drivers for fast packet processing", - "supports": "linux" + "homepage": "https://www.dpdk.org/", + "documentation": "https://doc.dpdk.org/guides/index.html", + "license": "BSD-3-Clause", + "supports": "linux | freebsd", + "dependencies": [ + { + "name": "numactl", + "platform": "linux" + }, + "python3", + { + "name": "vcpkg-get-python-packages", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ], + "features": { + "docs": { + "description": "Build and install docs" + }, + "kmods": { + "description": "Build and install kernel modules" + }, + "tests": { + "description": "Build and install tests", + "dependencies": [ + "libarchive" + ] + }, + "trace": { + "description": "Build with fast path traces enabled" + } + } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index afd1d85c80a7e7..5eff1128380d36 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -201,15 +201,6 @@ dlib:arm-uwp=fail dlib:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail -dpdk:arm-uwp=fail -dpdk:arm64-windows=fail -dpdk:x64-linux=fail -dpdk:x64-osx=fail -dpdk:x64-uwp=fail -dpdk:x64-windows-static=fail -dpdk:x64-windows-static-md=fail -dpdk:x64-windows=fail -dpdk:x86-windows=fail # requires python@2 from brew, but that no longer exists # python2 EOL yay! diff --git a/versions/baseline.json b/versions/baseline.json index 67c1ef270c5211..8382ef36d3e2a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1957,8 +1957,8 @@ "port-version": 0 }, "dpdk": { - "baseline": "19.02", - "port-version": 1 + "baseline": "22.03", + "port-version": 0 }, "draco": { "baseline": "1.4.3", diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json index 913bf29120469c..b24a1af97a8f1d 100644 --- a/versions/d-/dpdk.json +++ b/versions/d-/dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17a389722a444ba5834d74a86717b6ee963be519", + "version-string": "22.03", + "port-version": 0 + }, { "git-tree": "c259e16015f4cedca26e9fa3cb1aaafa3b3e4955", "version-string": "19.02", From 7a7c0ecdcda499b5801b2a440dac7581217ea53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 5 Jul 2022 15:40:42 +0000 Subject: [PATCH 021/791] [vcpkg baseline][rapidjson] Re-check hash value (#25547) * [test] Test rapidjson hash * Restore the origin hash * version * Re-trigger download * version * Try to check hash again * version * Remove empty space to reduce changes size * version * increase num * version --- ports/rapidjson/portfile.cmake | 1 + ports/rapidjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rapidjson.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 68d19e2fab9fab..96f2d6bde0ce22 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REPO Tencent/rapidjson REF 232389d4f1012dddec4ef84861face2d2ba85709 # accessed on 2022-06-28 SHA512 0d7d751179abdaa6ebf6167d522651a2d13bc024d20c7e3f775c7397a8aab4cd866a6c91a55521ad7847e910822fcf982625c7308c74f5df663e6fd81336c9fc + FILE_DISAMBIGUATOR 2 HEAD_REF master ) diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index 1c20fca4f6b8ec..ad6c7b894d0831 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rapidjson", "version-date": "2022-06-28", - "port-version": 1, + "port-version": 2, "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 8382ef36d3e2a9..a9687777071a18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6150,7 +6150,7 @@ }, "rapidjson": { "baseline": "2022-06-28", - "port-version": 1 + "port-version": 2 }, "rapidxml": { "baseline": "1.13", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 0e887e2e84fa6d..37386b453f507d 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3770e13ddf21ddf223c84dab78f3d04d4f25750", + "version-date": "2022-06-28", + "port-version": 2 + }, { "git-tree": "bf72eff187a248a24485011d16b0a8259e40ed59", "version-date": "2022-06-28", From 578406cc8b5ef1ccc319ba6e5050f0946723f78b Mon Sep 17 00:00:00 2001 From: crisboarna Date: Tue, 5 Jul 2022 18:41:51 +0300 Subject: [PATCH 022/791] [libdatachannel] chore(version): updated to 0.17.8 (#25522) * [libdatachannel] chore(version): updated to 0.17.7 * [libdatachannel] chore(version): updated to 0.17.7 version * [libdatachannel] chore(version): updated to 0.17.7 version sha * update version * [libdatachannel] update version to 0.17.8 * del version * update version * format patch * overwrite version Co-authored-by: FrankXie --- ports/libdatachannel/0001-fix-for-vcpkg.patch | 16 ++++++++-------- ports/libdatachannel/portfile.cmake | 4 ++-- ports/libdatachannel/uwp-warnings.patch | 4 ++-- ports/libdatachannel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch index 944f4339c70bb7..25eb2905f97367 100644 --- a/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8907872..31d8836 100644 +index 28b4566..4347b6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ endif() @@ -10,7 +10,7 @@ index 8907872..31d8836 100644 if(WIN32) add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -201,12 +200,13 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +@@ -200,12 +199,14 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) @@ -22,11 +22,12 @@ index 8907872..31d8836 100644 if(SCTP_DEBUG) add_definitions(-DSCTP_DEBUG) endif() ++ +if(0) - option(sctp_build_programs 0) - option(sctp_build_shared_lib 0) - set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) -@@ -218,8 +218,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + option(sctp_build_shared_lib OFF) + option(sctp_build_programs OFF) + option(sctp_inet OFF) +@@ -219,8 +220,9 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) endif() add_library(Usrsctp::Usrsctp ALIAS usrsctp) @@ -37,7 +38,7 @@ index 8907872..31d8836 100644 ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -243,16 +244,18 @@ target_include_directories(datachannel PUBLIC +@@ -244,16 +246,18 @@ target_include_directories(datachannel PUBLIC $) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) @@ -58,4 +59,3 @@ index 8907872..31d8836 100644 if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 - diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 97eb6211881372..5f417f589605d3 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF d9a9a4dcfb7445ed4f305c9aba889a162a4bad30 #v0.17.1 - SHA512 1b53f52e24ee4e01b2bd1d65c7d738e621f168b7718c1fe16e514c34e7bccc3d195c193a7363f31c6b651c7c6757260dce4b197111375800d2f6bdf0d5b06100 + REF 2b1c7382520ffe0a27b60e409250875ec757526c #v0.17.8 + SHA512 1a440763e3a7738e87a15370159283ab83a566f1a728f8e267b41b643c80c9cf47b106895c715300494072298ab3399f905ce43973d17099d268cd1f1b8f3fc3 HEAD_REF master PATCHES ${PATCHES} diff --git a/ports/libdatachannel/uwp-warnings.patch b/ports/libdatachannel/uwp-warnings.patch index 023bf888e1bd07..560040a4e8d391 100644 --- a/ports/libdatachannel/uwp-warnings.patch +++ b/ports/libdatachannel/uwp-warnings.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b79b458..790bf95 100644 +index 4347b6a..e3d6d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -385,6 +385,9 @@ if(WARNINGS_AS_ERRORS) +@@ -394,6 +394,9 @@ if(WARNINGS_AS_ERRORS) endif() endif() diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 2cff3e4c5f6e33..00198cb565fa3a 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.17.1", + "version-semver": "0.17.8", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index a9687777071a18..ef52fc3cae15a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3525,7 +3525,7 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.17.1", + "baseline": "0.17.8", "port-version": 0 }, "libdatrie": { diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index cf467c701c12e4..340da207d5b900 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0770e9b271c6d1eb630a403f754c2dd2ee93f1c6", + "version-semver": "0.17.8", + "port-version": 0 + }, { "git-tree": "9692159a4275af713e1525a9c81447fdd614869a", "version-semver": "0.17.1", From 7e245f8982cd57646fb71518e1cb07622a702de8 Mon Sep 17 00:00:00 2001 From: crisboarna Date: Tue, 5 Jul 2022 18:45:22 +0300 Subject: [PATCH 023/791] [libjuice] chore(version): updated to 1.0.2 (#25552) * [libjuice] chore(version): updated to 1.0.2 version * [libjuice] chore(version): updated to 1.0.2 version sha * update hash * update version --- ports/libjuice/portfile.cmake | 4 ++-- ports/libjuice/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjuice.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index cba06928d29d8e..5d78756e117eff 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF ae954be55f17a100e99650d6c1286e80929a66bb #v1.0.0 - SHA512 1b303ddfc7b903e0ba5f35580a6ce2350e12d4ef6cbbe97dbd090e863b664ca7b2f13da24d70b20cfd30a9c1208779b9b9c8c2df9ff9a21f12f3fc1bfdc09b0e + REF e7218e30fef3cd4437355aca817fa0980863973a #v1.0.2 + SHA512 b54c827774509915e98faec9891b5121ff50c01c33081480b805ca2f0910f26446cb75d7f721a0b8dfcc87ea7988c7020793befd2788ed132c0f608d434c7eca HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index 8be1cb3d10829c..e5ddc0e56d6e92 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "1.0.0", + "version": "1.0.2", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index ef52fc3cae15a9..37bf327d0b4723 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3733,7 +3733,7 @@ "port-version": 3 }, "libjuice": { - "baseline": "1.0.0", + "baseline": "1.0.2", "port-version": 0 }, "libjxl": { diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 8794a61c567496..992eec8b03266d 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d17a1b43666a1d6a177ed4a0d434f92e16ea791", + "version": "1.0.2", + "port-version": 0 + }, { "git-tree": "02ea9a1ae4e054d9474f801747e5edd17a3d8ad1", "version": "1.0.0", From b095ea5584aa0ece09412cad3491c54610681e4a Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 6 Jul 2022 02:06:41 +0800 Subject: [PATCH 024/791] [draco] update to v1.5.2 (#25568) * [draco] update to v1.5.2 * update version * add license * overwrite version * add commit * overwrite version --- ports/draco/fix-compile-error-uwp.patch | 32 ++++++++++++------------- ports/draco/portfile.cmake | 4 ++-- ports/draco/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/d-/draco.json | 5 ++++ 5 files changed, 26 insertions(+), 20 deletions(-) diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index 63f672d816f7fc..0b62512bcdf9c9 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -1,5 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0362420..2b09073 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,6 +86,10 @@ draco_set_cxx_flags() + draco_set_exe_linker_flags() + draco_generate_features_h() + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + # Draco source file listing variables. + list(APPEND draco_attributes_sources + "${draco_src_root}/attributes/attribute_octahedron_transform.cc" diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc -index 6e42a58..3c302b9 100644 +index 378de73..be7e032 100644 --- a/src/draco/io/parser_utils.cc +++ b/src/draco/io/parser_utils.cc @@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { @@ -13,18 +28,3 @@ index 6e42a58..3c302b9 100644 return true; } -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7e79da7..c4d9880 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -70,6 +70,10 @@ draco_set_build_definitions() - draco_set_cxx_flags() - draco_generate_features_h() - -+if (MSVC) -+ add_compile_options(/wd4996) -+endif() -+ - # Draco source file listing variables. - list(APPEND draco_attributes_sources - "${draco_src_root}/attributes/attribute_octahedron_transform.cc" diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index bde70c6645538c..1ae5d45e476cd8 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.4.3 - SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3 + REF bd1e8de7dd0596c2cbe5929cbe1f5d2257cd33db #v1.5.2 + SHA512 6ae7e72a9f6f55563f8f612084d38bff1d2e10934fa84aad59538d323e59d205764ed364c753a55d80e9ffc7c17f542f6475b3f922edcb9085cbd83a942759d0 HEAD_REF master PATCHES fix-compile-error-uwp.patch diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 288be5537a01b7..a2f5617e3036ba 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,8 +1,9 @@ { "name": "draco", - "version": "1.4.3", + "version": "1.5.2", "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.", "homepage": "https://github.com/google/draco", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 37bf327d0b4723..1b06f4d7d9772e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1961,7 +1961,7 @@ "port-version": 0 }, "draco": { - "baseline": "1.4.3", + "baseline": "1.5.2", "port-version": 0 }, "drlibs": { diff --git a/versions/d-/draco.json b/versions/d-/draco.json index e3b1eb6d0dab15..3c06f24600d818 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39effb9dbafcf8540c1e99bacc9a2701ab9f94a1", + "version": "1.5.2", + "port-version": 0 + }, { "git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33", "version": "1.4.3", From c2e09f8ddb8a4abd05cacdd966e92a7eb3e79927 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Jul 2022 02:07:47 +0800 Subject: [PATCH 025/791] [cnats] update to 3.3.0 (#25567) * [cnats] update to 3.3.0 * update version --- ports/cnats/portfile.cmake | 4 ++-- ports/cnats/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cnats.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cnats/portfile.cmake b/ports/cnats/portfile.cmake index 22bc7cd6c293d7..299266c23a835d 100644 --- a/ports/cnats/portfile.cmake +++ b/ports/cnats/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nats-io/nats.c - REF v3.2.0 - SHA512 570bbd5b6ed25db17755f4cbd2df9449bf1f838450e29aaa1483c11e6131293490d302031e3039d710bbbc3563ce72fb72cd3ad2c98618977a4858a5a3f2abe3 + REF 8c36c16a9d086738512c9e55157481f8ce46be7c #v3.3.0 + SHA512 5540916cadadb1e0e84be111fe69b88b5f953cacea6d05d3030f8f11b67865c18e5ef7739303def67e7c57b1032656ab78675f2c6e2ecacf058900575278b5eb HEAD_REF master ) diff --git a/ports/cnats/vcpkg.json b/ports/cnats/vcpkg.json index 8ea3c811388723..5b2566b4a6dced 100644 --- a/ports/cnats/vcpkg.json +++ b/ports/cnats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cnats", - "version": "3.2.0", + "version": "3.3.0", "description": "A C client for the NATS messaging system", "homepage": "https://github.com/nats-io/nats.c", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1b06f4d7d9772e..745bf0ec4ec85e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1477,7 +1477,7 @@ "port-version": 1 }, "cnats": { - "baseline": "3.2.0", + "baseline": "3.3.0", "port-version": 0 }, "cnl": { diff --git a/versions/c-/cnats.json b/versions/c-/cnats.json index 60faf07f088ef5..d3693cfa0b8966 100644 --- a/versions/c-/cnats.json +++ b/versions/c-/cnats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4045ec63d36d672939a5bd17e2733acaf759a14", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "ab962ebd7a13f87db7aea528cd4d5725b4fde292", "version": "3.2.0", From c5509d79e7c2e97c2338ae406e338c204c4735b4 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Tue, 5 Jul 2022 14:55:37 -0400 Subject: [PATCH 026/791] [DiscordCoreAPI] Update to version 2022-07-05 (#25564) * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. --- ports/discordcoreapi/portfile.cmake | 4 ++-- ports/discordcoreapi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 0fb98c2a7ce1bd..594c4a4c0487e2 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF c708c4c78b1478123bca314718ce5e2c2edafcf8 - SHA512 66415ad7ec0cfce55f3d89edb89e821b6c9d97cfcfbd0b9b321f2546f1f58511d72b9aa9a91f878441b445bdda7d259ec25e441cfe9101793348b92c3600ba5f + REF b2e9be0f8f4475b0907dbe07d98b22e40ba8c933 + SHA512 979b4fbaf325b060607dd5af7300b2815b2d9df8ccdbf825cf70261276af4882aafaee09ddb4eb060c0f7ec8cccd23f28d8b8c69cf7eb7b267af164698a2bcfa HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 01332a601d5828..0d5356b482a084 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version-date": "2022-06-18", + "version-date": "2022-07-05", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "AGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 745bf0ec4ec85e..25c062efd177ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1917,7 +1917,7 @@ "port-version": 1 }, "discordcoreapi": { - "baseline": "2022-06-18", + "baseline": "2022-07-05", "port-version": 0 }, "discount": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 192512a625b52b..2c0727a54bafe7 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81b6a00219f65e2ccabcf1330b132f1c2fdbc361", + "version-date": "2022-07-05", + "port-version": 0 + }, { "git-tree": "3d2d47eba4f4f28696fbc652359684d4018fab53", "version-date": "2022-06-18", From af9fe3e266d94c45885d2252d0f8f805a4c4dd41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Tue, 5 Jul 2022 20:56:31 +0200 Subject: [PATCH 027/791] [libcuckoo] Update port @0.3.1 (#25561) * [libcuckoo] Update port @0.3.1 * [libcuckoo] Update version database --- ports/libcuckoo/portfile.cmake | 23 ++++++++++------------- ports/libcuckoo/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/l-/libcuckoo.json | 5 +++++ 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/ports/libcuckoo/portfile.cmake b/ports/libcuckoo/portfile.cmake index 67c8f445e97125..0d4e9870c396fb 100644 --- a/ports/libcuckoo/portfile.cmake +++ b/ports/libcuckoo/portfile.cmake @@ -1,16 +1,16 @@ -# Header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO efficient/libcuckoo - REF 8785773896d74f72b6224e59d37f5f8c3c1e022a - SHA512 e47f8fd132ee2acf347ee375759f96235cd090fdb825792f994ff5eb4d8fed55b8e8bea8d293ec96c1a5f1b46d19c6648eaf2482e482b7b9c0d6dc734bc2121d + REF ea8c36c65bf9cf83aaf6b0db971248c6ae3686cf + SHA512 5c36ebf6047afb3fa980049dc2e38b8e34443d40cff7ba9b7ee1fa8b78ff3dd92b2d0a346667a71eec6d0bfc917b3080c883146f97681f20f71ce618eac3f37f HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +# header-only library +set(VCPKG_BUILD_TYPE release) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTS=OFF @@ -19,11 +19,8 @@ vcpkg_configure_cmake( -DBUILD_UNIVERSAL_BENCHMARK=OFF ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libcuckoo/vcpkg.json b/ports/libcuckoo/vcpkg.json index 49f4312eac8c09..bdec461522e477 100644 --- a/ports/libcuckoo/vcpkg.json +++ b/ports/libcuckoo/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libcuckoo", - "version-string": "0.3", - "port-version": 1, + "version": "0.3.1", "description": "A high-performance, concurrent hash table", - "homepage": "https://github.com/efficient/libcuckoo" + "homepage": "https://github.com/efficient/libcuckoo", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 25c062efd177ca..43042b29da3043 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3517,8 +3517,8 @@ "port-version": 3 }, "libcuckoo": { - "baseline": "0.3", - "port-version": 1 + "baseline": "0.3.1", + "port-version": 0 }, "libcurl-simple-https": { "baseline": "2022-02-14", diff --git a/versions/l-/libcuckoo.json b/versions/l-/libcuckoo.json index 35c71d5b6f5b87..1983195ad9dece 100644 --- a/versions/l-/libcuckoo.json +++ b/versions/l-/libcuckoo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8390f186a348872f4f8caf773c6ce376cf4365", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "47bda50b4e599d0dc81a015e175d1510de0ca62d", "version-string": "0.3", From 0640cc48471a153b10237827b81cdd61e824fcfe Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Jul 2022 03:49:21 +0800 Subject: [PATCH 028/791] [WinReg] update to v5.1.1 (#25548) * [WinReg] update to v5.1.1 * update version --- ports/winreg/portfile.cmake | 4 ++-- ports/winreg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/winreg.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index 085f76d808b7d5..cc664546668258 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF 4ac74bfec290ec4376100372f59dbc2554e54692 #v5.1.0 - SHA512 3d25725c9fc781ffdfa1bbd3ed143a8381d40a1613d4786861e13b180098a5ce92ff193cf25d7490be0096c2eafcace45e6a2f94fbfaa28964d12b80b55d0637 + REF aaa7434663f1f8017284812501812ac3c74612c0 #v5.1.1 + SHA512 1c35513bb387a30452c9fcb1fb9cd32be68a8fa625cff1301490d6e89430e3b6f08e54f41ae0261540900923d2f39f3b2ed32bf54869d643aa5020ff1ca6c1c7 HEAD_REF master ) diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index cfe7aeac9a0036..a9de4e85c9e043 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "winreg", - "version": "5.1.0", + "version": "5.1.1", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 43042b29da3043..6936c2c0b2496e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7577,7 +7577,7 @@ "port-version": 0 }, "winreg": { - "baseline": "5.1.0", + "baseline": "5.1.1", "port-version": 0 }, "winsock2": { diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index 2b55d506cc139d..11f3b0e8cb9b45 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec4168b0b4ceaece6ee9d24b5bcc8c4ed8897db7", + "version": "5.1.1", + "port-version": 0 + }, { "git-tree": "cdcb9cb9581869670509de4d2928b8821038d962", "version": "5.1.0", From f3eeb27624af42dc0b5e51da2f9e7578fbe62061 Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Tue, 5 Jul 2022 21:52:55 +0200 Subject: [PATCH 029/791] [osg libraw openexr jasper] Dont block arm64-osx (#25535) * Dont block arm64-osx * Update version * Updated versions * supports fixups * Update versions * supports fixups * supports fixups --- ports/jasper/vcpkg.json | 8 ++++---- ports/libraw/vcpkg.json | 4 ++-- ports/openexr/vcpkg.json | 4 ++-- ports/osg/vcpkg.json | 4 ++-- versions/baseline.json | 8 ++++---- versions/j-/jasper.json | 5 +++++ versions/l-/libraw.json | 5 +++++ versions/o-/openexr.json | 5 +++++ versions/o-/osg.json | 5 +++++ 9 files changed, 34 insertions(+), 14 deletions(-) diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json index d15f884e8674a8..ff001a2a7ea8de 100644 --- a/ports/jasper/vcpkg.json +++ b/ports/jasper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "jasper", "version": "2.0.33", - "port-version": 4, + "port-version": 5, "description": "Open source implementation of the JPEG-2000 Part-1 standard", "homepage": "https://github.com/mdadams/jasper", "dependencies": [ @@ -28,7 +28,7 @@ "features": [ "opengl" ], - "platform": "!(windows & arm)" + "platform": "!(windows & arm) & !uwp" } ] }, @@ -37,11 +37,11 @@ "dependencies": [ { "name": "freeglut", - "platform": "!osx & !(windows & arm)" + "platform": "!osx & !(windows & arm) & !uwp" }, { "name": "opengl", - "platform": "!(windows & arm)" + "platform": "!(windows & arm) & !uwp" } ] } diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json index 060758065b0184..9cc33e31cc7aed 100644 --- a/ports/libraw/vcpkg.json +++ b/ports/libraw/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libraw", "version-string": "201903", - "port-version": 8, + "port-version": 9, "description": "raw image decoder library", "homepage": "https://www.libraw.org", - "supports": "!arm & !uwp", + "supports": "!uwp", "dependencies": [ "jasper", "lcms", diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index b293e7047da35c..637485f3887bb3 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,10 +1,10 @@ { "name": "openexr", "version-string": "2.5.0", - "port-version": 3, + "port-version": 4, "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", - "supports": "!uwp", + "supports": "!uwp & !(arm & windows)", "dependencies": [ "zlib" ] diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 007d9eedeafda1..7faa66401b483b 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,10 +1,10 @@ { "name": "osg", "version": "3.6.5", - "port-version": 14, + "port-version": 15, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://github.com/openscenegraph/OpenSceneGraph", - "supports": "!arm & !uwp", + "supports": "!uwp", "dependencies": [ { "name": "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 6936c2c0b2496e..78ed4494b744ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3058,7 +3058,7 @@ }, "jasper": { "baseline": "2.0.33", - "port-version": 4 + "port-version": 5 }, "jbig2dec": { "baseline": "0.19", @@ -3978,7 +3978,7 @@ }, "libraw": { "baseline": "201903", - "port-version": 8 + "port-version": 9 }, "librdkafka": { "baseline": "1.9.0", @@ -5166,7 +5166,7 @@ }, "openexr": { "baseline": "2.5.0", - "port-version": 3 + "port-version": 4 }, "opengl": { "baseline": "2022-03-14", @@ -5294,7 +5294,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 14 + "port-version": 15 }, "osg-qt": { "baseline": "Qt5", diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index ebc7042b37fa5a..3adc9500bd7b13 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5220ea6a54e25d777f853a2c77196be67da02f3", + "version": "2.0.33", + "port-version": 5 + }, { "git-tree": "5cc65b3d32490a3fd1bd1768188b905a873af2ef", "version": "2.0.33", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index 034408d4509a20..32d1a0f892671f 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13ab93771f3879d0f68e0418b028df14cb260dd3", + "version-string": "201903", + "port-version": 9 + }, { "git-tree": "e07b6b8ed70ad198a64027d0e44eab43d116039d", "version-string": "201903", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index 06c0f7620ddc41..7d188528a7183e 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40df682add8b267e718dac8ea78a2bcb47006048", + "version-string": "2.5.0", + "port-version": 4 + }, { "git-tree": "7589d3f1641e6e63450303e424d966221375109f", "version-string": "2.5.0", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 93f1daec662c93..3395ad64744b8d 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "219045e2b75fc651860c70dbf97557d543269842", + "version": "3.6.5", + "port-version": 15 + }, { "git-tree": "0a38fb280615f72738ab9ec48d92d8bee28017c9", "version": "3.6.5", From 6ea498a8efac7032de1533914899873e29d69ad1 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 5 Jul 2022 22:26:28 +0200 Subject: [PATCH 030/791] [boinc] Update to 7.20.1 (#25527) Signed-off-by: Vitalii Koshura --- ports/boinc/portfile.cmake | 4 ++-- ports/boinc/vcpkg.json | 2 +- versions/b-/boinc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index fd832485fb1899..999fb3a155b018 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc - REF client_release/7.20/7.20.0 - SHA512 18e0dfa208b859399735c21ca5a07e008becfdfd384e394e307acd6a7d0e6431085f0f16fcf431ab10adbb29190b4272ecd978528a53c08781c194efee85954e + REF client_release/7.20/7.20.1 + SHA512 6b4aa9d288888bec847c21b59f8c6c27ad040e5a8f21e3a0fa39999e548e6bd0504723092acfaaba02090962aa1c6537af48bb32cdfc9b13de7d878d2963b731 HEAD_REF master ) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 84ba23b5d59f1c..8466a0754717e4 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boinc", - "version": "7.20.0", + "version": "7.20.1", "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 7693587097f810..1a902110f89f4e 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab47def2f85314a93479d7238572c83c91ac1845", + "version": "7.20.1", + "port-version": 0 + }, { "git-tree": "c81da3b63845b3d0e04dfac9b8ebe3096d13176d", "version": "7.20.0", diff --git a/versions/baseline.json b/versions/baseline.json index 78ed4494b744ef..5eba46d054333b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -513,7 +513,7 @@ "port-version": 4 }, "boinc": { - "baseline": "7.20.0", + "baseline": "7.20.1", "port-version": 0 }, "bond": { From 6fff5b4d3434c2997094222a957fcad985cc7433 Mon Sep 17 00:00:00 2001 From: Fletcher Dunn Date: Tue, 5 Jul 2022 13:27:23 -0700 Subject: [PATCH 031/791] [gamenetworkingsockets] update version to 1.4.1 (#25523) * Updated gamenetworkingsockets to 1.4.1 Also use "version-semver" to specify the version, since we are using Semantic Versioning. * Add gamenetworkingsockets v1.4.1 * [gamenetworkingsockets] update version to 1.4.1 * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/gamenetworkingsockets/portfile.cmake | 15 +++++++-------- ports/gamenetworkingsockets/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/g-/gamenetworkingsockets.json | 5 +++++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ports/gamenetworkingsockets/portfile.cmake b/ports/gamenetworkingsockets/portfile.cmake index 212d5ceea876fd..d7962c510d9aa4 100644 --- a/ports/gamenetworkingsockets/portfile.cmake +++ b/ports/gamenetworkingsockets/portfile.cmake @@ -3,16 +3,15 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/GameNetworkingSockets - REF b99aa75ed9b1ec57d5c90ee009f8de8882eeca13 # v1.4.0 - SHA512 1776a6a66d2c6546a8a3d71123544ea9590ab6b123d4a92eebd38c0a195f09a55185b999250c518527e1d8983176732429901a2f781a883715e6695b597229f5 + REF 505c697d0abef5da2ff3be35aa4ea3687597c3e9 # v1.4.1 + SHA512 3e4b4da138f2b356169e6504aa899c9eca4fba5b5fcaed2a0ae8a2f5828976dd00af9f3262c75bd6d820300da87ebe32da152fecddc278a651f3b33eb59142df HEAD_REF master ) set(CRYPTO_BACKEND OpenSSL) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF @@ -21,10 +20,10 @@ vcpkg_configure_cmake( -DUSE_CRYPTO25519=${CRYPTO_BACKEND} ) -vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/GameNetworkingSockets" TARGET_PATH "share/GameNetworkingSockets") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/GameNetworkingSockets") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/gamenetworkingsockets/vcpkg.json b/ports/gamenetworkingsockets/vcpkg.json index 433753e0d0165c..69ec3030323054 100644 --- a/ports/gamenetworkingsockets/vcpkg.json +++ b/ports/gamenetworkingsockets/vcpkg.json @@ -1,12 +1,20 @@ { "name": "gamenetworkingsockets", - "version": "1.4.0", + "version-semver": "1.4.1", "description": "GameNetworkingSockets is a basic transport layer for games.", "homepage": "https://github.com/ValveSoftware/GameNetworkingSockets", "license": "BSD-3-Clause", "supports": "!(static & windows) & !uwp & !(arm64 & windows)", "dependencies": [ "openssl", - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5eba46d054333b..18298be80c3051 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2437,7 +2437,7 @@ "port-version": 2 }, "gamenetworkingsockets": { - "baseline": "1.4.0", + "baseline": "1.4.1", "port-version": 0 }, "gamma": { diff --git a/versions/g-/gamenetworkingsockets.json b/versions/g-/gamenetworkingsockets.json index 3f87f529edc4ba..94813fbbaec774 100644 --- a/versions/g-/gamenetworkingsockets.json +++ b/versions/g-/gamenetworkingsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94a9a726c8c2caf64acec0988bd9ad58f57ab5df", + "version-semver": "1.4.1", + "port-version": 0 + }, { "git-tree": "56c1a61c82400d285d3d37cf8e20a1f362a0d83f", "version": "1.4.0", From e71df97d9b29c41477f2bf1afbecbb68ce8eab65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=84=B6Y?= Date: Wed, 6 Jul 2022 04:31:39 +0800 Subject: [PATCH 032/791] [air-ctl] Update to v1.1.2 (#25516) * update v1.1.2 * update bacseline * ... * ... * ... * ... --- ports/air-ctl/portfile.cmake | 4 ++-- ports/air-ctl/vcpkg.json | 2 +- versions/a-/air-ctl.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/air-ctl/portfile.cmake b/ports/air-ctl/portfile.cmake index 43ac27db675ee0..6aeff236a64c4b 100644 --- a/ports/air-ctl/portfile.cmake +++ b/ports/air-ctl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO inie0722/CTL - REF v1.1.1 - SHA512 687531634ec827f6f34c694b8daf94ed9ff02b1d5b63d191e70b77a201f5582142718ad89d315a40bb72ab3707f237772c1838098e219e7a2db46d90718d5c4b + REF v1.1.2 + SHA512 5669db0448359023cc55b0f9134084cda3aea716996d58ef7e8e63d3721c074af27f59a52c1976c72decea93630f64c463718344f34fdae3e5a832c9d876913a HEAD_REF master ) diff --git a/ports/air-ctl/vcpkg.json b/ports/air-ctl/vcpkg.json index 95275caf13ca9c..ac463978200d2a 100644 --- a/ports/air-ctl/vcpkg.json +++ b/ports/air-ctl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "air-ctl", - "version": "1.1.1", + "version": "1.1.2", "description": "C template container library", "homepage": "https://github.com/inie0722/CTL", "license": "BSL-1.0", diff --git a/versions/a-/air-ctl.json b/versions/a-/air-ctl.json index 8cd4017acb7248..beabaf3a563c01 100644 --- a/versions/a-/air-ctl.json +++ b/versions/a-/air-ctl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ba95e186d0f375425730cf877027e7e3b9961b1", + "version": "1.1.2", + "port-version": 0 + }, { "git-tree": "9d82351b11318cc51aac7ad71e56cef49c83361b", "version": "1.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 18298be80c3051..156c7cf55b109f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -33,7 +33,7 @@ "port-version": 0 }, "air-ctl": { - "baseline": "1.1.1", + "baseline": "1.1.2", "port-version": 0 }, "aixlog": { From 3b537144f78b83454977aef7496e49cd107c84c5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 5 Jul 2022 23:57:47 +0200 Subject: [PATCH 033/791] [curl] Update to 7.84.0 (#25515) * Update to 7.84.0 * Update versions * Ignore libpsl system lib * ENABLE_DEBUG only affects debug build * Remove obsolete variables * Update versions * Remove obsolete CURL_STATICLIB variable * Drop obsolete Perl option * Update versions --- ports/curl/0012-fix-dependency-idn2.patch | 10 +++--- ports/curl/portfile.cmake | 17 +++------- ports/curl/vcpkg.json | 3 +- ports/curl/wolfssl-ntlm.patch | 38 ----------------------- versions/baseline.json | 4 +-- versions/c-/curl.json | 5 +++ 6 files changed, 17 insertions(+), 60 deletions(-) delete mode 100644 ports/curl/wolfssl-ntlm.patch diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch index e1d59bf5dae32e..9db27979e1aa12 100644 --- a/ports/curl/0012-fix-dependency-idn2.patch +++ b/ports/curl/0012-fix-dependency-idn2.patch @@ -2,13 +2,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f6de81..6702845 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -632,6 +632,9 @@ endif() +@@ -632,6 +632,7 @@ endif() + # Check for idn2 option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) - set(HAVE_LIBIDN2 OFF) if(USE_LIBIDN2) +- check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) + set(HAVE_LIBIDN2 TRUE) + list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES}) -+elseif(0) - check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) + else() + set(HAVE_LIBIDN2 OFF) endif() - diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 98c30a5289f427..51a38dc525203b 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF curl-7_83_1 - SHA512 f4ede3c829aaa1142358d956cba4b33f06d3f0319c9f1cd65b63413de60a8690165e10fcb876fc413a20fcfa53bba2a064bb4b8c3070dbf474c2f2288eeab019 + REF curl-7_84_0 + SHA512 2a000c052c14ee9e6bed243e92699517889554bc0dc03e9f28d398ecf14b405c336f1303e6ed15ed30e88d5d00fefecdc189e83def3f0a5431f63e3be1c55c35 HEAD_REF master PATCHES 0002_fix_uwp.patch @@ -13,11 +13,8 @@ vcpkg_from_github( 0022-deduplicate-libs.patch mbedtls-ws2_32.patch export-components.patch - wolfssl-ntlm.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) - # schannel will enable sspi, but sspi do not support uwp foreach(feature IN ITEMS "schannel" "sspi" "tool" "winldap") if(feature IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) @@ -58,8 +55,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) set(OPTIONS "") -set(OPTIONS_RELEASE "") -set(OPTIONS_DEBUG "") if("idn2" IN_LIST FEATURES) vcpkg_find_acquire_program(PKGCONFIG) list(APPEND OPTIONS "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}") @@ -86,14 +81,10 @@ vcpkg_cmake_configure( ${OPTIONS} -DBUILD_TESTING=OFF -DENABLE_MANUAL=OFF - -DCURL_STATICLIB=${CURL_STATICLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON - -DENABLE_DEBUG=ON -DCURL_CA_FALLBACK=ON - OPTIONS_RELEASE - ${OPTIONS_RELEASE} + -DCURL_USE_LIBPSL=OFF OPTIONS_DEBUG - ${OPTIONS_DEBUG} + -DENABLE_DEBUG=ON ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 0352d403fd9321..35a83ce1a8cb01 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "curl", - "version": "7.83.1", - "port-version": 2, + "version": "7.84.0", "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/ports/curl/wolfssl-ntlm.patch b/ports/curl/wolfssl-ntlm.patch deleted file mode 100644 index 40e2dd67fb770a..00000000000000 --- a/ports/curl/wolfssl-ntlm.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/lib/curl_ntlm_core.c -+++ b/lib/curl_ntlm_core.c -@@ -60,12 +60,17 @@ - - #ifdef USE_WOLFSSL - #include --#endif -- -+# include -+# include -+# include -+# include -+#else - # include - # include - # include - # include -+#endif -+ - # if (defined(OPENSSL_VERSION_NUMBER) && \ - (OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL) - # define DES_key_schedule des_key_schedule -diff -ur a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h ---- a/lib/curl_ntlm_core.h 2022-05-10 23:11:15.000000000 -0700 -+++ b/lib/curl_ntlm_core.h 2022-05-16 16:48:39.931726300 -0700 -@@ -35,10 +35,10 @@ - #define NTLM_NEEDS_NSS_INIT - #endif - --#if defined(USE_OPENSSL) || defined(USE_WOLFSSL) - #ifdef USE_WOLFSSL - # include --#endif -+# include -+#elif defined(USE_OPENSSL) - # include - #endif - diff --git a/versions/baseline.json b/versions/baseline.json index 156c7cf55b109f..d427dea9c792b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1757,8 +1757,8 @@ "port-version": 7 }, "curl": { - "baseline": "7.83.1", - "port-version": 2 + "baseline": "7.84.0", + "port-version": 0 }, "curlpp": { "baseline": "2018-06-15", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 551cecf0e4ead1..52fa7e632520d0 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "984e0a92df662f6022989c2b5889e7d9f1c133d5", + "version": "7.84.0", + "port-version": 0 + }, { "git-tree": "09dee7c9ae276d954fc8017b6a81002e43f81bb0", "version": "7.83.1", From 2acace3be18caa81be91e70d769cc2996031f6e5 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Jul 2022 05:59:22 +0800 Subject: [PATCH 034/791] [libavif] update to v0.10.1 (#25510) * [libavif] update to v0.10.1 * update evrsion --- ports/libavif/fix-compiler-warnings.patch | 22 ++++++++++++++++++++++ ports/libavif/portfile.cmake | 13 +++++++------ ports/libavif/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libavif.json | 5 +++++ 5 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 ports/libavif/fix-compiler-warnings.patch diff --git a/ports/libavif/fix-compiler-warnings.patch b/ports/libavif/fix-compiler-warnings.patch new file mode 100644 index 00000000000000..76e4d4b04ec784 --- /dev/null +++ b/ports/libavif/fix-compiler-warnings.patch @@ -0,0 +1,22 @@ +diff --git a/src/read.c b/src/read.c +index 8d39b07..6289fa4 100644 +--- a/src/read.c ++++ b/src/read.c +@@ -940,7 +940,7 @@ static avifResult avifDecoderItemMaxExtent(const avifDecoderItem * item, const a + return AVIF_RESULT_BMFF_PARSE_FAILED; + } + startOffset += remainingOffset; +- extentSize -= remainingOffset; ++ extentSize -= (size_t)remainingOffset; + remainingOffset = 0; + } + } +@@ -3085,7 +3085,7 @@ static avifResult avifDecoderPrepareSample(avifDecoder * decoder, avifDecodeSamp + + avifDecoderItem * item = avifMetaFindItem(decoder->data->meta, sample->itemID); + avifROData itemContents; +- avifResult readResult = avifDecoderItemRead(item, decoder->io, &itemContents, sample->offset, bytesToRead, &decoder->diag); ++ avifResult readResult = avifDecoderItemRead(item, decoder->io, &itemContents, (size_t)sample->offset, bytesToRead, &decoder->diag); + if (readResult != AVIF_RESULT_OK) { + return readResult; + } diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index 48081c53ba5257..10a113074df080 100644 --- a/ports/libavif/portfile.cmake +++ b/ports/libavif/portfile.cmake @@ -1,15 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AOMediaCodec/libavif - REF v0.9.2 - SHA512 04400ae76214d2f0361a14897d6ee97be675375865bb96c8d237e9a4a1152ac1a966db903c11df82da71b0bc68599a5857e038cc90d63c5d3bc77b13169a3e75 + REF f938f6b7dd412ffcbdab1808a265b6375dc7b037 #v0.10.1 + SHA512 d4e01edb9891df0b0abc4a1d621287bce6ba38248a7ae458abd73c268b000557a52a5aa6be1fc715b694c8e48166aee458a371d806d5f28160c50ff653420e79 HEAD_REF master PATCHES disable-source-utf8.patch + fix-compiler-warnings.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DAVIF_CODEC_AOM=ON -DAVIF_BUILD_APPS=OFF @@ -26,8 +27,8 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() # Remove duplicate files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index dbad25be0f7948..4b84963e12d870 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libavif", - "version-semver": "0.9.2", - "port-version": 1, + "version-semver": "0.10.1", "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", + "license": "BSD-2-Clause AND Apache-2.0", "dependencies": [ "aom", "libyuv", diff --git a/versions/baseline.json b/versions/baseline.json index d427dea9c792b2..25cea4d6f5c3f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3453,8 +3453,8 @@ "port-version": 1 }, "libavif": { - "baseline": "0.9.2", - "port-version": 1 + "baseline": "0.10.1", + "port-version": 0 }, "libb2": { "baseline": "0.98.1", diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index 4bcdf7f29daa57..2dfc410a00801e 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2789410c80d4668a070e8eba96873a221615f3b", + "version-semver": "0.10.1", + "port-version": 0 + }, { "git-tree": "a160f6cf67dc99a095c98a9a7260b7a5fd110b7b", "version-semver": "0.9.2", From a147691f50ec21e8f2a912d199aa5ba4196df6fb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:00:20 +0200 Subject: [PATCH 035/791] [proj] Disable docs (#25502) * [proj] Remove docs * version --- ports/proj/portfile.cmake | 1 + ports/proj/remove-doc.patch | 34 ++++++++++++++++++++++++++++++++++ ports/proj/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/proj.json | 5 +++++ 5 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 ports/proj/remove-doc.patch diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index 7e66dc9e8b7d91..8435134f0c39bb 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-win-output-name.patch fix-proj4-targets-cmake.patch tools-cmake.patch + remove-doc.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/proj/remove-doc.patch b/ports/proj/remove-doc.patch new file mode 100644 index 00000000000000..9108549857977c --- /dev/null +++ b/ports/proj/remove-doc.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c9744e6..a6d5e4eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -318,15 +335,12 @@ include_directories(${PROJ_SOURCE_DIR}/src) + add_subdirectory(data) + add_subdirectory(include) + add_subdirectory(src) +-add_subdirectory(man) + add_subdirectory(cmake) + if(BUILD_TESTING) + add_subdirectory(test) + endif() + +-set(docfiles COPYING NEWS AUTHORS) +-install(FILES ${docfiles} +- DESTINATION "${DOCDIR}") ++ + + ################################################################################ + # pkg-config support +@@ -378,6 +392,7 @@ set(CPACK_SOURCE_IGNORE_FILES + + include(CPack) + ++if(0) + # Simplify README.md to README + add_custom_target(README + COMMAND ${CMAKE_COMMAND} +@@ -393,3 +408,4 @@ if(NOT _is_multi_config_generator) + ) + message(STATUS "PROJ: Configured 'dist' target") + endif() ++endif() diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index a3de02b637c567..dfad1233fd1a17 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,6 +1,7 @@ { "name": "proj", "version": "9.0.1", + "port-version": 1, "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 25cea4d6f5c3f6..8b28875a065ede 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5618,7 +5618,7 @@ }, "proj": { "baseline": "9.0.1", - "port-version": 0 + "port-version": 1 }, "proj4": { "baseline": "8.9.9", diff --git a/versions/p-/proj.json b/versions/p-/proj.json index 25ab82f93f0937..8fb1570448a761 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d533a2d58a17e3074d52ec045604b32ed049eacb", + "version": "9.0.1", + "port-version": 1 + }, { "git-tree": "55c13547b4c812fc8bbb32a09260b3e54bc0a352", "version": "9.0.1", From 497e1e56a9f656977938ddec042cbe13497ebeba Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 6 Jul 2022 06:08:18 +0800 Subject: [PATCH 036/791] [gazebo] Fix Plugin failed with status code 3221225785 (#25500) * [gazebo] Fix Plugin failed with status code 3221225785 * x-add-version * Use ADD_BIN_TO_PATH in vcpkg_cmake_install * x-add-version gazebo --overwrite-version * Add PKG_CONFIG_EXECUTABLE * x-add-version * Use VCPKG_HOST_EXECUTABLE_SUFFIX * x-add-version Co-authored-by: Cheney-Wang --- ports/gazebo/portfile.cmake | 6 ++---- ports/gazebo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gazebo.json | 5 +++++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake index 5be5d42d0420a1..859c33d07cbdcc 100644 --- a/ports/gazebo/portfile.cmake +++ b/ports/gazebo/portfile.cmake @@ -22,18 +22,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS graphviz NO_GRAPHVIZ_FEATURE ) -vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin") -vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON - -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf.exe + -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX} ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF # Not enabled by default, but to be sure ) -vcpkg_cmake_install() +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/gazebo") vcpkg_copy_pdbs() diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json index 0d88306bc7dff1..23b9103c32ce2e 100644 --- a/ports/gazebo/vcpkg.json +++ b/ports/gazebo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gazebo", "version-date": "2022-01-20", - "port-version": 1, + "port-version": 2, "description": "Open source robotics simulator.", "homepage": "http://gazebosim.org", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8b28875a065ede..c4c1d253336ad1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2454,7 +2454,7 @@ }, "gazebo": { "baseline": "2022-01-20", - "port-version": 1 + "port-version": 2 }, "gcem": { "baseline": "1.14.1", diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json index 57626811bb680d..8468bccec3fed7 100644 --- a/versions/g-/gazebo.json +++ b/versions/g-/gazebo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "324403bb31aad7705e0f444e9c49f2b11417b9b0", + "version-date": "2022-01-20", + "port-version": 2 + }, { "git-tree": "702a7de5c38ff156813a73a32eac6c7ca73248e4", "version-date": "2022-01-20", From e2fb66462ae96765902809834a12f5223d515228 Mon Sep 17 00:00:00 2001 From: JeffyOLOLO <34167060+JeffyOLOLO@users.noreply.github.com> Date: Wed, 6 Jul 2022 01:35:30 +0300 Subject: [PATCH 037/791] [sqlpp11] update to 0.61 (#25458) * Update the sqlpp11 port to version 0.61 + SQLite3 * Update the sqlpp11 version to 0.61 * Update dependencies in sqlpp11 ports * Update sqlpp11 and its connectors versions * Update files according to the maintainer guide * Update the sqlpp11 version * Update SHA512 * Version instead of version-string * Update the sqlpp11 version * Version-string instead of version * Version update * Vesrion update after script * Update according to checks * Replace connector ports by empty one * Update the sqlite3 connector port to dummy one * Remove non exsistent sqlpp11 sqlite3 version * Make the mysql connector port as obsolete * Format vcpkg.json in sqlpp11's ports * Update sqlpp11's ports versions * Backward compatibility in the mysql connector * Update version in sqlpp11's mysql connector * Remove non exsistent sqlpp11 mysql version --- ports/sqlpp11-connector-mysql/portfile.cmake | 28 +-------------- ports/sqlpp11-connector-mysql/vcpkg.json | 28 ++++++++++----- .../sqlpp11-connector-sqlite3/portfile.cmake | 26 +------------- ports/sqlpp11-connector-sqlite3/vcpkg.json | 18 ++++++---- ports/sqlpp11/ddl2cpp_path.patch | 12 +++---- ports/sqlpp11/fix-dependency.patch | 20 ----------- ports/sqlpp11/portfile.cmake | 27 +++++++++----- ports/sqlpp11/vcpkg.json | 36 ++++++++++++++++--- versions/baseline.json | 12 +++---- versions/s-/sqlpp11-connector-mysql.json | 5 +++ versions/s-/sqlpp11-connector-sqlite3.json | 5 +++ versions/s-/sqlpp11.json | 5 +++ 12 files changed, 110 insertions(+), 112 deletions(-) delete mode 100644 ports/sqlpp11/fix-dependency.patch diff --git a/ports/sqlpp11-connector-mysql/portfile.cmake b/ports/sqlpp11-connector-mysql/portfile.cmake index 2dd953ff7afd81..0015715fb66c72 100644 --- a/ports/sqlpp11-connector-mysql/portfile.cmake +++ b/ports/sqlpp11-connector-mysql/portfile.cmake @@ -1,27 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO rbock/sqlpp11-connector-mysql - REF 0.29 - SHA512 0c71d2ea94933be3bbaa8d6afaac7059660bdb0af5ba905844d95facb5e73a122c3ccd723a48a7fd8db0c028309ac6dc8b91c6838dfbfe530727161d62a1481f - HEAD_REF master -) - -# Use sqlpp11-connector-mysql's own build process, skipping tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_TESTS:BOOL=OFF - -DDATE_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include - -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include - -DMYSQL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/mysql -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-mysql RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/sqlpp11-connector-mysql/vcpkg.json b/ports/sqlpp11-connector-mysql/vcpkg.json index 8eb8e93f57f39f..8726643e7ff249 100644 --- a/ports/sqlpp11-connector-mysql/vcpkg.json +++ b/ports/sqlpp11-connector-mysql/vcpkg.json @@ -1,13 +1,9 @@ { "name": "sqlpp11-connector-mysql", - "version-string": "0.29", - "port-version": 2, - "description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11.", + "version": "0.61", + "description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11 (obsolete, use sqlpp11 with the mariadb/mysql feature instead)", "homepage": "https://github.com/rbock/sqlpp11-connector-mysql", - "dependencies": [ - "date", - "sqlpp11" - ], + "license": "BSD-2-Clause", "default-features": [ "mariadb" ], @@ -15,13 +11,27 @@ "mariadb": { "description": "Use MariaDB connector", "dependencies": [ - "libmariadb" + { + "name": "sqlpp11", + "default-features": false, + "features": [ + "mariadb" + ], + "version>=": "0.61" + } ] }, "mysql": { "description": "Use MySQL connector", "dependencies": [ - "libmysql" + { + "name": "sqlpp11", + "default-features": false, + "features": [ + "mysql" + ], + "version>=": "0.61" + } ] } } diff --git a/ports/sqlpp11-connector-sqlite3/portfile.cmake b/ports/sqlpp11-connector-sqlite3/portfile.cmake index 1663ca73a0e3fa..0015715fb66c72 100644 --- a/ports/sqlpp11-connector-sqlite3/portfile.cmake +++ b/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -1,25 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO rbock/sqlpp11-connector-sqlite3 - REF a06d6944a55349fbd0ab0337c45d80c6efa2ff81 # 0.30 - SHA512 51efe8914b5ccf8092e15a9a7b29798db070ce0b47bb87b212724e209149c3a81821a3841ac317f506356430d87d3f16a066c74f60ad1ad7bf1333c9de36916b - HEAD_REF master -) - -# Use sqlpp11-connector-sqlite3's own build process, skipping tests -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DENABLE_TESTS:BOOL=OFF - -DSQLPP11_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-sqlite3 RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/ports/sqlpp11-connector-sqlite3/vcpkg.json b/ports/sqlpp11-connector-sqlite3/vcpkg.json index 09ebb22b5171a4..541ab258fdfd7f 100644 --- a/ports/sqlpp11-connector-sqlite3/vcpkg.json +++ b/ports/sqlpp11-connector-sqlite3/vcpkg.json @@ -1,11 +1,17 @@ { "name": "sqlpp11-connector-sqlite3", - "version-string": "0.30", - "port-version": 1, - "description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11.", + "version": "0.61", + "description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11 (obsolete, use sqlpp11 with the sqlite3 feature instead)", + "homepage": "https://github.com/rbock/sqlpp11-connector-sqlite3", + "license": "BSD-2-Clause", "dependencies": [ - "date", - "sqlite3", - "sqlpp11" + { + "name": "sqlpp11", + "default-features": false, + "features": [ + "sqlite3" + ], + "version>=": "0.61" + } ] } diff --git a/ports/sqlpp11/ddl2cpp_path.patch b/ports/sqlpp11/ddl2cpp_path.patch index bc828e829f3cc2..348505aa77bfa7 100644 --- a/ports/sqlpp11/ddl2cpp_path.patch +++ b/ports/sqlpp11/ddl2cpp_path.patch @@ -1,9 +1,9 @@ -diff --git a/cmake/Sqlpp11Config.cmake b/cmake/Sqlpp11Config.cmake -index 18ea9b1..730bce1 100644 ---- a/cmake/Sqlpp11Config.cmake -+++ b/cmake/Sqlpp11Config.cmake -@@ -32,7 +32,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/Sqlpp11Targets.cmake") - +diff --git a/cmake/configs/Sqlpp11Config.cmake b/cmake/configs/Sqlpp11Config.cmake +index c50a71a..96d0c5b 100644 +--- a/cmake/configs/Sqlpp11Config.cmake ++++ b/cmake/configs/Sqlpp11Config.cmake +@@ -51,7 +51,7 @@ endforeach() + # Import "ddl2cpp" script if(NOT TARGET sqlpp11::ddl2cpp) - get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH) diff --git a/ports/sqlpp11/fix-dependency.patch b/ports/sqlpp11/fix-dependency.patch deleted file mode 100644 index d43e10bf39e74d..00000000000000 --- a/ports/sqlpp11/fix-dependency.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8de9fa..82dd632 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,14 +32,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") - - include(CTest) - -- --### Dependencies --add_subdirectory(dependencies) -- - ### Main targets - add_library(sqlpp11 INTERFACE) - add_library(sqlpp11::sqlpp11 ALIAS sqlpp11) - -+find_package(date CONFIG REQUIRED) - target_link_libraries(sqlpp11 INTERFACE date::date) - - target_include_directories(sqlpp11 INTERFACE diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index 312c16d4e8ac3e..3415fc1f14bd3c 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -1,26 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rbock/sqlpp11 - REF 085713d4d301aeb58e7d14f44cfac6ce35fe2e77 # 0.60 - SHA512 835536482def61c9978cda58507a7f5983b99765f69e7865cf5597b06075dc3e7ad4a3be0b2de2e44e4a4c3a6998115bf567ff586fb656cf5d95a0a7465fb2fe + REF 2bc89b34ad3cc37b6bca9a44a3529ff2d8fe211f # 0.61 + SHA512 6e2496959749422987aca21f333abb01648702b85e02acc711bbac398ca6a67d8be93a3d89fc1f8bad5446865725ff9bcc053e6229cb34627120b59469426266 HEAD_REF master PATCHES ddl2cpp_path.patch - fix-dependency.patch ) -# Use sqlpp11's own build process, skipping tests -vcpkg_configure_cmake( +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + sqlite3 BUILD_SQLITE3_CONNECTOR + mariadb BUILD_MARIADB_CONNECTOR + mysql BUILD_MYSQL_CONNECTOR +) + +# Use sqlpp11's own build process +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS - -DENABLE_TESTS:BOOL=OFF + -DBUILD_TESTING:BOOL=OFF + # Use vcpkg as source for the date library + -DUSE_SYSTEM_DATE:BOOL=ON + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move CMake config files to the right place -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Sqlpp11 TARGET_PATH share/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Sqlpp11) # Delete redundant and unnecessary directories file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/include/date) diff --git a/ports/sqlpp11/vcpkg.json b/ports/sqlpp11/vcpkg.json index 63951d79747e2f..c171d61265a057 100644 --- a/ports/sqlpp11/vcpkg.json +++ b/ports/sqlpp11/vcpkg.json @@ -1,10 +1,38 @@ { "name": "sqlpp11", - "version-string": "0.60", - "port-version": 1, + "version": "0.61", "description": "A type safe embedded domain specific language for SQL queries and results in C++.", "homepage": "https://github.com/rbock/sqlpp11", + "license": "BSD-2-Clause", "dependencies": [ - "date" - ] + "date", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "mariadb": { + "description": "Use MariaDB connector", + "dependencies": [ + "libmariadb" + ] + }, + "mysql": { + "description": "Use MySQL connector", + "dependencies": [ + "libmysql" + ] + }, + "sqlite3": { + "description": "Use SQLite3 connector", + "dependencies": [ + "sqlite3" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index c4c1d253336ad1..bb7f6ef0c2bc65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6813,16 +6813,16 @@ "port-version": 1 }, "sqlpp11": { - "baseline": "0.60", - "port-version": 1 + "baseline": "0.61", + "port-version": 0 }, "sqlpp11-connector-mysql": { - "baseline": "0.29", - "port-version": 2 + "baseline": "0.61", + "port-version": 0 }, "sqlpp11-connector-sqlite3": { - "baseline": "0.30", - "port-version": 1 + "baseline": "0.61", + "port-version": 0 }, "squirrel": { "baseline": "2021-09-17", diff --git a/versions/s-/sqlpp11-connector-mysql.json b/versions/s-/sqlpp11-connector-mysql.json index 5ecd3b6d4ec0e6..4d0489c5eeabc7 100644 --- a/versions/s-/sqlpp11-connector-mysql.json +++ b/versions/s-/sqlpp11-connector-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e15caf6d82c3e2b8ad27294a18ea745d7713b28", + "version": "0.61", + "port-version": 0 + }, { "git-tree": "be46edaef7e1c02783398222e4e73f288848e537", "version-string": "0.29", diff --git a/versions/s-/sqlpp11-connector-sqlite3.json b/versions/s-/sqlpp11-connector-sqlite3.json index ca49980d3330da..6daff1e528c58c 100644 --- a/versions/s-/sqlpp11-connector-sqlite3.json +++ b/versions/s-/sqlpp11-connector-sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2465fd92079797d39eddc691a6938933e0b6624", + "version": "0.61", + "port-version": 0 + }, { "git-tree": "476b94c2a6be8d48ef3360793ed0b4569b4614d4", "version-string": "0.30", diff --git a/versions/s-/sqlpp11.json b/versions/s-/sqlpp11.json index ee0e440c8d13f2..5d3558e3fe703f 100644 --- a/versions/s-/sqlpp11.json +++ b/versions/s-/sqlpp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0013607524d7c0803705193bbf09b1254fab14ff", + "version": "0.61", + "port-version": 0 + }, { "git-tree": "572562b44cd15b26fd8cdf68dff2c53d6ec0619d", "version-string": "0.60", From 06d29adda9959444b7ceb861f0885170fd736368 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Wed, 6 Jul 2022 00:49:35 +0200 Subject: [PATCH 038/791] [new port] Ableton Link (#25438) * Initial port for Ableton Link * Added missing versions/a-/ableton.json file * Added double quotes to all relative paths in portfile.cmake * Removed CMakeLists.txt file from the installed files * Use Catch2 only in CMakeLists.txt, when test features are enabled * Made find_package asio conditional too --- .../correct_cmake_include_directory.patch | 20 +++++ ports/ableton/portfile.cmake | 70 +++++++++++++++ ...e_local_asiostandalone_by_vcpkg_asio.patch | 21 +++++ .../replace_local_catch_by_vcpkg_catch2.patch | 90 +++++++++++++++++++ ports/ableton/vcpkg.json | 42 +++++++++ versions/a-/ableton.json | 9 ++ versions/baseline.json | 5 ++ 7 files changed, 257 insertions(+) create mode 100644 ports/ableton/correct_cmake_include_directory.patch create mode 100644 ports/ableton/portfile.cmake create mode 100644 ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch create mode 100644 ports/ableton/replace_local_catch_by_vcpkg_catch2.patch create mode 100644 ports/ableton/vcpkg.json create mode 100644 versions/a-/ableton.json diff --git a/ports/ableton/correct_cmake_include_directory.patch b/ports/ableton/correct_cmake_include_directory.patch new file mode 100644 index 00000000000000..0250fb942d607f --- /dev/null +++ b/ports/ableton/correct_cmake_include_directory.patch @@ -0,0 +1,20 @@ +diff --git "a/AbletonLinkConfig.cmake" "b/AbletonLinkConfig.cmake" +index 43b66e7..1e84fa5 100644 +--- "a/AbletonLinkConfig.cmake" ++++ "b/AbletonLinkConfig.cmake" +@@ -5,7 +5,7 @@ endif() + add_library(Ableton::Link IMPORTED INTERFACE) + set_property(TARGET Ableton::Link APPEND PROPERTY + INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/include ++ ${CMAKE_CURRENT_LIST_DIR}/../../include/ableton + ) + + # Force C++11 support for consuming targets +@@ -46,5 +46,5 @@ set_property(TARGET Ableton::Link APPEND PROPERTY + + set_property(TARGET Ableton::Link APPEND PROPERTY + INTERFACE_SOURCES +- ${CMAKE_CURRENT_LIST_DIR}/include/ableton/Link.hpp ++ ${CMAKE_CURRENT_LIST_DIR}/../../include/ableton/Link.hpp + ) diff --git a/ports/ableton/portfile.cmake b/ports/ableton/portfile.cmake new file mode 100644 index 00000000000000..fceab0f281794a --- /dev/null +++ b/ports/ableton/portfile.cmake @@ -0,0 +1,70 @@ +#header-only library +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ableton/link + REF 2641130bca65cdfb95794b31a6453a825333bd28 + SHA512 a7c2e2904fe3e0b10affd5482f057c39634cf8935a09732a7ac3b33096754e6a5dbb4545cd51c327c74383065d2dd046ec40ff68fda3013ad1bf8ff4165b469f + HEAD_REF master + PATCHES + replace_local_asiostandalone_by_vcpkg_asio.patch + replace_local_catch_by_vcpkg_catch2.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "discoverytest" LinkDiscoveryTest + "coretest" LinkCoreTest + "hut" LinkHut + "hutsilent" LinkHutSilent +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/ci") +file(REMOVE_RECURSE "${SOURCE_PATH}/modules") +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party") + +set(NEED_CATCH2 OFF) +if ("coretest" IN_LIST FEATURES) + set(NEED_CATCH2 ON) +endif() +if ("discoverytest" IN_LIST FEATURES) + set(NEED_CATCH2 ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNEED_CATCH2=${NEED_CATCH2} +) + +if ("coretest" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkCoreTest) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkCoreTest${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +if ("discoverytest" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkDiscoveryTest) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkDiscoveryTest${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +if ("hut" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkHut) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkHut${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +if ("hutsilent" IN_LIST FEATURES) + vcpkg_cmake_build(TARGET LinkHutSilent) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/bin/LinkHutSilent${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() + +# We must not correct the CMake include path before build +vcpkg_apply_patches( + SOURCE_PATH "${SOURCE_PATH}" + PATCHES + correct_cmake_include_directory.patch +) + +file(INSTALL "${SOURCE_PATH}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/cmake_include/") +file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN "CMakeLists.txt" EXCLUDE) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch b/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch new file mode 100644 index 00000000000000..a6b437f8e05aa4 --- /dev/null +++ b/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch @@ -0,0 +1,21 @@ +diff a/cmake_include/AsioStandaloneConfig.cmake b/AsioStandaloneConfig.cmake + +--- a/cmake_include/AsioStandaloneConfig.cmake ++++ b/cmake_include/AsioStandaloneConfig.cmake +@@ -1,6 +1,12 @@ + add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE) ++if (LINK_BUILD_ASIO MATCHES "ON") + +-set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/../modules/asio-standalone/asio/include +-) ++ find_package(asio REQUIRED) ++ if(asio_FOUND) ++ message(STATUS "Dependency asio found in ${asio_DIR}") ++ set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ++ ${asio_DIR}/../../include ++ ) ++ endif() ++endif() diff --git a/ports/ableton/replace_local_catch_by_vcpkg_catch2.patch b/ports/ableton/replace_local_catch_by_vcpkg_catch2.patch new file mode 100644 index 00000000000000..327af392369d6a --- /dev/null +++ b/ports/ableton/replace_local_catch_by_vcpkg_catch2.patch @@ -0,0 +1,90 @@ +--- ableton-link.orig/cmake_include/CatchConfig.cmake ++++ ableton-link/cmake_include/CatchConfig.cmake +@@ -1,6 +1,12 @@ +-add_library(Catch::Catch IMPORTED INTERFACE) ++if (NEED_CATCH2 MATCHES "ON") ++ add_library(Catch::Catch IMPORTED INTERFACE) + +-set_property(TARGET Catch::Catch APPEND PROPERTY +- INTERFACE_INCLUDE_DIRECTORIES +- ${CMAKE_CURRENT_LIST_DIR}/../third_party/catch +-) ++ find_package(Catch2 CONFIG REQUIRED) ++ if(Catch2_FOUND) ++ message(STATUS "Dependency Catch2 found in ${Catch2_DIR}") ++ set_property(TARGET Catch::Catch APPEND PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ++ ${Catch2_DIR}/../../include ++ ) ++ endif() ++endif() + + +--- "a/src/CMakeLists.txt" ++++ "b/src/CMakeLists.txt" +@@ -78,7 +78,12 @@ function(configure_link_test_executable target) + if(CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD|GNU") + target_link_libraries(${target} atomic pthread) + endif() +- target_link_libraries(${target} Catch::Catch Ableton::Link) ++ if (NEED_CATCH2 MATCHES "ON") ++ target_link_libraries(${target} Catch2::Catch2WithMain Ableton::Link) + target_compile_definitions(${target} PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING=1) ++ else() ++ target_link_libraries(${target} Ableton::Link) ++ target_compile_definitions(${target} PRIVATE -DCATCH_CONFIG_ENABLE_BENCHMARKING=0) ++ endif() + endfunction() + + +--- "a/src/ableton/link/tst_LinearRegression.cpp" ++++ "b/src/ableton/link/tst_LinearRegression.cpp" +@@ -22,6 +22,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + + +--- "a/src/ableton/link/tst_Beats.cpp" ++++ "b/src/ableton/link/tst_Beats.cpp" +@@ -20,6 +20,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + + +--- "a/src/ableton/link/tst_Median.cpp" ++++ "b/src/ableton/link/tst_Median.cpp" +@@ -22,6 +22,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + + +--- "a/src/ableton/link/tst_Tempo.cpp" ++++ "b/src/ableton/link/tst_Tempo.cpp" +@@ -20,6 +20,8 @@ + #include + #include + ++using Catch::Approx; ++ + namespace ableton + { + namespace link + diff --git a/ports/ableton/vcpkg.json b/ports/ableton/vcpkg.json new file mode 100644 index 00000000000000..a6c9b008f37698 --- /dev/null +++ b/ports/ableton/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "ableton", + "version": "3.0.5", + "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.", + "homepage": "https://www.ableton.com/en/link/", + "documentation": "http://ableton.github.io/link/", + "license": "GPL-2.0-or-later", + "dependencies": [ + { + "name": "asio", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "coretest": { + "description": "Build LinkCoreTest suite", + "dependencies": [ + "catch2" + ] + }, + "discoverytest": { + "description": "Build LinkDiscoveryTest suite", + "dependencies": [ + "catch2" + ] + }, + "hut": { + "description": "Build LinkHut command line tool" + }, + "hutsilent": { + "description": "Build LinkHutSilent command line tool" + } + } +} diff --git a/versions/a-/ableton.json b/versions/a-/ableton.json new file mode 100644 index 00000000000000..bf104b16024fc5 --- /dev/null +++ b/versions/a-/ableton.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bac28c4912d6fd4e32ad716ec8bf4e197c9a4cb8", + "version": "3.0.5", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index bb7f6ef0c2bc65..0f4fb26c26af47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8,6 +8,11 @@ "baseline": "21.07", "port-version": 1 }, + "ableton": { + "baseline": "3.0.5", + "port-version": 0 + }, + "abseil": { "baseline": "20211102.1", "port-version": 0 From 517adc7517e8a79859fead5dde5cfa2e93bd5d0b Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 6 Jul 2022 06:52:53 +0800 Subject: [PATCH 039/791] [yoga] Add unofficial-yoga-config.cmake (#25417) * [yoga] Add unofficial-yoga-config.cmake * x-add-version Co-authored-by: Cheney-Wang --- .../yoga/Export-unofficial-yoga-config.patch | 33 +++++++++++++++++ ports/yoga/portfile.cmake | 37 +++++-------------- ports/yoga/vcpkg.json | 14 ++++++- versions/baseline.json | 2 +- versions/y-/yoga.json | 5 +++ 5 files changed, 61 insertions(+), 30 deletions(-) create mode 100644 ports/yoga/Export-unofficial-yoga-config.patch diff --git a/ports/yoga/Export-unofficial-yoga-config.patch b/ports/yoga/Export-unofficial-yoga-config.patch new file mode 100644 index 00000000000000..dceea3361f3201 --- /dev/null +++ b/ports/yoga/Export-unofficial-yoga-config.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c6f4a83..7cee74a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,6 +21,26 @@ add_compile_options( + file(GLOB_RECURSE yogacore_SRC yoga/*.cpp) + add_library(yogacore STATIC ${yogacore_SRC}) + +-target_include_directories(yogacore PUBLIC .) ++target_include_directories(yogacore PUBLIC ++ $ ++ $ ++) + target_link_libraries(yogacore android log) + set_target_properties(yogacore PROPERTIES CXX_STANDARD 11) ++ ++install(TARGETS yogacore EXPORT unofficial-yoga-config ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++ ++install(EXPORT unofficial-yoga-config ++ FILE unofficial-yoga-config.cmake ++ NAMESPACE unofficial::yoga:: ++ DESTINATION share/unofficial-yoga ++) ++ ++install(DIRECTORY ${CMAKE_SOURCE_DIR}/yoga ++ DESTINATION include ++ FILES_MATCHING ++ PATTERN *.h ++) +\ No newline at end of file diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index 6c7a2cf94b2bbd..f5aa3d71537c9c 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -6,38 +6,19 @@ vcpkg_from_github( REF v1.19.0 SHA512 B1CB1F23CF9B5DD2491B6883CAF8FB47E264B736C94F6AA6655E9A6F641664B4BCEEB48F74C98B955F0EE02BA2E0AE8E01539A928ABB4B81FAE13ED3B57287CA HEAD_REF master - PATCHES add-project-declaration.patch + PATCHES + add-project-declaration.patch + Export-unofficial-yoga-config.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_build_cmake() -vcpkg_copy_pdbs() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/yoga DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*.h") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-yoga) -set(YOGA_LIB_PREFFIX ) -if (NOT VCPKG_TARGET_IS_WINDOWS) - set(YOGA_LIB_PREFFIX lib) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(YOGA_BINARY_PATH ) - if (VCPKG_TARGET_IS_WINDOWS) - set(YOGA_BINARY_PATH Release/) - endif() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${YOGA_BINARY_PATH}${YOGA_LIB_PREFFIX}yogacore${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(YOGA_BINARY_PATH ) - if (VCPKG_TARGET_IS_WINDOWS) - set(YOGA_BINARY_PATH Debug/) - endif() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/${YOGA_BINARY_PATH}${YOGA_LIB_PREFFIX}yogacore${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yoga/vcpkg.json b/ports/yoga/vcpkg.json index 570be343604041..cf1c539fa85474 100644 --- a/ports/yoga/vcpkg.json +++ b/ports/yoga/vcpkg.json @@ -1,7 +1,19 @@ { "name": "yoga", "version": "1.19.0", + "port-version": 1, "description": "Yoga is a cross-platform layout engine which implements Flexbox", "homepage": "https://github.com/facebook/yoga", - "supports": "!uwp" + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0f4fb26c26af47..ce50958771b26d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7775,7 +7775,7 @@ }, "yoga": { "baseline": "1.19.0", - "port-version": 0 + "port-version": 1 }, "yomm2": { "baseline": "1.1.2", diff --git a/versions/y-/yoga.json b/versions/y-/yoga.json index 891c54e4c21b4c..4a754eacef44e1 100644 --- a/versions/y-/yoga.json +++ b/versions/y-/yoga.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "620d91442f1a5e599eeabcb0c6b86fcb57a781f8", + "version": "1.19.0", + "port-version": 1 + }, { "git-tree": "12751eb94758566f26b621b28dc86fe8b1977a7f", "version": "1.19.0", From 4927109528f1a2691ae5aa153d22ce9fba55d513 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 6 Jul 2022 06:54:43 +0800 Subject: [PATCH 040/791] [7-Zip] update to 22.00 (#25388) * [7-Zip] update to 22.00 * update version * change version * update version --- ports/7zip/portfile.cmake | 4 ++-- ports/7zip/vcpkg.json | 3 +-- versions/7-/7zip.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake index 5dd58bfdbddb02..d4a5cf487b7f91 100644 --- a/ports/7zip/portfile.cmake +++ b/ports/7zip/portfile.cmake @@ -1,8 +1,8 @@ -set(7ZIP_VERSION "2107") +set(7ZIP_VERSION "2200") vcpkg_download_distfile(ARCHIVE URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z" FILENAME "7z${7ZIP_VERSION}-src.7z" - SHA512 c13521a9829ac239a89015e1f5da27eeaa2469754e3f8ca32311d964ea9d0b40a17e4f8ccbd425d3e865aa768be345368f1c36f354d5710ac7cb2749dd6a3ab5 + SHA512 ff5bab0ad5c16dee84208b42df27ab1df34499365d934b33f61cd8c79b2a946e8875b1524540c1306381a51d6b24535bbcaf92819bf5331814d6c14cf12d3b07 ) vcpkg_extract_source_archive( diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json index 542e88c002735c..bfb06d702cff09 100644 --- a/ports/7zip/vcpkg.json +++ b/ports/7zip/vcpkg.json @@ -1,7 +1,6 @@ { "name": "7zip", - "version-string": "21.07", - "port-version": 1, + "version": "22.0", "description": "Library for archiving file with a high compression ratio.", "homepage": "https://www.7-zip.org", "license": "LGPL-2.1-or-later", diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 49dd64b19f5274..33107cc50d0124 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15ce7b0d1812f8640e74075ca9f5e3a08b3bc875", + "version": "22.0", + "port-version": 0 + }, { "git-tree": "d60561160384264eaf45a225dcb41beccb87ecbc", "version-string": "21.07", diff --git a/versions/baseline.json b/versions/baseline.json index ce50958771b26d..696d32db612604 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5,8 +5,8 @@ "port-version": 2 }, "7zip": { - "baseline": "21.07", - "port-version": 1 + "baseline": "22.0", + "port-version": 0 }, "ableton": { "baseline": "3.0.5", From 5dd5017f144d4412ac42c5506a31006b6ac16600 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 6 Jul 2022 06:58:12 +0800 Subject: [PATCH 041/791] [fmt] fix format conflict (#25137) * fix format conflict * update * update patch file --- ports/fmt/fix-format-conflict.patch | 28 ++++++++++++++++++++++++++++ ports/fmt/portfile.cmake | 1 + ports/fmt/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 ports/fmt/fix-format-conflict.patch diff --git a/ports/fmt/fix-format-conflict.patch b/ports/fmt/fix-format-conflict.patch new file mode 100644 index 00000000000000..3d97c5c9ef48ac --- /dev/null +++ b/ports/fmt/fix-format-conflict.patch @@ -0,0 +1,28 @@ +diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h +index 2c51c50..fb3eba0 100644 +--- a/include/fmt/format-inl.h ++++ b/include/fmt/format-inl.h +@@ -75,8 +75,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, + error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); + auto it = buffer_appender(out); + if (message.size() <= inline_buffer_size - error_code_size) +- format_to(it, FMT_STRING("{}{}"), message, SEP); +- format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); ++ fmt::format_to(it, FMT_STRING("{}{}"), message, SEP); ++ fmt::format_to(it, FMT_STRING("{}{}"), ERROR_STR, error_code); + FMT_ASSERT(out.size() <= inline_buffer_size, ""); + } + +diff --git a/src/os.cc b/src/os.cc +index 04b4dc5..fe2c7e4 100644 +--- a/src/os.cc ++++ b/src/os.cc +@@ -167,7 +167,7 @@ void detail::format_windows_error(detail::buffer& out, int error_code, + if (msg) { + utf16_to_utf8 utf8_message; + if (utf8_message.convert(msg) == ERROR_SUCCESS) { +- format_to(buffer_appender(out), "{}: {}", message, utf8_message); ++ fmt::format_to(buffer_appender(out), "{}: {}", message, utf8_message); + return; + } + } diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 10362875e530c7..db01678275d37a 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-write-batch.patch fix-invalid-command.patch + fix-format-conflict.patch ) vcpkg_cmake_configure( diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 7386b40b6620d9..28a1f11a3859d7 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fmt", "version": "8.1.1", - "port-version": 1, + "port-version": 2, "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 696d32db612604..3c31511fe2be23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2311,7 +2311,7 @@ }, "fmt": { "baseline": "8.1.1", - "port-version": 1 + "port-version": 2 }, "folly": { "baseline": "2022.03.21.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index c016f90d17241c..1b05965f08b748 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f0a5cf3aa202e9833dcc5d3fa36688ecf295ca4", + "version": "8.1.1", + "port-version": 2 + }, { "git-tree": "602d9743b7957c9e82a06d0e81d58637c6df5222", "version": "8.1.1", From 88bdc6d387983aa8b19cdeab77706789d1755493 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 6 Jul 2022 13:47:36 -0700 Subject: [PATCH 042/791] [libfreenect2] Add feature openni2 (#25600) * [libfreenect2] Add feature openni2 * update version * x-add-version Co-authored-by: LilyWangLL --- ports/libfreenect2/portfile.cmake | 6 ++++-- ports/libfreenect2/vcpkg.json | 8 +++++++- versions/baseline.json | 3 +-- versions/l-/libfreenect2.json | 5 +++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index 32ea1a6889a294..a235bc592f6722 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -15,8 +15,10 @@ string(REPLACE "(WIN32)" file(WRITE "${SOURCE_PATH}/cmake_modules/FindLibUSB.cmake" "${FINDLIBUSB}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - opengl ENABLE_OPENGL - opencl ENABLE_OPENCL + FEATURES + opengl ENABLE_OPENGL + opencl ENABLE_OPENCL + openni2 BUILD_OPENNI2_DRIVER ) vcpkg_cmake_configure( diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json index fd11f7991c6029..cbeaef735dd324 100644 --- a/ports/libfreenect2/vcpkg.json +++ b/ports/libfreenect2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libfreenect2", "version": "0.2.0", - "port-version": 8, + "port-version": 9, "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", "license": "GPL-2.0-only", @@ -33,6 +33,12 @@ "glfw3", "opengl" ] + }, + "openni2": { + "description": "OpenNI2 support for libfreenect2", + "dependencies": [ + "openni2" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 3c31511fe2be23..e25b7c6116d6f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -12,7 +12,6 @@ "baseline": "3.0.5", "port-version": 0 }, - "abseil": { "baseline": "20211102.1", "port-version": 0 @@ -3611,7 +3610,7 @@ }, "libfreenect2": { "baseline": "0.2.0", - "port-version": 8 + "port-version": 9 }, "libftdi": { "baseline": "0.20", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index 9313d9c6c195b2..3100a1da8a46b4 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33bfc70d84b528fa549f57401c884abda1073526", + "version": "0.2.0", + "port-version": 9 + }, { "git-tree": "ce8aefbc76e982371258202989111294d9a5221d", "version": "0.2.0", From 4b16144233863d06846b9e8441571bf64a707bd1 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 6 Jul 2022 13:48:23 -0700 Subject: [PATCH 043/791] [eastl] Fix error C2039 with Visual Studio 2022 (#25593) * [eastl] Fix error C2039 with Visual Studio 2022 * x-add-version Co-authored-by: LilyWangLL --- ports/eastl/fix-error-C2039.diff | 88 ++++++++++++++++++++++++++++++++ ports/eastl/portfile.cmake | 3 +- ports/eastl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/eastl.json | 5 ++ 5 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 ports/eastl/fix-error-C2039.diff diff --git a/ports/eastl/fix-error-C2039.diff b/ports/eastl/fix-error-C2039.diff new file mode 100644 index 00000000000000..8b464b6dd61dcc --- /dev/null +++ b/ports/eastl/fix-error-C2039.diff @@ -0,0 +1,88 @@ +diff --git a/include/EASTL/numeric_limits.h b/include/EASTL/numeric_limits.h +index e991e7e9..e933c845 100644 +--- a/include/EASTL/numeric_limits.h ++++ b/include/EASTL/numeric_limits.h +@@ -1435,6 +1435,19 @@ namespace eastl + static value_type round_error() + { return 0.5f; } + ++ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... ++ static value_type infinity() ++ { return __builtin_huge_valf(); } ++ ++ static value_type quiet_NaN() ++ { return __builtin_nanf("0"); } ++ ++ static value_type signaling_NaN() ++ { return __builtin_nansf("1"); } ++ ++ static value_type denorm_min() ++ { return FLT_TRUE_MIN; } ++ #else + static value_type infinity() + { return _CSTD _FInf._Float; } + +@@ -1446,6 +1459,7 @@ namespace eastl + + static value_type denorm_min() + { return _CSTD _FDenorm._Float; } ++ #endif + + #endif + }; +@@ -1553,6 +1567,19 @@ namespace eastl + static value_type round_error() + { return 0.5f; } + ++ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... ++ static value_type infinity() ++ { return __builtin_huge_val(); } ++ ++ static value_type quiet_NaN() ++ { return __builtin_nan("0"); } ++ ++ static value_type signaling_NaN() ++ { return __builtin_nans("1"); } ++ ++ static value_type denorm_min() ++ { return DBL_TRUE_MIN; } ++ #else + static value_type infinity() + { return _CSTD _Inf._Double; } + +@@ -1564,6 +1591,7 @@ namespace eastl + + static value_type denorm_min() + { return _CSTD _Denorm._Double; } ++ #endif + + #endif + }; +@@ -1671,6 +1699,19 @@ namespace eastl + static value_type round_error() + { return 0.5f; } + ++ #if defined(_MSVC_STL_UPDATE) && _MSVC_STL_UPDATE >= 202206L // If using a recent version of MSVC's STL... ++ static value_type infinity() ++ { return __builtin_huge_val(); } ++ ++ static value_type quiet_NaN() ++ { return __builtin_nan("0"); } ++ ++ static value_type signaling_NaN() ++ { return __builtin_nans("1"); } ++ ++ static value_type denorm_min() ++ { return LDBL_TRUE_MIN; } ++ #else + static value_type infinity() + { return _CSTD _LInf._Long_double; } + +@@ -1682,6 +1723,7 @@ namespace eastl + + static value_type denorm_min() + { return _CSTD _LDenorm._Long_double; } ++ #endif + + #endif + }; diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index 04ba63fc55c9a6..1c8185fa8c4b25 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_cmake_install.patch - Fix-error-C2338.patch + Fix-error-C2338.patch + fix-error-C2039.diff ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}") diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json index b2c97ba50c24c0..7db58cc90a5f4c 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "eastl", "version-string": "3.18.00", - "port-version": 2, + "port-version": 3, "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", "homepage": "https://github.com/electronicarts/EASTL", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e25b7c6116d6f3..0e5a667a4ae6e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2022,7 +2022,7 @@ }, "eastl": { "baseline": "3.18.00", - "port-version": 2 + "port-version": 3 }, "easycl": { "baseline": "0.3", diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json index a62180cf88363c..e851e47cf8282e 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e7b533fac097c3aa75f7b46630ea62f10980f87", + "version-string": "3.18.00", + "port-version": 3 + }, { "git-tree": "aa2de2990c3b1e6e008e1cafea8ad82c765278fb", "version-string": "3.18.00", From f5d2503a01bbb74b7cf9ce142c0496a15e2223ba Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 6 Jul 2022 22:49:49 +0200 Subject: [PATCH 044/791] [qca] fix "botan" feature (#25587) --- ports/qca/portfile.cmake | 4 ++-- ports/qca/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qca.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 54c137540ea5fd..309d83b1d2a383 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -45,9 +45,9 @@ vcpkg_execute_required_process( message(STATUS "Importing certstore done") if("botan" IN_LIST FEATURES) - list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="yes") + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=yes) else() - list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN="no") + list(APPEND QCA_OPTIONS -DWITH_botan_PLUGIN=no) endif() # Configure and build diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index 723256ab982915..417d002bee2c9b 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qca", "version": "2.3.4", - "port-version": 2, + "port-version": 3, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://cgit.kde.org/qca.git/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0e5a667a4ae6e1..0d9ddf5f0bda05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5706,7 +5706,7 @@ }, "qca": { "baseline": "2.3.4", - "port-version": 2 + "port-version": 3 }, "qcustomplot": { "baseline": "2.0.1", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index bbba4bbf39c647..d79041bf3d78b4 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f719790dc5863b3724d0fed5a7179cb1ca41c871", + "version": "2.3.4", + "port-version": 3 + }, { "git-tree": "41239863ffd0059d8688502f6d6284785c6c8633", "version": "2.3.4", From d656cf0dffcad322219eecd24116d0073bef5426 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 7 Jul 2022 04:51:39 +0800 Subject: [PATCH 045/791] [yyjson] Update to 0.5.1 (#25582) * [yyjson] Update to 0.5.1 * [yyjson] Bump version --- ports/yyjson/portfile.cmake | 4 ++-- ports/yyjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/y-/yyjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/yyjson/portfile.cmake b/ports/yyjson/portfile.cmake index e1e4833bba2359..6dbb7f4af5dfaa 100644 --- a/ports/yyjson/portfile.cmake +++ b/ports/yyjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ibireme/yyjson - REF 0.5.0 - SHA512 6b2e051f7d5829acb9ca25ce97e4872f5517b3f291a30c6a86ec40f71670b8114f43c2d272410834a5c92b5203726b65696f06423bc6e5001dff2aabf5eb20d9 + REF 0.5.1 + SHA512 dbae242ee023e872184b4f28e32e3044adfa0cf00e0f480e961a0c8979ff69b2d2f95a33504f10883eba16b68db0adce3a38c2f99dcb6f94eb73a107b89cca95 HEAD_REF master ) diff --git a/ports/yyjson/vcpkg.json b/ports/yyjson/vcpkg.json index 5492a2db73fbe1..7e82049366b9d5 100644 --- a/ports/yyjson/vcpkg.json +++ b/ports/yyjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yyjson", - "version": "0.5.0", + "version": "0.5.1", "description": "A high performance JSON library written in ANSI C", "homepage": "https://github.com/ibireme/yyjson", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0d9ddf5f0bda05..396dbdda662539 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7781,7 +7781,7 @@ "port-version": 0 }, "yyjson": { - "baseline": "0.5.0", + "baseline": "0.5.1", "port-version": 0 }, "z3": { diff --git a/versions/y-/yyjson.json b/versions/y-/yyjson.json index 73ac88b717cd84..bfd3c5279fd730 100644 --- a/versions/y-/yyjson.json +++ b/versions/y-/yyjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dddfac371d8dad2fe69680acab1512cd2d87062", + "version": "0.5.1", + "port-version": 0 + }, { "git-tree": "228eaef5ad7cddcc8e76dc73b2741f75cc18912a", "version": "0.5.0", From 0920ffe742831799120958489086c39a94dae5dc Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 6 Jul 2022 22:52:09 +0200 Subject: [PATCH 046/791] Update openal-soft to 1.22.2 (#25580) --- ports/openal-soft/portfile.cmake | 4 ++-- ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index e2a47b3d643f11..1a34d31ab70593 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kcat/openal-soft - REF c1c63a27de66cd44ef756b190a73bfa8bc6dbbab # openal-soft-1.22.0 - SHA512 3d403a2c292991976880254dd6374e7f501e6b56183bfd935f5f640f250fb935f95537faf49a3ef42d75c993475971f56da8118c54c8c6668e951d1a5e576139 + REF dc83d99c95a42c960150ddeee06c124134b52208 # openal-soft-1.22.2 + SHA512 3fbbdfbb2609ef8187d20ce74b2fb8082037288f3fd80df71d360705d8efdadfe8f62811af1cd824cb6572c8c3479b370f8ae3819b8b8bb0b20c34f7a73cc530 HEAD_REF master ) diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 871fbcdc01b210..2b72ce14707ce5 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openal-soft", - "version-semver": "1.22.0", + "version-semver": "1.22.2", "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 396dbdda662539..68211605a7bc3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5109,7 +5109,7 @@ "port-version": 1 }, "openal-soft": { - "baseline": "1.22.0", + "baseline": "1.22.2", "port-version": 0 }, "openblas": { diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index ba542cd40c1e76..1268d7cc7bd29a 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49395645807a6b8d7948d03474fbfa6c467be314", + "version-semver": "1.22.2", + "port-version": 0 + }, { "git-tree": "c3fd33b48248cdb7d2139e14d5ad324d122db4b3", "version-semver": "1.22.0", From 3beaa7d849f3cebe9cb0d161ba35494f94bd8024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 6 Jul 2022 20:55:52 +0000 Subject: [PATCH 047/791] [xlsxio] Export official targets (#25575) * [xlsxio] Export unofficial targets * version * Add license * version * Use official changes instead * version * Apply suggestions * version --- ports/xlsxio/export-targets.patch | 138 ++++++++++++++++++++++++++++++ ports/xlsxio/portfile.cmake | 28 +++--- ports/xlsxio/vcpkg.json | 10 +++ versions/baseline.json | 2 +- versions/x-/xlsxio.json | 5 ++ 5 files changed, 167 insertions(+), 16 deletions(-) create mode 100644 ports/xlsxio/export-targets.patch diff --git a/ports/xlsxio/export-targets.patch b/ports/xlsxio/export-targets.patch new file mode 100644 index 00000000000000..112473771de0ea --- /dev/null +++ b/ports/xlsxio/export-targets.patch @@ -0,0 +1,138 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 05c7ee5..28a0206 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,7 +87,8 @@ INCLUDE_DIRECTORIES(${ANYZIP_INCLUDE_DIRS}) + INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIRS}) + + # build definitions +-SET(ALLTARGETS) ++SET(ALLTARGETS_LIB) ++SET(ALLTARGETS_EXE) + SET(LINKTYPES) + IF(BUILD_STATIC) + LIST(APPEND LINKTYPES "STATIC") +@@ -106,7 +107,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) + ENDIF() + TARGET_INCLUDE_DIRECTORIES(xlsxio_read_${LINKTYPE} PRIVATE lib) + TARGET_LINK_LIBRARIES(xlsxio_read_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPAT_LIBRARIES}) +- SET(ALLTARGETS ${ALLTARGETS} xlsxio_read_${LINKTYPE}) ++ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_read_${LINKTYPE}) + + ADD_LIBRARY(xlsxio_write_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c) + SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "BUILD_XLSXIO;${ANYZIP_DEF};BUILD_XLSXIO_${LINKTYPE}") +@@ -115,7 +116,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) + SET_TARGET_PROPERTIES(xlsxio_write_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_write.def") + ENDIF() + TARGET_LINK_LIBRARIES(xlsxio_write_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB}) +- SET(ALLTARGETS ${ALLTARGETS} xlsxio_write_${LINKTYPE}) ++ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_write_${LINKTYPE}) + + IF(WITH_WIDE) + ADD_LIBRARY(xlsxio_readw_${LINKTYPE} ${LINKTYPE} lib/xlsxio_read.c lib/xlsxio_read_sharedstrings.c) +@@ -127,7 +128,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) + ENDIF() + TARGET_INCLUDE_DIRECTORIES(xlsxio_readw_${LINKTYPE} PRIVATE lib) + TARGET_LINK_LIBRARIES(xlsxio_readw_${LINKTYPE} ${ANYZIP_LIBRARIES} ${EXPATW_LIBRARIES}) +- SET(ALLTARGETS ${ALLTARGETS} xlsxio_readw_${LINKTYPE}) ++ SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_readw_${LINKTYPE}) + + #ADD_LIBRARY(xlsxio_writew_${LINKTYPE} ${LINKTYPE} lib/xlsxio_write.c) + #SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES DEFINE_SYMBOL "BUILD_XLSXIO_DLL") +@@ -137,7 +138,7 @@ FOREACH(LINKTYPE ${LINKTYPES}) + # SET_TARGET_PROPERTIES(xlsxio_writew_${LINKTYPE} PROPERTIES LINK_FLAGS "-Wl,--output-def=libxlsxio_writew.def") + #ENDIF() + #TARGET_LINK_LIBRARIES(xlsxio_writew_${LINKTYPE} ${ANYZIP_LIBRARIES} ${THREADLIB}) +- #SET(ALLTARGETS ${ALLTARGETS} xlsxio_writew_${LINKTYPE}) ++ #SET(ALLTARGETS_LIB ${ALLTARGETS_LIB} xlsxio_writew_${LINKTYPE}) + ENDIF() + + SET(EXELINKTYPE ${LINKTYPE}) +@@ -148,35 +149,35 @@ ENDFOREACH() + IF(BUILD_TOOLS) + ADD_EXECUTABLE(xlsxio_xlsx2csv src/xlsxio_xlsx2csv.c) + TARGET_LINK_LIBRARIES(xlsxio_xlsx2csv xlsxio_read_${EXELINKTYPE}) +- SET(ALLTARGETS ${ALLTARGETS} xlsxio_xlsx2csv) ++ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_xlsx2csv) + + ADD_EXECUTABLE(xlsxio_csv2xlsx src/xlsxio_csv2xlsx.c) + TARGET_LINK_LIBRARIES(xlsxio_csv2xlsx xlsxio_write_${EXELINKTYPE}) +- SET(ALLTARGETS ${ALLTARGETS} xlsxio_csv2xlsx) ++ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} xlsxio_csv2xlsx) + ENDIF() + + IF(BUILD_EXAMPLES) + ADD_EXECUTABLE(example_xlsxio_write_getversion examples/example_xlsxio_write_getversion.c) + TARGET_LINK_LIBRARIES(example_xlsxio_write_getversion xlsxio_write_${EXELINKTYPE}) +- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write_getversion) ++ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write_getversion) + + ADD_EXECUTABLE(example_xlsxio_write examples/example_xlsxio_write.c) + TARGET_LINK_LIBRARIES(example_xlsxio_write xlsxio_write_${EXELINKTYPE}) +- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_write) ++ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_write) + + ADD_EXECUTABLE(example_xlsxio_read examples/example_xlsxio_read.c) + TARGET_LINK_LIBRARIES(example_xlsxio_read xlsxio_read_${EXELINKTYPE}) +- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read) ++ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read) + + ADD_EXECUTABLE(example_xlsxio_read_advanced examples/example_xlsxio_read_advanced.c) + TARGET_LINK_LIBRARIES(example_xlsxio_read_advanced xlsxio_read_${EXELINKTYPE}) +- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_read_advanced) ++ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_read_advanced) + + IF(WITH_WIDE) + ADD_EXECUTABLE(example_xlsxio_readw examples/example_xlsxio_read.c) + SET_TARGET_PROPERTIES(example_xlsxio_readw PROPERTIES COMPILE_DEFINITIONS "XML_UNICODE") + TARGET_LINK_LIBRARIES(example_xlsxio_readw xlsxio_readw_${EXELINKTYPE}) +- SET(ALLTARGETS ${ALLTARGETS} example_xlsxio_readw) ++ SET(ALLTARGETS_EXE ${ALLTARGETS_EXE} example_xlsxio_readw) + ENDIF() + ENDIF() + +@@ -200,7 +201,43 @@ IF(BUILD_DOCUMENTATION) + ENDIF() + + # installation specifications +-INSTALL(TARGETS ${ALLTARGETS} ++INSTALL(TARGETS ${ALLTARGETS_LIB} ++ EXPORT xlsxioTargets ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++) ++INSTALL(EXPORT xlsxioTargets ++ NAMESPACE xlsxio:: ++ DESTINATION cmake ++) ++FILE(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" ++[[INCLUDE(CMakeFindDependencyMacro) ++IF (@WITH_LIBZIP@) ++ FIND_DEPENDENCY(LibZip) ++ELSE() ++ FIND_DEPENDENCY(minizip CONFIG) ++ENDIF() ++IF (@EXPAT_DIR@) ++ FIND_PATH(EXPAT_INCLUDE_DIR NAMES expat.h NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/include ${EXPAT_DIR}) ++ FIND_LIBRARY(EXPAT_LIBRARIES NAMES expat libexpat NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) ++ELSE() ++ FIND_DEPENDENCY(EXPAT) ++ENDIF() ++ ++IF(@WITH_WIDE@) ++ IF(@EXPAT_DIR@) ++ FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw libexpatw NO_DEFAULT_PATH PATHS ${EXPAT_DIR}/lib ${EXPAT_DIR}) ++ ELSE() ++ FIND_LIBRARY(EXPATW_LIBRARIES NAMES expatw) ++ ENDIF() ++ENDIF() ++INCLUDE("${CMAKE_CURRENT_LIST_DIR}/xlsxioTargets.cmake") ++]]) ++CONFIGURE_FILE("${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" @ONLY) ++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/xlsxio-config.cmake" DESTINATION cmake) ++ ++INSTALL(TARGETS ${ALLTARGETS_EXE} + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin diff --git a/ports/xlsxio/portfile.cmake b/ports/xlsxio/portfile.cmake index 74b004755dc9da..7d7915e9c361c4 100644 --- a/ports/xlsxio/portfile.cmake +++ b/ports/xlsxio/portfile.cmake @@ -4,10 +4,12 @@ vcpkg_from_github( REF e3acace39e5fb153f5ce3500a4952c2bf93175bd SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea HEAD_REF master - PATCHES fix-dependencies.patch + PATCHES + fix-dependencies.patch + export-targets.patch # https://github.com/brechtsanders/xlsxio/pull/105 ) -file(REMOVE ${SOURCE_PATH}/CMake/FindMinizip.cmake) +file(REMOVE "${SOURCE_PATH}/CMake/FindMinizip.cmake") vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -15,17 +17,11 @@ vcpkg_check_features( libzip WITH_LIBZIP ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(BUILD_STATIC ON) - set(BUILD_SHARED OFF) -else() - set(BUILD_SHARED ON) - set(BUILD_STATIC OFF) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DBUILD_SHARED=${BUILD_SHARED} @@ -37,10 +33,12 @@ vcpkg_configure_cmake( -DBUILD_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xlsxio/vcpkg.json b/ports/xlsxio/vcpkg.json index bc61d92e4176c8..376964779ed258 100644 --- a/ports/xlsxio/vcpkg.json +++ b/ports/xlsxio/vcpkg.json @@ -1,8 +1,10 @@ { "name": "xlsxio", "version-date": "2021-03-24", + "port-version": 1, "description": "Cross-platform C library for reading values from and writing values to .xlsx files", "homepage": "https://github.com/brechtsanders/xlsxio", + "license": "MIT", "dependencies": [ "expat", { @@ -10,6 +12,14 @@ "features": [ "bzip2" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 68211605a7bc3a..5111e02480fbcf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7690,7 +7690,7 @@ }, "xlsxio": { "baseline": "2021-03-24", - "port-version": 0 + "port-version": 1 }, "xmlsec": { "baseline": "1.2.34", diff --git a/versions/x-/xlsxio.json b/versions/x-/xlsxio.json index 167faf72b63b99..da0b392025b73f 100644 --- a/versions/x-/xlsxio.json +++ b/versions/x-/xlsxio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b4eb1ccf9e863a9291e03521af9ff4d62f5eb3d", + "version-date": "2021-03-24", + "port-version": 1 + }, { "git-tree": "363ef11ba53c472f8ec8186c455f964b49088d7f", "version-date": "2021-03-24", From 944c880fcbeaaf41a11f3ed8099f22528b38dbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 6 Jul 2022 20:57:34 +0000 Subject: [PATCH 048/791] [yasm] Fix supports expression value (#25573) * [yasm] Fix support expression value * typo * version * Add license * version * fix arm crossbuild * version * Fix install build tools * version --- ports/yasm/fix-arm-cross-build.patch | 94 ++++++++++++++++++++++++++++ ports/yasm/portfile.cmake | 21 ++++++- ports/yasm/vcpkg.json | 11 +++- versions/baseline.json | 2 +- versions/y-/yasm.json | 5 ++ 5 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 ports/yasm/fix-arm-cross-build.patch diff --git a/ports/yasm/fix-arm-cross-build.patch b/ports/yasm/fix-arm-cross-build.patch new file mode 100644 index 00000000000000..cfc8dfdde6a6c8 --- /dev/null +++ b/ports/yasm/fix-arm-cross-build.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/modules/YasmMacros.cmake b/cmake/modules/YasmMacros.cmake +index ab1be00..918f51b 100644 +--- a/cmake/modules/YasmMacros.cmake ++++ b/cmake/modules/YasmMacros.cmake +@@ -58,7 +58,9 @@ macro (YASM_ADD_MODULE _module_NAME) + endmacro (YASM_ADD_MODULE) + + macro (YASM_GENPERF _in_NAME _out_NAME) ++ if (NOT _tmp_GENPERF_EXE) + get_target_property(_tmp_GENPERF_EXE genperf LOCATION) ++ endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_GENPERF_EXE} ${_in_NAME} ${_out_NAME} +@@ -68,7 +70,9 @@ macro (YASM_GENPERF _in_NAME _out_NAME) + endmacro (YASM_GENPERF) + + macro (YASM_RE2C _in_NAME _out_NAME) ++ if (NOT _tmp_RE2C_EXE) + get_target_property(_tmp_RE2C_EXE re2c LOCATION) ++ endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_RE2C_EXE} ${ARGN} -o ${_out_NAME} ${_in_NAME} +@@ -78,7 +82,9 @@ macro (YASM_RE2C _in_NAME _out_NAME) + endmacro (YASM_RE2C) + + macro (YASM_GENMACRO _in_NAME _out_NAME _var_NAME) ++ if (NOT _tmp_GENMACRO_EXE) + get_target_property(_tmp_GENMACRO_EXE genmacro LOCATION) ++ endif() + add_custom_command( + OUTPUT ${_out_NAME} + COMMAND ${_tmp_GENMACRO_EXE} ${_out_NAME} ${_var_NAME} ${_in_NAME} +diff --git a/modules/preprocs/nasm/CMakeLists.txt b/modules/preprocs/nasm/CMakeLists.txt +index e10a9dd..e28ffbb 100644 +--- a/modules/preprocs/nasm/CMakeLists.txt ++++ b/modules/preprocs/nasm/CMakeLists.txt +@@ -1,5 +1,8 @@ ++if (NOT _tmp_GENVERSION_EXE) + add_executable(genversion preprocs/nasm/genversion.c) ++install(TARGETS genversion RUNTIME DESTINATION bin) + get_target_property(_tmp_GENVERSION_EXE genversion LOCATION) ++endif() + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version.mac + COMMAND ${_tmp_GENVERSION_EXE} ${CMAKE_CURRENT_BINARY_DIR}/version.mac +diff --git a/tools/genmacro/CMakeLists.txt b/tools/genmacro/CMakeLists.txt +index 27ba599..0168494 100644 +--- a/tools/genmacro/CMakeLists.txt ++++ b/tools/genmacro/CMakeLists.txt +@@ -1,3 +1,7 @@ ++if (NOT _tmp_GENMACRO_EXE) + add_executable(genmacro + genmacro.c + ) ++ ++install(TARGETS genmacro RUNTIME DESTINATION bin) ++endif() +\ No newline at end of file +diff --git a/tools/genperf/CMakeLists.txt b/tools/genperf/CMakeLists.txt +index 6f50989..87d19bc 100644 +--- a/tools/genperf/CMakeLists.txt ++++ b/tools/genperf/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if (NOT _tmp_GENPERF_EXE) + add_executable(genperf + genperf.c + perfect.c +@@ -6,3 +7,6 @@ add_executable(genperf + ../../libyasm/xstrdup.c + ) + set_target_properties(genperf PROPERTIES COMPILE_FLAGS -DYASM_LIB_DECL=) ++ ++install(TARGETS genperf RUNTIME DESTINATION bin) ++endif() +\ No newline at end of file +diff --git a/tools/re2c/CMakeLists.txt b/tools/re2c/CMakeLists.txt +index 7125d49..f2f1a40 100644 +--- a/tools/re2c/CMakeLists.txt ++++ b/tools/re2c/CMakeLists.txt +@@ -1,3 +1,4 @@ ++if (NOT _tmp_RE2C_EXE) + add_executable(re2c + main.c + code.c +@@ -9,3 +10,6 @@ add_executable(re2c + substr.c + translate.c + ) ++ ++install(TARGETS re2c RUNTIME DESTINATION bin) ++endif() +\ No newline at end of file diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 37a891dc09e6af..4a69f7c24f188e 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF 009450c7ad4d425fa5a10ac4bd6efbd25248d823 # 1.3.0 plus bugfixes for https://github.com/yasm/yasm/issues/153 SHA512 a542577558676d11b52981925ea6219bffe699faa1682c033b33b7534f5a0dfe9f29c56b32076b68c48f65e0aef7c451be3a3af804c52caa4d4357de4caad83c HEAD_REF master - PATCHES add-feature-tools.patch + PATCHES + add-feature-tools.patch + fix-arm-cross-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -16,10 +18,21 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") +set(HOST_TOOLS_OPTIONS "") +if (VCPKG_CROSSCOMPILING) + list(APPEND HOST_TOOLS_OPTIONS + "-D_tmp_RE2C_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/re2c${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_tmp_GENPERF_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/genperf${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_tmp_GENMACRO_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/genmacro${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-D_tmp_GENVERSION_EXE=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}/genversion${VCPKG_HOST_EXECUTABLE_SUFFIX}" + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + ${HOST_TOOLS_OPTIONS} -DENABLE_NLS=OFF -DYASM_BUILD_TESTS=OFF ) @@ -29,7 +42,11 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() if (BUILD_TOOLS) - vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm AUTO_CLEAN) + set(EXTRA_BUILD_TOOLS "") + if (NOT VCPKG_CROSSCOMPILING) + list(APPEND EXTRA_BUILD_TOOLS re2c genmacro genperf genversion) + endif() + vcpkg_copy_tools(TOOL_NAMES vsyasm yasm ytasm ${EXTRA_BUILD_TOOLS} AUTO_CLEAN) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(COPY "${CURRENT_PACKAGES_DIR}/bin/yasmstd${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json index f78ff774575d80..284d4f5cdf205c 100644 --- a/ports/yasm/vcpkg.json +++ b/ports/yasm/vcpkg.json @@ -1,10 +1,11 @@ { "name": "yasm", "version": "1.3.0", - "port-version": 3, + "port-version": 4, "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", "homepage": "https://github.com/yasm/yasm", - "supports": "windows & !uwp & !arm", + "license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only", + "supports": "!uwp", "dependencies": [ { "name": "vcpkg-cmake", @@ -16,7 +17,11 @@ }, { "name": "yasm", - "host": true + "host": true, + "default-features": false, + "features": [ + "tools" + ] } ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 5111e02480fbcf..f5e6cc8317c0a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7758,7 +7758,7 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 3 + "port-version": 4 }, "yasm-tool": { "baseline": "2021-12-14", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index 8ce7047cc23ea7..3d6a299e3fc517 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "796bb1f691c8ef8b04eb6577e95ab04167470dac", + "version": "1.3.0", + "port-version": 4 + }, { "git-tree": "4368509dc3dfe6cab848b8713b22c9c0ef408527", "version": "1.3.0", From 99021f98b1983da103cf90018bbbe1dda4c87b8a Mon Sep 17 00:00:00 2001 From: Anders Wind Date: Wed, 6 Jul 2022 23:07:55 +0200 Subject: [PATCH 049/791] [isal] Update port (#24777) * Update isalConfig.cmake * Refactor build process * Remove debug/share on non-Windows * Fix build, fix config.cmake, correct usage info * version * Add supports, add license * cleanup baseline * version * update supports * version * Correct include path * version * Fix lib name on non-Windows * version * Apply suggestion * version * Apply suggestions * version * Apply suggestion * version Co-authored-by: JackBoosY --- ports/isal/CMakeLists.txt | 51 ------------------ ports/isal/fix-nmake.patch | 13 +++++ ports/isal/isalConfig.cmake | 82 +++++++++++++++++++++++----- ports/isal/portfile.cmake | 105 +++++++++++++++++++++--------------- ports/isal/usage | 5 +- ports/isal/vcpkg.json | 8 +-- scripts/ci.baseline.txt | 8 --- versions/baseline.json | 2 +- versions/i-/isal.json | 5 ++ 9 files changed, 158 insertions(+), 121 deletions(-) delete mode 100644 ports/isal/CMakeLists.txt create mode 100644 ports/isal/fix-nmake.patch diff --git a/ports/isal/CMakeLists.txt b/ports/isal/CMakeLists.txt deleted file mode 100644 index b479e1522f81b4..00000000000000 --- a/ports/isal/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.9) -PROJECT(isal C) - -IF (SOURCE_PATH) - SET(CMAKE_SOURCE_DIR ${SOURCE_PATH}) -ENDIF () - -INCLUDE(ProcessorCount) -PROCESSORCOUNT(PROCS) - -FIND_PROGRAM(NASM nasm) -IF (NOT NASM) - MESSAGE(FATAL_ERROR "NASM not found") -ENDIF () - -IF (EXEC_ENV STREQUAL "Windows") - FIND_PROGRAM(MAKE nmake) - IF (NOT MAKE) - MESSAGE(FATAL_ERROR "nmake not found") - ENDIF () -ELSEIF(EXEC_ENV STREQUAL "Linux") - FIND_PROGRAM(MAKE make) - IF (NOT MAKE) - MESSAGE(FATAL_ERROR "MAKE not found") - ENDIF () -ENDIF() - -SET(MAKE_FLAGS "-f") - -IF (EXEC_ENV STREQUAL Windows) - STRING(APPEND MAKE_FLAGS " Makefile.nmake /E CC=cl AS=nasm") -ELSEIF (EXEC_ENV STREQUAL Linux) - STRING(APPEND MAKE_FLAGS "Makefile.unx") -ENDIF () - -ADD_CUSTOM_TARGET(isal ALL - COMMAND ${MAKE} ${MAKE_FLAGS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/ - ) - -SET(LIB_PATH ${CMAKE_SOURCE_DIR}/bin/) -IF (LIBRARY_LINKAGE STREQUAL "dynamic") - STRING(APPEND LIB_PATH isal.so) -ELSEIF (LIBRARY_LINKAGE STREQUAL "static") - STRING(APPEND LIB_PATH isa-l.a) -ELSE () - MESSAGE(FATAL_ERROR "Unknown linkage type ${LIBRARY_LINKAGE}") -ENDIF () -INSTALL(FILES ${LIB_PATH} - DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/lib/) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include DESTINATION ${CMAKE_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/) \ No newline at end of file diff --git a/ports/isal/fix-nmake.patch b/ports/isal/fix-nmake.patch new file mode 100644 index 00000000000000..ba10a66e7a6211 --- /dev/null +++ b/ports/isal/fix-nmake.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.nmake b/Makefile.nmake +index 56ae888..7260785 100644 +--- a/Makefile.nmake ++++ b/Makefile.nmake +@@ -143,7 +143,7 @@ objs = \ + + INCLUDES = -I./ -Ierasure_code/ -Iraid/ -Icrc/ -Iigzip/ -Iinclude/ -Imem/ + LINKFLAGS = /nologo +-CFLAGS = -O2 -D NDEBUG /nologo -D_USE_MATH_DEFINES -Qstd=c99 $(INCLUDES) $(D) ++CFLAGS = /nologo -D_USE_MATH_DEFINES -Qstd=c99 $(INCLUDES) $(D) + AFLAGS = -f win64 $(INCLUDES) $(D) + CC = icl + AS = yasm diff --git a/ports/isal/isalConfig.cmake b/ports/isal/isalConfig.cmake index 3348ec434f6b7d..465bbea88f40ad 100644 --- a/ports/isal/isalConfig.cmake +++ b/ports/isal/isalConfig.cmake @@ -1,17 +1,73 @@ -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 +function(set_library_target) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAMESPACE;LIB_NAME;DEBUG_STATIC;RELEASE_STATIC;DEBUG_DYNAMIC;RELEASE_DYNAMIC;INCLUDE_DIR;TYPE" "") + + if (arg_DEBUG_DYNAMIC) + set(ISAL_PROPERTIES IMPORTED_LOCATION_DEBUG "${arg_DEBUG_DYNAMIC}" IMPORTED_IMPLIB_DEBUG "${arg_DEBUG_STATIC}") + else() + set(ISAL_PROPERTIES IMPORTED_LOCATION_DEBUG "${arg_DEBUG_STATIC}") + endif() + + if (arg_RELEASE_DYNAMIC) + set(ISAL_PROPERTIES IMPORTED_LOCATION_RELEASE "${arg_RELEASE_DYNAMIC}" IMPORTED_IMPLIB_DEBUG "${arg_RELEASE_STATIC}") + else() + set(ISAL_PROPERTIES IMPORTED_LOCATION_RELEASE "${arg_RELEASE_STATIC}") + endif() + + add_library(${arg_NAMESPACE}::${arg_LIB_NAME} ${arg_TYPE} IMPORTED) + set_target_properties(${arg_NAMESPACE}::${arg_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() + ${ISAL_PROPERTIES} + INTERFACE_INCLUDE_DIRECTORIES "${arg_INCLUDE_DIR}" + ) -GET_FILENAME_COMPONENT(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) -GET_FILENAME_COMPONENT(ROOT "${ROOT}" PATH) + set(${NAMESPACE}_${LIB_NAME}_FOUND 1) +endfunction() -SET_LIBRARY_TARGET("ISAL" "isal" "${ROOT}/debug/lib/isa-l.a" "${ROOT}/lib/isa-l.a" "${ROOT}/include/isal") +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + +if (WIN32) + if ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set_library_target( + NAMESPACE "ISAL" + LIB_NAME "isa-l" + DEBUG_STATIC "${_IMPORT_PREFIX}/debug/lib/isa-l_static.lib" + RELEASE_STATIC "${_IMPORT_PREFIX}/lib/isa-l_static.lib" + INCLUDE_DIR "${_IMPORT_PREFIX}/include/isal" + TYPE STATIC + ) + else() + set_library_target( + NAMESPACE "ISAL" + LIB_NAME "isal" + DEBUG_DYNAMIC "${_IMPORT_PREFIX}/debug/bin/isa-l.dll" + RELEASE_DYNAMIC "${_IMPORT_PREFIX}/bin/isa-l.dll" + DEBUG_STATIC "${_IMPORT_PREFIX}/debug/lib/isa-l.lib" + RELEASE_STATIC "${_IMPORT_PREFIX}/lib/isa-l.lib" + INCLUDE_DIR "${_IMPORT_PREFIX}/include/isal" + TYPE SHARED + ) + endif() +else() + if ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set_library_target( + NAMESPACE "ISAL" + LIB_NAME "isa-l" + DEBUG_STATIC "${_IMPORT_PREFIX}/debug/lib/libisal.a" + RELEASE_STATIC "${_IMPORT_PREFIX}/lib/libisal.a" + INCLUDE_DIR "${_IMPORT_PREFIX}/include" + TYPE STATIC + ) + else() + set_library_target( + NAMESPACE "ISAL" + LIB_NAME "isal" + DEBUG_DYNAMIC "${_IMPORT_PREFIX}/debug/lib/libisal.so" + RELEASE_DYNAMIC "${_IMPORT_PREFIX}/lib/libisal.so" + INCLUDE_DIR "${_IMPORT_PREFIX}/include" + TYPE SHARED + ) + endif() +endif() diff --git a/ports/isal/portfile.cmake b/ports/isal/portfile.cmake index 0703b724697ffe..833338019979b1 100644 --- a/ports/isal/portfile.cmake +++ b/ports/isal/portfile.cmake @@ -1,46 +1,67 @@ -IF (NOT VCPKG_CMAKE_SYSTEM_NAME) - SET(EXEC_ENV "Windows") -ELSE () - SET(EXEC_ENV "${VCPKG_CMAKE_SYSTEM_NAME}") -ENDIF () - -IF (NOT EXEC_ENV STREQUAL "Linux") - MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports Linux platforms") - MESSAGE(STATUS "Well, it is not true, but I didnt manage to get it working on Windows") -ENDIF () - -IF (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - MESSAGE(FATAL_ERROR "Intel(R) Intelligent Storage Acceleration Library currently only supports x64 architecture") -ELSEIF (NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - MESSAGE(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -ENDIF () - -VCPKG_FROM_GITHUB( - OUT_SOURCE_PATH SOURCE_PATH - REPO 01org/isa-l - REF v2.25.0 - SHA512 aa556c8ba26b4637493b3de50a23636668bcfd71249029c52fe6983d0bcf120d1b91f39aaa259cb58e59448d401366f3bfaaee24609db7e6a1cd3fdf1a953efe - HEAD_REF master +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO 01org/isa-l + REF v2.25.0 + SHA512 aa556c8ba26b4637493b3de50a23636668bcfd71249029c52fe6983d0bcf120d1b91f39aaa259cb58e59448d401366f3bfaaee24609db7e6a1cd3fdf1a953efe + HEAD_REF master + PATCHES fix-nmake.patch ) -VCPKG_FIND_ACQUIRE_PROGRAM(NASM) -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:STRING=${EXEC_ENV} - -DLIBRARY_LINKAGE:STRING=${VCPKG_LIBRARY_LINKAGE} -) +vcpkg_find_acquire_program(YASM) +get_filename_component(YASM_PATH ${YASM} DIRECTORY) +vcpkg_add_to_path("${YASM_PATH}") + +vcpkg_find_acquire_program(NASM) +get_filename_component(NASM_PATH ${NASM} DIRECTORY) +vcpkg_add_to_path("${NASM_PATH}") + +if (VCPKG_TARGET_IS_WINDOWS) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(NMAKE_TARGET dll) + else() + set(NMAKE_TARGET static) + endif() + + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_NAME Makefile.nmake + TARGET ${NMAKE_TARGET} + OPTIONS CC=cl + ) + + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(NMAKE_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + endif() + + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(NMAKE_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + else() + file(INSTALL "${NMAKE_BINARY_DIR}/isa-l_static.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + endif() + + file(GLOB ISAL_HDRS "${SOURCE_PATH}/include/*") + file(INSTALL ${ISAL_HDRS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/isal") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/isa-l.def" DESTINATION "${CURRENT_PACKAGES_DIR}/include/isal") +else() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + ) -VCPKG_INSTALL_CMAKE() + vcpkg_install_make() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() -FILE(INSTALL ${SOURCE_PATH}/Release/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -FILE(INSTALL ${SOURCE_PATH}/Debug/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -FILE(INSTALL ${SOURCE_PATH}/Release/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/isalConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/isalConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/isalConfig.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/ports/isal/usage b/ports/isal/usage index 23870b20f799e0..befe62e9f0dfa0 100644 --- a/ports/isal/usage +++ b/ports/isal/usage @@ -1,5 +1,4 @@ The package isal is compatible with built-in CMake targets: - FIND_PACKAGE(isal REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE ISAL::isa-l) for static linkage or - TARGET_LINK_LIBRARIES(main PRIVATE ISAL::isal) for dynamic linkage + find_package(isal CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,ISAL::isa-l,ISAL::isal>) diff --git a/ports/isal/vcpkg.json b/ports/isal/vcpkg.json index 7a18c00957096e..be4dfa9fe555a0 100644 --- a/ports/isal/vcpkg.json +++ b/ports/isal/vcpkg.json @@ -1,6 +1,8 @@ { "name": "isal", - "version-string": "2.25.0", - "port-version": 1, - "description": "Intel(R) Intelligent Storage Acceleration Library" + "version": "2.25.0", + "port-version": 2, + "description": "Intel(R) Intelligent Storage Acceleration Library", + "license": "BSD-3-Clause", + "supports": "!(x86 | arm | uwp | osx)" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5eff1128380d36..31fa7eca7c802c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -364,14 +364,6 @@ intel-mkl:x86-windows=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail irrlicht:x64-uwp=fail -isal:arm64-windows=fail -isal:arm-uwp=fail -isal:x64-osx=fail -isal:x64-uwp=fail -isal:x64-windows=fail -isal:x64-windows-static=fail -isal:x64-windows-static-md=fail -isal:x86-windows=fail jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail jemalloc:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index f5e6cc8317c0a3..9f09ac9948adc8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3030,7 +3030,7 @@ }, "isal": { "baseline": "2.25.0", - "port-version": 1 + "port-version": 2 }, "ismrmrd": { "baseline": "1.5.0", diff --git a/versions/i-/isal.json b/versions/i-/isal.json index bb1ef772d5813c..3320325025e5c2 100644 --- a/versions/i-/isal.json +++ b/versions/i-/isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "121b0c9241ea1f704bf6cb9ad5f010f6ae732dd0", + "version": "2.25.0", + "port-version": 2 + }, { "git-tree": "35b65a5fbb2ff6cd6468e1c02565a4b999d2a442", "version-string": "2.25.0", From 5a8ff0088a081449977eff98147581e660908eb6 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Jul 2022 23:30:42 +0200 Subject: [PATCH 050/791] [libxml2,libxslt] Revise dependency handling (#24935) * Update mingw support expressions * Update versions * Use pkg-config for complete libgcrypt dependencies * Remove crypto from default features Align with CMake build system defaults. * Drop unused liblzma dependency * Update versions * Skip installation of docs * Update versions * Restructure patches * Update versions * CI [skip actions] * Revise libxml2 wrapper * Omit CONFIG from find_package(LibXml2) * Test libxml2 with, and fix for, CMake 3.7 * Update versions * More libxml2 wrapper changes * libxslt gcrypt variable name changes * Install usage * Trim portfile * [openscap] Use vcpkg pkg-config database * [openscap] Unbreak find_package(Threads) * Update versions * Update CI baseline * REQUIRED is a literal * Update versions * Always load libxml2 config instead of find module [skip actions] * [libxmlmm] Fix linking to libxml2 libxml2 needs iconv include dir on Windows. * [libxmlmm] License field and processing * [libxmlmm] Export unofficial CMake config * [libxmlmm] Change target prefix, not global default * Revert cmake-user changes * Set LIBXML2_FOUND * Update versions * Fix xslt-config * Update versions * Adjust tidy-html5 * Update versions Co-authored-by: Billy Robert O'Neal III --- ports/libxml2/portfile.cmake | 8 +-- ports/libxml2/usage | 2 +- ports/libxml2/vcpkg-cmake-wrapper.cmake | 52 ++----------------- ports/libxml2/vcpkg.json | 1 + ports/libxmlmm/CMakeLists.txt | 15 +++--- ports/libxmlmm/portfile.cmake | 8 ++- .../libxmlmm/unofficial-libxmlmm-config.cmake | 3 ++ ports/libxmlmm/vcpkg.json | 7 ++- ports/libxslt/cmake.patch | 50 ------------------ ports/libxslt/fix-gcrypt-deps.patch | 45 ++++++++++++++++ ports/libxslt/libexslt-pkgconfig.patch | 14 +++++ ports/libxslt/msvc-no-suffix.patch | 22 ++++++++ ports/libxslt/portfile.cmake | 49 ++++++++--------- ports/libxslt/python3.patch | 16 ++++++ ports/libxslt/skip-install-docs.patch | 17 ++++++ ports/libxslt/usage | 12 +++++ ports/libxslt/vcpkg.json | 23 ++------ ports/openscap/fix-build.patch | 2 +- ports/openscap/portfile.cmake | 2 + ports/openscap/vcpkg.json | 4 +- ports/tidy-html5/portfile.cmake | 2 +- ports/tidy-html5/vcpkg.json | 2 +- scripts/ci.baseline.txt | 1 - versions/baseline.json | 10 ++-- versions/l-/libxml2.json | 5 ++ versions/l-/libxmlmm.json | 5 ++ versions/l-/libxslt.json | 5 ++ versions/o-/openscap.json | 5 ++ versions/t-/tidy-html5.json | 5 ++ 29 files changed, 222 insertions(+), 170 deletions(-) create mode 100644 ports/libxmlmm/unofficial-libxmlmm-config.cmake delete mode 100644 ports/libxslt/cmake.patch create mode 100644 ports/libxslt/fix-gcrypt-deps.patch create mode 100644 ports/libxslt/libexslt-pkgconfig.patch create mode 100644 ports/libxslt/msvc-no-suffix.patch create mode 100644 ports/libxslt/python3.patch create mode 100644 ports/libxslt/skip-install-docs.patch create mode 100644 ports/libxslt/usage diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index a9e869bd92f3b5..2a7dd29fa304cf 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -69,8 +69,6 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) - if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN) endif() @@ -91,5 +89,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +) file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxml2/usage b/ports/libxml2/usage index c77cdbce5dd551..c7a4878e9b9601 100644 --- a/ports/libxml2/usage +++ b/ports/libxml2/usage @@ -1,4 +1,4 @@ The package libxml2 is compatible with built-in CMake targets: - find_package(LibXml2 CONFIG REQUIRED) + find_package(LibXml2 REQUIRED) target_link_libraries(main PRIVATE LibXml2::LibXml2) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index dede4c83166e74..705f22c6a35d69 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -1,49 +1,3 @@ -_find_package(${ARGS}) -if(LibXml2_FOUND) - list(APPEND LIBXML2_INCLUDE_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") - list(APPEND LIBXML2_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") # This is wrong but downstream doesn't correctly use _DIR vs _DIRS variables - if(TARGET LibXml2::LibXml2) - target_include_directories(LibXml2::LibXml2 INTERFACE "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") - endif() -endif() -if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0}_CONFIG) - find_package(LibLZMA) - find_package(ZLIB) - find_package(Iconv) - include(SelectLibraryConfigurations) - find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) - find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - unset(LIBXML2_LIBRARIES) - unset(LIBXML2_LIBRARY CACHE) - select_library_configurations(LIBXML2) - list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) - if(Iconv_LIBRARIES) - list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) - endif() - if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_RELEASE) - set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBXML2_LIBRARY_RELEASE}") - endif() - if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_DEBUG) - set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBXML2_LIBRARY_DEBUG}") - endif() - cmake_policy(PUSH) - cmake_policy(SET CMP0079 NEW) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - list(APPEND LIBXML2_LIBRARIES m) - if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "m") - endif() - elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") - list(APPEND LIBXML2_LIBRARIES ws2_32) - if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ws2_32") - endif() - endif() - if(TARGET LibXml2::LibXml2) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "LibLZMA::LibLZMA" "ZLIB::ZLIB") - if(TARGET Iconv::Iconv) - set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Iconv::Iconv") - endif() - endif() - cmake_policy(POP) -endif() +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +_find_package(${ARGS} CONFIG) +set(LIBXML2_FOUND "${LibXml2_FOUND}") # fphsa compatibility diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 117810665d3195..752c331adbbffa 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxml2", "version": "2.9.14", + "port-version": 1, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "license": "MIT", diff --git a/ports/libxmlmm/CMakeLists.txt b/ports/libxmlmm/CMakeLists.txt index 721641a64be0bc..e423c6df73bd53 100644 --- a/ports/libxmlmm/CMakeLists.txt +++ b/ports/libxmlmm/CMakeLists.txt @@ -1,9 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(libxmlmm CXX) -set(CMAKE_SHARED_LIBRARY_PREFIX) -set(CMAKE_STATIC_LIBRARY_PREFIX) - find_package(LibXml2 REQUIRED) set(HEADERS_LIBXMLMM @@ -38,22 +35,26 @@ set(SOURCES_LIBXMLMM ) add_library(libxmlmm ${SOURCES_LIBXMLMM}) -include_directories(${LIBXML2_INCLUDE_DIR}) -target_link_libraries (libxmlmm ${LIBXML2_LIBRARIES}) +target_link_libraries (libxmlmm PUBLIC LibXml2::LibXml2) set_target_properties(libxmlmm PROPERTIES CXX_STANDARD 17 PUBLIC_HEADER "${HEADERS_LIBXMLMM}" + PREFIX "" ) target_include_directories(libxmlmm PUBLIC $ $) -install(TARGETS ${PROJECT_NAME} - EXPORT litehtmlTargets +install(TARGETS libxmlmm + EXPORT unofficial-libxmlmm-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/libxmlmm ) +install(EXPORT unofficial-libxmlmm-targets + NAMESPACE unofficial::libxmlmm:: + DESTINATION share/unofficial-libxmlmm +) diff --git a/ports/libxmlmm/portfile.cmake b/ports/libxmlmm/portfile.cmake index 24ff58d0e0be6b..b676af2f1254ed 100644 --- a/ports/libxmlmm/portfile.cmake +++ b/ports/libxmlmm/portfile.cmake @@ -16,7 +16,11 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unofficial-libxmlmm-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-libxmlmm") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libxmlmm) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(READ "${SOURCE_PATH}/README.md" readme) +string(REGEX REPLACE "^.*## Copying\n" "" copyright "${readme}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${copyright}") diff --git a/ports/libxmlmm/unofficial-libxmlmm-config.cmake b/ports/libxmlmm/unofficial-libxmlmm-config.cmake new file mode 100644 index 00000000000000..16a46deec0858a --- /dev/null +++ b/ports/libxmlmm/unofficial-libxmlmm-config.cmake @@ -0,0 +1,3 @@ +include(CMakeFindDependencyMacro) +find_dependency(LibXml2) +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libxmlmm-config.cmake") diff --git a/ports/libxmlmm/vcpkg.json b/ports/libxmlmm/vcpkg.json index b4469246a606a8..2de6d14465d372 100644 --- a/ports/libxmlmm/vcpkg.json +++ b/ports/libxmlmm/vcpkg.json @@ -1,14 +1,19 @@ { "name": "libxmlmm", "version": "0.6.0", - "port-version": 2, + "port-version": 3, "description": "Libxmlmm is a C++ wrapper for libxml 2.0 that only relies on standard C++ and libxml2.", "homepage": "https://github.com/rioki/libxmlmm", + "license": "MIT", "dependencies": [ "libxml2", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/libxslt/cmake.patch b/ports/libxslt/cmake.patch deleted file mode 100644 index 71655e166b8166..00000000000000 --- a/ports/libxslt/cmake.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d8679fb7f..ca21a7a3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,10 +36,10 @@ if(LIBXSLT_WITH_PYTHON) - if(HAVE_UNISTD_H AND HAVE_F_GETFL) - find_package(Python COMPONENTS Interpreter Development REQUIRED) - else() -- find_package(Python2 COMPONENTS Interpreter Development REQUIRED) -- add_library(Python::Python ALIAS Python2::Python) -- set(Python_EXECUTABLE ${Python2_EXECUTABLE}) -- set(Python_SITEARCH ${Python2_SITEARCH}) -+ find_package(Python3 COMPONENTS Interpreter Development REQUIRED) -+ add_library(Python::Python ALIAS Python3::Python) -+ set(Python_EXECUTABLE ${Python3_EXECUTABLE}) -+ set(Python_SITEARCH ${Python3_SITEARCH}) - endif() - set(LIBXSLT_PYTHON_INSTALL_DIR ${Python_SITEARCH} CACHE PATH "Python bindings install directory") - endif() -@@ -244,7 +244,7 @@ set_target_properties( - VERSION ${PROJECT_VERSION} - ) - --if(MSVC) -+if(0) # Never add suffixes which are not added by the autotools build or the nmake makefiles - if(BUILD_SHARED_LIBS) - set_target_properties( - LibXslt -@@ -327,7 +327,7 @@ set_target_properties( - VERSION ${LIBEXSLT_VERSION} - ) - --if(MSVC) -+if(0) # same reason as above - if(BUILD_SHARED_LIBS) - set_target_properties( - LibExslt -diff --git a/libexslt.pc.in b/libexslt.pc.in -index 1d605639a..c3a1edb00 100644 ---- a/libexslt.pc.in -+++ b/libexslt.pc.in -@@ -7,7 +7,7 @@ includedir=@includedir@ - Name: libexslt - Version: @LIBEXSLT_VERSION@ - Description: EXSLT Extension library --Requires: libxml-2.0, libxslt -+Requires: libxml-2.0 libxslt - Cflags: @EXSLT_INCLUDEDIR@ - Libs: @EXSLT_LIBDIR@ -lexslt - Libs.private: @EXSLT_PRIVATE_LIBS@ diff --git a/ports/libxslt/fix-gcrypt-deps.patch b/ports/libxslt/fix-gcrypt-deps.patch new file mode 100644 index 00000000000000..681e15cf843434 --- /dev/null +++ b/ports/libxslt/fix-gcrypt-deps.patch @@ -0,0 +1,45 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6dc6501..d36a049 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -317,7 +317,9 @@ target_include_directories( + + if(LIBXSLT_WITH_CRYPTO) + target_link_libraries(LibExslt PRIVATE Gcrypt::Gcrypt) +- set(LIBGCRYPT_LIBS "-lgcrypt") ++ # For libexslt.pc ++ set(LIBGCRYPT_LIBS "") ++ string(APPEND EXSLT_PRIVATE_REQUIRES " libgcrypt") + endif() + + target_link_libraries(LibExslt PUBLIC LibXslt LibXml2::LibXml2) +diff --git a/FindGcrypt.cmake b/FindGcrypt.cmake +index 781113d..a78fa84 100644 +--- a/FindGcrypt.cmake ++++ b/FindGcrypt.cmake +@@ -1,3 +1,20 @@ ++cmake_policy(PUSH) ++cmake_policy(SET CMP0012 NEW) ++cmake_policy(SET CMP0057 NEW) ++find_package(PkgConfig) ++if("REQUIRED" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) ++ pkg_check_modules(libxslt_gcrypt REQUIRED IMPORTED_TARGET libgcrypt) ++else() ++ pkg_check_modules(libxslt_gcrypt IMPORTED_TARGET libgcrypt) ++endif() ++set(Gcrypt_FOUND "${libxslt_gcrypt_FOUND}") # CMake standard, needed for find_dependency ++set(GCRYPT_FOUND "${libxslt_gcrypt_FOUND}") # libxslt usage ++if(libxslt_gcrypt_FOUND AND NOT TARGET Gcrypt::Gcrypt) ++ add_library(Gcrypt::Gcrypt INTERFACE IMPORTED) ++ set_target_properties(Gcrypt::Gcrypt PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::libxslt_gcrypt) ++endif() ++cmake_policy(POP) ++if(0) + include(FindPackageHandleStandardArgs) + include(SelectLibraryConfigurations) + +@@ -38,3 +53,4 @@ if(GCRYPT_FOUND AND NOT TARGET Gcrypt::Gcrypt) + INTERFACE_INCLUDE_DIRECTORIES "${GCRYPT_INCLUDE_DIRS}" + ) + endif() ++endif() diff --git a/ports/libxslt/libexslt-pkgconfig.patch b/ports/libxslt/libexslt-pkgconfig.patch new file mode 100644 index 00000000000000..b500a8108ca906 --- /dev/null +++ b/ports/libxslt/libexslt-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/libexslt.pc.in b/libexslt.pc.in +index 1d60563..50089e8 100644 +--- a/libexslt.pc.in ++++ b/libexslt.pc.in +@@ -7,7 +7,8 @@ includedir=@includedir@ + Name: libexslt + Version: @LIBEXSLT_VERSION@ + Description: EXSLT Extension library +-Requires: libxml-2.0, libxslt ++Requires: libxslt ++Requires.private: @EXSLT_PRIVATE_REQUIRES@ + Cflags: @EXSLT_INCLUDEDIR@ + Libs: @EXSLT_LIBDIR@ -lexslt + Libs.private: @EXSLT_PRIVATE_LIBS@ diff --git a/ports/libxslt/msvc-no-suffix.patch b/ports/libxslt/msvc-no-suffix.patch new file mode 100644 index 00000000000000..243687fc579404 --- /dev/null +++ b/ports/libxslt/msvc-no-suffix.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8679fb..6dc6501 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,7 +249,7 @@ set_target_properties( + VERSION ${PROJECT_VERSION} + ) + +-if(MSVC) ++if(0) # Never add suffixes which are not added by the autotools build or the nmake makefiles + if(BUILD_SHARED_LIBS) + set_target_properties( + LibXslt +@@ -327,7 +332,7 @@ set_target_properties( + VERSION ${LIBEXSLT_VERSION} + ) + +-if(MSVC) ++if(0) # same reason as above + if(BUILD_SHARED_LIBS) + set_target_properties( + LibExslt diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 7b94c792b35d65..1320051ab9e510 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -1,14 +1,15 @@ -# Get this value from configure.ac:21 -set(LIBEXSLT_VERSION 0.8.20) -set(VERSION 1.1.35) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxslt - REF v${VERSION} + REF v1.1.35 SHA512 1ab264a8d3996d74a89a22e4062950ef968b9252736e0b5f975e6f45d63a6484993fe383b85831cef0e4b9c9c90f9b2b3d5432c15ee9381dbaeb2fa681ab9b46 HEAD_REF master PATCHES - cmake.patch + python3.patch + msvc-no-suffix.patch + libexslt-pkgconfig.patch + fix-gcrypt-deps.patch + skip-install-docs.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -40,17 +41,19 @@ vcpkg_cmake_configure( -DLIBXSLT_WITH_DEBUGGER:BOOL=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}-${VERSION}") +file(GLOB config_path RELATIVE "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}/lib/cmake/libxslt-*") +vcpkg_cmake_config_fixup(CONFIG_PATH "${config_path}") file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/bin") -file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../.."; pwd -P)]]) if(NOT VCPKG_BUILD_TYPE) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/xslt-config" "${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[$(cd "$(dirname "$0")"; pwd -P)/..]] [[$(cd "$(dirname "$0")/../../../debug"; pwd -P)]]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/xslt-config" [[${prefix}/include]] [[${prefix}/../include]]) endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) @@ -58,26 +61,16 @@ vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# You have to define LIB(E)XSLT_STATIC or not, depending on how you link -file(READ "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" XSLTEXPORTS_H) +set(not_static 1) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "!defined(LIBXSLT_STATIC)" "0" XSLTEXPORTS_H "${XSLTEXPORTS_H}") -else() - string(REPLACE "!defined(LIBXSLT_STATIC)" "1" XSLTEXPORTS_H "${XSLTEXPORTS_H}") + set(not_static 0) endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "${XSLTEXPORTS_H}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "!defined(LIBXSLT_STATIC)" "${not_static}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "!defined(LIBEXSLT_STATIC)" "${not_static}") -file(READ "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" EXSLTEXPORTS_H) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "!defined(LIBEXSLT_STATIC)" "0" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") -else() - string(REPLACE "!defined(LIBEXSLT_STATIC)" "1" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") -endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "${EXSLTEXPORTS_H}") - -# Remove tools and debug include directories file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libxslt") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libxslt") diff --git a/ports/libxslt/python3.patch b/ports/libxslt/python3.patch new file mode 100644 index 00000000000000..fc86d1fc56e8cb --- /dev/null +++ b/ports/libxslt/python3.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8679fb..6dc6501 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,6 +35,11 @@ if(LIBXSLT_WITH_PYTHON) + check_symbol_exists(F_GETFL fcntl.h HAVE_F_GETFL) + if(HAVE_UNISTD_H AND HAVE_F_GETFL) + find_package(Python COMPONENTS Interpreter Development REQUIRED) ++ elseif(1) ++ find_package(Python3 COMPONENTS Interpreter Development REQUIRED) ++ add_library(Python::Python ALIAS Python3::Python) ++ set(Python_EXECUTABLE ${Python3_EXECUTABLE}) ++ set(Python_SITEARCH ${Python3_SITEARCH}) + else() + find_package(Python2 COMPONENTS Interpreter Development REQUIRED) + add_library(Python::Python ALIAS Python2::Python) diff --git a/ports/libxslt/skip-install-docs.patch b/ports/libxslt/skip-install-docs.patch new file mode 100644 index 00000000000000..542cae3b803e19 --- /dev/null +++ b/ports/libxslt/skip-install-docs.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6dc6501..d36a049 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -432,10 +434,12 @@ if(LIBXSLT_WITH_PYTHON) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxslt.py DESTINATION ${LIBXSLT_PYTHON_INSTALL_DIR} COMPONENT runtime) + endif() + ++if(VCPKG_INSTALL_DOCS) + install(FILES libexslt/libexslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) + install(FILES libxslt/libxslt.3 DESTINATION ${CMAKE_INSTALL_MANDIR}/man3 COMPONENT documentation) + install(FILES doc/xsltproc.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT documentation) + install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE) ++endif() + + if(LIBXSLT_WITH_CRYPTO) + install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development) diff --git a/ports/libxslt/usage b/ports/libxslt/usage new file mode 100644 index 00000000000000..91daf3461ce42f --- /dev/null +++ b/ports/libxslt/usage @@ -0,0 +1,12 @@ +The package libxslt is compatible with built-in CMake targets: + + # xslt library + find_package(LibXslt REQUIRED) + target_link_libraries(main PRIVATE LibXslt::LibXslt) + + # exslt library + find_package(LibXslt REQUIRED) + target_link_libraries(main PRIVATE LibXslt::LibExslt) + +In order to use modules, you must set environment variable LIBXSLT_PLUGINS_PATH +at runtime. diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index d40c6928208859..8d63754719027a 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,12 +1,12 @@ { "name": "libxslt", "version": "1.1.35", + "port-version": 1, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, "supports": "!uwp", "dependencies": [ - "liblzma", "libxml2", { "name": "vcpkg-cmake", @@ -23,26 +23,13 @@ "features": { "crypto": { "description": "Build with crypto support", - "supports": "mingw | !windows", + "supports": "!windows", "dependencies": [ - { - "name": "libgcrypt", - "platform": "!mingw" - } + "libgcrypt" ] }, "default-features": { - "description": "default features for the current platform", - "dependencies": [ - { - "name": "libxslt", - "default-features": false, - "features": [ - "crypto" - ], - "platform": "mingw | !windows" - } - ] + "description": "default features for the current platform" }, "plugins": { "description": "(deprecated)", @@ -50,7 +37,7 @@ }, "python": { "description": "Builds with python support", - "supports": "mingw | !windows" + "supports": "!windows" } } } diff --git a/ports/openscap/fix-build.patch b/ports/openscap/fix-build.patch index 57d22946b698ef..e40932ecbe7059 100644 --- a/ports/openscap/fix-build.patch +++ b/ports/openscap/fix-build.patch @@ -27,7 +27,7 @@ index 4de5b57..5f483a3 100644 + check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP) + check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP) +else() -+ set(THREADS_USE_PTHREADS_WIN32 -pthread) ++ find_package(Threads REQUIRED) +endif() + +# OpenSSL diff --git a/ports/openscap/portfile.cmake b/ports/openscap/portfile.cmake index 70f55be56592c9..db1d5e448e3296 100644 --- a/ports/openscap/portfile.cmake +++ b/ports/openscap/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-build.patch ) +file(REMOVE "${SOURCE_PATH}/cmake/FindThreads.cmake") if ("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) @@ -33,6 +34,7 @@ vcpkg_configure_cmake( -DENABLE_OSCAP_UTIL_VM=OFF -DENABLE_OSCAP_UTIL_PODMAN=OFF -DENABLE_OSCAP_UTIL_CHROOT=OFF + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON ) vcpkg_install_cmake() diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json index 3bab620ed2dd74..c75a5d80ac2fa6 100644 --- a/ports/openscap/vcpkg.json +++ b/ports/openscap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openscap", - "version-string": "1.3.1", - "port-version": 1, + "version": "1.3.1", + "port-version": 2, "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", "homepage": "https://github.com/OpenSCAP/openscap", "dependencies": [ diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake index 350d9885967159..40bdbb35c6b944 100644 --- a/ports/tidy-html5/portfile.cmake +++ b/ports/tidy-html5/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_cmake_configure( -DBUILD_SHARED_LIB=OFF -DTIDY_CONSOLE_SHARED=OFF ) -vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt/bin") +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt") vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json index 1c16d8657d1192..40bf229b9244e3 100644 --- a/ports/tidy-html5/vcpkg.json +++ b/ports/tidy-html5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tidy-html5", "version": "5.7.28", - "port-version": 5, + "port-version": 6, "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", "license": null, diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 31fa7eca7c802c..299b8ff4d991b7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -788,7 +788,6 @@ openmesh:arm-uwp=fail openmesh:x64-uwp=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail -openscap:x64-linux=fail openscap:x64-osx=fail openvpn3:x64-osx=fail openvr:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 9f09ac9948adc8..ced03ba0d9e56c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4234,11 +4234,11 @@ }, "libxml2": { "baseline": "2.9.14", - "port-version": 0 + "port-version": 1 }, "libxmlmm": { "baseline": "0.6.0", - "port-version": 2 + "port-version": 3 }, "libxmlpp": { "baseline": "5.0.0", @@ -4250,7 +4250,7 @@ }, "libxslt": { "baseline": "1.1.35", - "port-version": 0 + "port-version": 1 }, "libyaml": { "baseline": "0.2.5", @@ -5222,7 +5222,7 @@ }, "openscap": { "baseline": "1.3.1", - "port-version": 1 + "port-version": 2 }, "openssl": { "baseline": "3.0.4", @@ -7034,7 +7034,7 @@ }, "tidy-html5": { "baseline": "5.7.28", - "port-version": 5 + "port-version": 6 }, "tiff": { "baseline": "4.4.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 0f5e6419aeed72..208073dff56ef8 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1262b96218e08ee3cc877999c759e658cca8273", + "version": "2.9.14", + "port-version": 1 + }, { "git-tree": "454c94726c33c2893c30afbe34243d69dc4d91e0", "version": "2.9.14", diff --git a/versions/l-/libxmlmm.json b/versions/l-/libxmlmm.json index 4a3298fbc8b67a..a002ea62a405c9 100644 --- a/versions/l-/libxmlmm.json +++ b/versions/l-/libxmlmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f54a7f6dadcf5781a5d48d22a113f5f37af0956", + "version": "0.6.0", + "port-version": 3 + }, { "git-tree": "869d2ab96342804f872b8d56ad8ccd5e80b274b6", "version": "0.6.0", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 76b41132300106..86b53c81b5df10 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3febc2931430356214f9a15ec06f7863ad4825d9", + "version": "1.1.35", + "port-version": 1 + }, { "git-tree": "d6fe77f9ea62ee9e22769ffd1ae0f28229df2a50", "version": "1.1.35", diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json index 7a5ee2f30ed460..a91fbc8afa3a75 100644 --- a/versions/o-/openscap.json +++ b/versions/o-/openscap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbc6ed45cdfd68efd53ee939bed2440e2971730f", + "version": "1.3.1", + "port-version": 2 + }, { "git-tree": "ecbc2e72085ae6324948b52314de3b7e701376a5", "version-string": "1.3.1", diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json index 8a48d8d4212b4c..c701d381b4c1fc 100644 --- a/versions/t-/tidy-html5.json +++ b/versions/t-/tidy-html5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e4c85fc988591dc5b25baac22c4e83dde7b7f64", + "version": "5.7.28", + "port-version": 6 + }, { "git-tree": "bf333a8afdee1d7e0129928022e228cc092ed5de", "version": "5.7.28", From 35fb7a05a7d7e387dd9a913118c535911b0cbc7d Mon Sep 17 00:00:00 2001 From: plevy Date: Wed, 6 Jul 2022 17:45:30 -0400 Subject: [PATCH 051/791] [osgearth] Update osgEarth to release 3.3 (#24886) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Updated portfile and patches for the osgEarth 3.3 release * Updated portfile and patches for the osgEarth 3.3 release * Update version database * Update vcpkg.json * added license * re-formatted * re-formmatted again * update port * Update version database * Update versions/baseline.json upstream osgearth changed, set port back to 0 Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * updated version * Update portfile.cmake added cleanup * updated version * Update find-package.patch fix Blosc * Update find-package.patch fix Blosc again * version update * Removed optional dependencies and submodule downloads * update version * Remove downloaded imgui in case it was not cleaned, better comments, and only download imgui if tools enabled * updated version * Update versions/o-/osgearth.json * Update versions/o-/osgearth.json Co-authored-by: Paul Levy Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/osgearth/blend2d-fix.patch | 15 ------- ports/osgearth/find-package.patch | 39 ++++++++++++++++--- ports/osgearth/fix-gcc11-compilation.patch | 38 ------------------ ports/osgearth/osgearth-library-static.patch | 12 ------ ports/osgearth/portfile.cmake | 32 +++++++++++---- ports/osgearth/remove-lerc-gltf.patch | 20 ++++++++++ .../osgearth/use-unofficial-osg-config.patch | 25 ------------ ports/osgearth/vcpkg.json | 8 +++- versions/baseline.json | 4 +- versions/o-/osgearth.json | 5 +++ 10 files changed, 92 insertions(+), 106 deletions(-) delete mode 100644 ports/osgearth/blend2d-fix.patch delete mode 100644 ports/osgearth/fix-gcc11-compilation.patch delete mode 100644 ports/osgearth/osgearth-library-static.patch create mode 100644 ports/osgearth/remove-lerc-gltf.patch delete mode 100644 ports/osgearth/use-unofficial-osg-config.patch mode change 100644 => 100755 versions/baseline.json diff --git a/ports/osgearth/blend2d-fix.patch b/ports/osgearth/blend2d-fix.patch deleted file mode 100644 index 2b706573ef7305..00000000000000 --- a/ports/osgearth/blend2d-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/osgEarth/FeatureRasterizer.cpp b/src/osgEarth/FeatureRasterizer.cpp -index 84007aee9..de8e511df 100644 ---- a/src/osgEarth/FeatureRasterizer.cpp -+++ b/src/osgEarth/FeatureRasterizer.cpp -@@ -245,8 +245,8 @@ namespace osgEarth { - }); - - Color color(Color::White); -- uint32_t cap = BL_STROKE_CAP_ROUND; -- uint32_t join = BL_STROKE_JOIN_ROUND; -+ auto cap = BL_STROKE_CAP_ROUND; -+ auto join = BL_STROKE_JOIN_ROUND; - - if (symbol->stroke().isSet()) - { diff --git a/ports/osgearth/find-package.patch b/ports/osgearth/find-package.patch index 399be807f158d6..4ce2b8c5e7cb75 100644 --- a/ports/osgearth/find-package.patch +++ b/ports/osgearth/find-package.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7541c8d07..cc14d2160 100755 +index 36ea6c81f..8ed39eb24 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -122,9 +122,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit +@@ -124,9 +124,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit # Mobile/GLES: IF (OSGEARTH_USE_GLES) @@ -13,8 +13,26 @@ index 7541c8d07..cc14d2160 100755 + find_package(OpenGL REQUIRED) ENDIF (OSGEARTH_USE_GLES) + +@@ -144,35 +144,52 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") + endif() + # required -@@ -162,28 +162,33 @@ +-find_package(OSG REQUIRED) ++find_package(OSG NAMES unofficial-osg) ++find_path(OSG_INCLUDE_DIR osg/Version) # For detecting the version and setting the plugin path ++set(OSG_INCLUDE_DIRS "") ++set(OSG_LIBRARY unofficial::osg::osg) ++set(OSGUTIL_LIBRARY unofficial::osg::osgUtil) ++set(OSGDB_LIBRARY unofficial::osg::osgDB) ++set(OSGTEXT_LIBRARY unofficial::osg::osgText) ++set(OSGSIM_LIBRARY unofficial::osg::osgSim) ++set(OSGVIEWER_LIBRARY unofficial::osg::osgViewer) ++set(OSGGA_LIBRARY unofficial::osg::osgViewer) ++set(OSGSHADOW_LIBRARY unofficial::osg::osgShadow) ++set(OSGMANIPULATOR_LIBRARY unofficial::osg::osgManipulator) ++set(OPENTHREADS_LIBRARY unofficial::osg::OpenThreads) + find_package(CURL REQUIRED) find_package(GDAL REQUIRED) # optional @@ -26,6 +44,7 @@ index 7541c8d07..cc14d2160 100755 -find_package(Protobuf) -find_package(WEBP) -find_package(Blend2D) +-find_package(blosc) +find_package(GEOS CONFIG REQUIRED) +set(GEOS_LIBRARY GEOS::geos_c) +find_package(SQLITE3 NAMES unofficial-sqlite3 REQUIRED) @@ -38,6 +57,7 @@ index 7541c8d07..cc14d2160 100755 +set(WEBP_LIBRARY WebP::webp) +find_package(BLEND2D CONFIG REQUIRED) +set(BLEND2D_LIBRARY blend2d::blend2d) ++find_package(BLOSC REQUIRED) if(OSGEARTH_ENABLE_PROFILING) - find_package(Tracy) @@ -60,7 +80,8 @@ index 7541c8d07..cc14d2160 100755 + find_package(SilverLining QUIET REQUIRED) endif() -@@ -193,7 +207,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile + # Sqlite enables the MBTiles format: +@@ -214,7 +231,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile # Duktape is the JavaScript interpreter SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") IF (WITH_EXTERNAL_DUKTAPE) @@ -69,7 +90,7 @@ index 7541c8d07..cc14d2160 100755 ENDIF (WITH_EXTERNAL_DUKTAPE) # Whether to install shaders (glsl files). -@@ -204,7 +218,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak +@@ -225,7 +242,8 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak # TinyXML is an XML parsing library SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") IF (WITH_EXTERNAL_TINYXML) @@ -79,3 +100,11 @@ index 7541c8d07..cc14d2160 100755 ENDIF (WITH_EXTERNAL_TINYXML) # postfix settings for various configs +@@ -300,6 +318,7 @@ IF(OSGEARTH_BUILD_SHARED_LIBS) + SET(OSGEARTH_DYNAMIC_OR_STATIC "SHARED") + ELSE() + SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") ++ ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC) + ENDIF() + + diff --git a/ports/osgearth/fix-gcc11-compilation.patch b/ports/osgearth/fix-gcc11-compilation.patch deleted file mode 100644 index 582389068fa1dc..00000000000000 --- a/ports/osgearth/fix-gcc11-compilation.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8c16194c53d5bf70716dae2c6df67e77a1608dde Mon Sep 17 00:00:00 2001 -From: Ankur Verma -Date: Wed, 28 Jul 2021 06:40:45 -0700 -Subject: [PATCH] fix-gcc11-compilation - ---- - src/osgEarth/Units | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/osgEarth/Units b/src/osgEarth/Units -index dd19afe..bfe826a 100644 ---- a/src/osgEarth/Units -+++ b/src/osgEarth/Units -@@ -196,17 +196,17 @@ namespace osgEarth - class qualified_double - { - public: -- qualified_double( double value, const Units& units ) : _value(value), _units(units) { } -+ qualified_double( double value, const Units& units ) : _value(value), _units(units) { } - -- qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } -+ qualified_double( const T& rhs ) : _value(rhs._value), _units(rhs._units) { } - - // parses the qualified number from a parseable string (e.g., "123km") -- qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { -+ qualified_double(const std::string& parseable, const Units& defaultUnits) : _value(0.0), _units(defaultUnits) { - Units::parse( parseable, _value, _units, defaultUnits ); - } - - // loads the qualified number from an old-school config (e.g., { value="123" units="km" } ) -- qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { -+ qualified_double( const Config& conf, const Units& defaultUnits ) : _value(0.0) { - if ( conf.hasValue("value") ) { - _value = conf.value("value", 0.0); - if ( !Units::parse( conf.value("units"), _units ) ) --- -2.31.1 - diff --git a/ports/osgearth/osgearth-library-static.patch b/ports/osgearth/osgearth-library-static.patch deleted file mode 100644 index 9d0244a20e05ec..00000000000000 --- a/ports/osgearth/osgearth-library-static.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 049e37e..d75a3b9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -264,6 +264,7 @@ ELSE() - SET(OSGEARTH_DYNAMIC_OR_STATIC "SHARED") - ELSE() - SET(OSGEARTH_DYNAMIC_OR_STATIC "STATIC") -+ ADD_DEFINITIONS(-DOSGEARTH_LIBRARY_STATIC) - ENDIF() - - diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index de6e99eaf32959..0b94ef078cd972 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -1,19 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF 15d5340f174212d6f93ae55c0d9af606c3d361c0 #version 3.2 - SHA512 f922e8bbb041a498e948587f03e8dc8a07b92e641f38d50a8eafb8b3ce1e0c92bb1ee01360d57e794429912734b60cf05ba143445a442bc95af39e3dd9fc3670 + REF 6b5fb806a9190f7425c32db65d3ea905a55a9c16 #version 3.3 + SHA512 fe79ce6c73341f83d4aee8cb4da5341dead56a92f998212f7898079b79725f46b2209d64e68fe3b4d99d3c5c25775a8efd1bf3c3b3a049d4f609d3e30172d3bf HEAD_REF master PATCHES - osgearth-library-static.patch link-libraries.patch - use-unofficial-osg-config.patch find-package.patch remove-tool-debug-suffix.patch - fix-gcc11-compilation.patch - blend2d-fix.patch + remove-lerc-gltf.patch ) +if("tools" IN_LIST FEATURES) + message(STATUS "Downloading submodules") + # Download submodules from github manually since vpckg doesn't support submodules natively. + # IMGUI + #osgEarth is currently using imgui docking branch for osgearth_imgui example + vcpkg_from_github( + OUT_SOURCE_PATH IMGUI_SOURCE_PATH + REPO ocornut/imgui + REF 9e8e5ac36310607012e551bb04633039c2125c87 #docking branch + SHA512 1f1f743833c9a67b648922f56a638a11683b02765d86f14a36bc6c242cc524c4c5c5c0b7356b8053eb923fafefc53f4c116b21fb3fade7664554a1ad3b25e5ff + HEAD_REF master + ) + + # Remove exisiting folder in case it was not cleaned + file(REMOVE_RECURSE "${SOURCE_PATH}/src/third_party/imgui") + # Copy the submodules to the right place + file(COPY "${IMGUI_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/src/third_party/imgui") +endif() + file(REMOVE "${SOURCE_PATH}/CMakeModule/FindGEOS.cmake" "${SOURCE_PATH}/CMakeModule/FindLibZip.cmake" @@ -50,6 +66,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake/) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/osgEarth/Export" "defined( OSGEARTH_LIBRARY_STATIC )" "1") @@ -83,7 +100,8 @@ if("tools" IN_LIST FEATURES) endif() endif() vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp - osgearth_conv osgearth_imgui osgearth_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + osgearth_conv osgearth_imgui osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + osgearth_createtile osgearth_mvtindex AUTO_CLEAN ) endif() diff --git a/ports/osgearth/remove-lerc-gltf.patch b/ports/osgearth/remove-lerc-gltf.patch new file mode 100644 index 00000000000000..4c6f0fdb26989f --- /dev/null +++ b/ports/osgearth/remove-lerc-gltf.patch @@ -0,0 +1,20 @@ +diff --git a/src/osgEarthDrivers/CMakeLists.txt b/src/osgEarthDrivers/CMakeLists.txt +index d178f951b..010896310 100644 +--- a/src/osgEarthDrivers/CMakeLists.txt ++++ b/src/osgEarthDrivers/CMakeLists.txt +@@ -30,7 +30,6 @@ add_subdirectory(earth) + add_subdirectory(engine_rex) + add_subdirectory(featurefilter_intersect) + add_subdirectory(featurefilter_join) +-add_subdirectory(gltf) + add_subdirectory(kml) + add_subdirectory(mapinspector) + add_subdirectory(monitor) +@@ -40,7 +39,6 @@ add_subdirectory(sky_simple) + add_subdirectory(template) + add_subdirectory(terrainshader) + add_subdirectory(webp) +-add_subdirectory(lerc) + add_subdirectory(vdatum_egm2008) + add_subdirectory(vdatum_egm84) + add_subdirectory(vdatum_egm96) diff --git a/ports/osgearth/use-unofficial-osg-config.patch b/ports/osgearth/use-unofficial-osg-config.patch deleted file mode 100644 index 6a770a0190d2a0..00000000000000 --- a/ports/osgearth/use-unofficial-osg-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf8971b..242f412 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -143,7 +144,19 @@ if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") - ENDIF (OSGEARTH_USE_GLES) - - # required --find_package(OSG REQUIRED) -+find_package(OSG NAMES unofficial-osg) -+find_path(OSG_INCLUDE_DIR osg/Version) # For detecting the version and setting the plugin path -+set(OSG_INCLUDE_DIRS "") -+set(OSG_LIBRARY unofficial::osg::osg) -+set(OSGUTIL_LIBRARY unofficial::osg::osgUtil) -+set(OSGDB_LIBRARY unofficial::osg::osgDB) -+set(OSGTEXT_LIBRARY unofficial::osg::osgText) -+set(OSGSIM_LIBRARY unofficial::osg::osgSim) -+set(OSGVIEWER_LIBRARY unofficial::osg::osgViewer) -+set(OSGGA_LIBRARY unofficial::osg::osgViewer) -+set(OSGSHADOW_LIBRARY unofficial::osg::osgShadow) -+set(OSGMANIPULATOR_LIBRARY unofficial::osg::osgManipulator) -+set(OPENTHREADS_LIBRARY unofficial::osg::OpenThreads) - find_package(CURL REQUIRED) - find_package(GDAL REQUIRED) - diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 7bf7707c0546eb..015f188261bd09 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,9 +1,9 @@ { "name": "osgearth", - "version": "3.2", - "port-version": 6, + "version": "3.3", "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", + "license": "LGPL-3.0-or-later", "supports": "!(x86 | wasm32)", "dependencies": [ "basisu", @@ -28,6 +28,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json old mode 100644 new mode 100755 index ced03ba0d9e56c..f2b17f660e1794 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5305,8 +5305,8 @@ "port-version": 3 }, "osgearth": { - "baseline": "3.2", - "port-version": 6 + "baseline": "3.3", + "port-version": 0 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index c758d6afe53751..ca373fd84ba83d 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e95d7000b08e777779b6b0c6d2dbf35686b87a4", + "version": "3.3", + "port-version": 0 + }, { "git-tree": "8445895488485c8931b96483e6da43969260855a", "version": "3.2", From 9776b51b557bb2c20d79cf541f124c48d0c2c720 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 7 Jul 2022 01:00:23 +0300 Subject: [PATCH 052/791] [assimp] Update to 5.2.4 (#24843) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> Co-authored-by: JackBoosY --- ports/assimp/4542.patch | 81 +++ ports/assimp/build_fixes.patch | 954 +++++++++++++++------------------ ports/assimp/irrlicht.patch | 61 --- ports/assimp/portfile.cmake | 85 ++- ports/assimp/vcpkg.json | 16 +- ports/qt5-3d/portfile.cmake | 11 +- ports/qt5-3d/vcpkg.json | 1 + ports/qtquick3d/vcpkg.json | 2 +- versions/a-/assimp.json | 5 + versions/baseline.json | 8 +- versions/q-/qt5-3d.json | 5 + versions/q-/qtquick3d.json | 5 + 12 files changed, 583 insertions(+), 651 deletions(-) create mode 100644 ports/assimp/4542.patch delete mode 100644 ports/assimp/irrlicht.patch diff --git a/ports/assimp/4542.patch b/ports/assimp/4542.patch new file mode 100644 index 00000000000000..62ee6e3f71ff31 --- /dev/null +++ b/ports/assimp/4542.patch @@ -0,0 +1,81 @@ +From affa85a36bbd329c8792b553f64188c1d3a58188 Mon Sep 17 00:00:00 2001 +From: hgdagon +Date: Wed, 25 May 2022 07:59:01 -0700 +Subject: [PATCH 1/2] Fix GNUC check on Windows + +--- + code/Common/DefaultIOStream.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp +index 17fc44f9a2..bbc3b2080f 100644 +--- a/code/Common/DefaultIOStream.cpp ++++ b/code/Common/DefaultIOStream.cpp +@@ -63,7 +63,7 @@ inline int select_fseek(FILE *file, int64_t offset, int origin) { + + + +-#if defined _WIN64 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) ++#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 + template <> + inline size_t select_ftell<8>(FILE *file) { + return (size_t)::_ftelli64(file); +@@ -74,7 +74,7 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) { + return ::_fseeki64(file, offset, origin); + } + +-#endif // #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) ++#endif // #if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 + + } // namespace + +@@ -149,7 +149,7 @@ size_t DefaultIOStream::FileSize() const { + // + // See here for details: + // https://www.securecoding.cert.org/confluence/display/seccode/FIO19-C.+Do+not+use+fseek()+and+ftell()+to+compute+the+size+of+a+regular+file +-#if defined _WIN64 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) ++#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 + struct __stat64 fileStat; + //using fileno + fstat avoids having to handle the filename + int err = _fstat64(_fileno(mFile), &fileStat); + +From efbcdccac99a66d513731a2f5af65211c734cfe7 Mon Sep 17 00:00:00 2001 +From: hgdagon +Date: Wed, 25 May 2022 09:18:42 -0700 +Subject: [PATCH 2/2] Fix GNUC check on Windows (2nd attempt) + +--- + code/Common/DefaultIOStream.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp +index bbc3b2080f..d5d5846897 100644 +--- a/code/Common/DefaultIOStream.cpp ++++ b/code/Common/DefaultIOStream.cpp +@@ -63,7 +63,7 @@ inline int select_fseek(FILE *file, int64_t offset, int origin) { + + + +-#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 ++#if defined _WIN32 && (!defined __GNUC__ || !defined __CLANG__ && __MSVCRT_VERSION__ >= 0x0601) + template <> + inline size_t select_ftell<8>(FILE *file) { + return (size_t)::_ftelli64(file); +@@ -74,7 +74,7 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) { + return ::_fseeki64(file, offset, origin); + } + +-#endif // #if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 ++#endif + + } // namespace + +@@ -149,7 +149,7 @@ size_t DefaultIOStream::FileSize() const { + // + // See here for details: + // https://www.securecoding.cert.org/confluence/display/seccode/FIO19-C.+Do+not+use+fseek()+and+ftell()+to+compute+the+size+of+a+regular+file +-#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 ++#if defined _WIN32 && (!defined __GNUC__ || !defined __CLANG__ && __MSVCRT_VERSION__ >= 0x0601) + struct __stat64 fileStat; + //using fileno + fstat avoids having to handle the filename + int err = _fstat64(_fileno(mFile), &fileStat); diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index 7590aec96fec6f..66a7d46f0aefd3 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -1,249 +1,135 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcafb64..761040d 100644 +index 2aa6642..e74f93c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ IF(HUNTER_ENABLED) +@@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) - ENDIF(HUNTER_ENABLED) + ENDIF() --PROJECT( Assimp VERSION 5.0.0 ) -+PROJECT( Assimp VERSION 5.0.1 ) +-PROJECT(Assimp VERSION 5.2.0) ++PROJECT(Assimp VERSION 5.2.4) # All supported options ############################################### -@@ -130,6 +130,16 @@ OPTION ( IGNORE_GIT_HASH - OFF - ) - -+find_package(Stb REQUIRED) -+include_directories(${Stb_INCLUDE_DIR}) -+find_package(utf8cpp CONFIG REQUIRED) -+link_libraries(utf8cpp) -+find_package(RapidJSON CONFIG REQUIRED) -+include_directories(${RAPIDJSON_INCLUDE_DIRS}) -+find_path(UNZIP_INCLUDE_DIRS "minizip/unzip.h") -+include_directories(${UNZIP_INCLUDE_DIRS}/minizip) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib) -+ - IF (IOS AND NOT HUNTER_ENABLED) - IF (NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Release") -@@ -230,10 +240,8 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M - SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) - SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") - --IF( UNIX ) - # Use GNUInstallDirs for Unix predefined directories - INCLUDE(GNUInstallDirs) --ENDIF( UNIX ) - - # Grouped compiler settings - IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) -@@ -253,7 +261,6 @@ ELSEIF(MSVC) +@@ -273,18 +273,18 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW) + ELSEIF(MSVC) + # enable multi-core compilation with MSVC + IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl +- ADD_COMPILE_OPTIONS(/bigobj /W4 /WX ) ++ ADD_COMPILE_OPTIONS(/bigobj) + ELSE() # msvc +- ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX) ++ ADD_COMPILE_OPTIONS(/MP /bigobj) + ENDIF() + # disable "elements of array '' will be default initialized" warning on MSVC2013 IF(MSVC12) - ADD_COMPILE_OPTIONS(/wd4351) + ADD_COMPILE_OPTIONS(/wd4351) ENDIF() -- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob2 /DEBUG:FULL /Zi") - ELSEIF ( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) - IF(NOT HUNTER_ENABLED) - SET(CMAKE_CXX_FLAGS "-fPIC -std=c++11 ${CMAKE_CXX_FLAGS}") -@@ -352,35 +359,21 @@ IF (NOT TARGET uninstall) - ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - ENDIF() - --IF(HUNTER_ENABLED) -- set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -+ set(CONFIG_INSTALL_DIR "share/assimp") - set(INCLUDE_INSTALL_DIR "include") - -- set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -+ string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) -+ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") - -- # Configuration -- set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") -- set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") -- set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -- set(NAMESPACE "${PROJECT_NAME}::") -+ set(TARGETS_EXPORT_NAME "${PROJECT_NAME_LOWERCASE}Config") -+ set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME_LOWERCASE}ConfigVersion.cmake") -+ set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") - -- # Include module with fuction 'write_basic_package_version_file' - include(CMakePackageConfigHelpers) -- -- # Note: PROJECT_VERSION is used as a VERSION -- write_basic_package_version_file("${VERSION_CONFIG}" COMPATIBILITY SameMajorVersion) -- -- # Use variables: -- # * TARGETS_EXPORT_NAME -- # * PROJECT_NAME -- configure_package_config_file( -- "cmake/assimp-hunter-config.cmake.in" -- "${PROJECT_CONFIG}" -- INSTALL_DESTINATION "${CONFIG_INSTALL_DIR}" -- ) -+ write_basic_package_version_file("${VERSION_CONFIG}" VERSION ${${PROJECT_NAME}_VERSION} COMPATIBILITY SameMajorVersion) - - install( -- FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" -+ FILES ${VERSION_CONFIG} - DESTINATION "${CONFIG_INSTALL_DIR}" - ) - -@@ -389,30 +382,6 @@ IF(HUNTER_ENABLED) - NAMESPACE "${NAMESPACE}" - DESTINATION "${CONFIG_INSTALL_DIR}" - ) --ELSE(HUNTER_ENABLED) -- # cmake configuration files -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) -- IF (is_multi_config) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ELSEIF (CMAKE_BUILD_TYPE STREQUAL Debug) -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-debug.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-debug.cmake") -- ELSE() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets-release.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake" @ONLY IMMEDIATE) -- SET(PACKAGE_TARGETS_FILE "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets-release.cmake") -- ENDIF() -- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config-version.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" @ONLY IMMEDIATE) -- #we should generated these scripts after CMake VERSION 3.0.2 using export(EXPORT ...) and write_basic_package_version_file(...) -- INSTALL(FILES -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimp-config-version.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" -- ${PACKAGE_TARGETS_FILE} -- DESTINATION "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}" COMPONENT ${LIBASSIMP-DEV_COMPONENT}) --ENDIF(HUNTER_ENABLED) - - FIND_PACKAGE( DirectX ) - -@@ -422,63 +391,19 @@ ENDIF( BUILD_DOCS ) - - # Look for system installed irrXML - IF ( SYSTEM_IRRXML ) -- FIND_PACKAGE( IrrXML REQUIRED ) -+ FIND_PACKAGE( irrlicht CONFIG REQUIRED ) - ENDIF( SYSTEM_IRRXML ) + ADD_COMPILE_OPTIONS(/wd4244) #supress warning for double to float conversion if Double precission is activated +- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") +- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") +- SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") ++ #SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") ++ #SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") ++ #SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") + ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) + IF(NOT ASSIMP_HUNTER_ENABLED) + SET(CMAKE_CXX_STANDARD 11) +@@ -414,7 +414,7 @@ ENDIF() + + set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") + +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") + set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-hunter-config.cmake.in") + set(NAMESPACE "${PROJECT_NAME}::") +@@ -422,7 +422,7 @@ IF(ASSIMP_HUNTER_ENABLED) + set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") + set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") + ELSE() +- set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp-${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_MINOR}") ++ set(CONFIG_INSTALL_DIR "${ASSIMP_LIB_INSTALL_DIR}/cmake/assimp") + set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in") + string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) + set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") +@@ -464,14 +464,14 @@ ENDIF() # Search for external dependencies, and build them from source if not found # Search for zlib --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(ZLIB) - find_package(ZLIB CONFIG REQUIRED) ++IF(1) ++ #hunter_add_package(ZLIB) + find_package(ZLIB REQUIRED) add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) set(ZLIB_FOUND TRUE) - set(ZLIB_LIBRARIES ZLIB::zlib) - set(ASSIMP_BUILD_MINIZIP TRUE) --ELSE(HUNTER_ENABLED) -- IF ( NOT ASSIMP_BUILD_ZLIB ) -- FIND_PACKAGE(ZLIB) -- ENDIF( NOT ASSIMP_BUILD_ZLIB ) -- -- IF( NOT ZLIB_FOUND ) -- MESSAGE(STATUS "compiling zlib from sources") -- INCLUDE(CheckIncludeFile) -- INCLUDE(CheckTypeSize) -- INCLUDE(CheckFunctionExists) -- -- # Explicitly turn off ASM686 and AMD64 cmake options. -- # The AMD64 option causes a build failure on MSVC and the ASM builds seem to have problems: -- # https://github.com/madler/zlib/issues/41#issuecomment-125848075 -- # Also prevents these options from "polluting" the cmake options if assimp is being -- # included as a submodule. -- set( ASM686 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- set( AMD64 FALSE CACHE INTERNAL "Override ZLIB flag to turn off assembly" FORCE ) -- -- # compile from sources -- ADD_SUBDIRECTORY(contrib/zlib) -- SET(ZLIB_FOUND 1) -- SET(ZLIB_LIBRARIES zlibstatic) -- SET(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) -- # need to ensure we don't link with system zlib or minizip as well. -- SET(ASSIMP_BUILD_MINIZIP 1) -- ELSE(NOT ZLIB_FOUND) -- ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) -- SET(ZLIB_LIBRARIES_LINKED -lz) -- ENDIF(NOT ZLIB_FOUND) + set(ZLIB_LIBRARIES ZLIB::ZLIB) - INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) --ENDIF(HUNTER_ENABLED) ++ set(ASSIMP_BUILD_MINIZIP OFF) + ELSE() + # If the zlib is already found outside, add an export in case assimpTargets can't find it. + IF( ZLIB_FOUND ) +@@ -512,12 +512,12 @@ ELSE() + ENDIF() --IF( NOT IOS ) + IF( NOT IOS ) - IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) --ELSE ( NOT IOS ) -- IF( NOT BUILD_SHARED_LIBS ) ++ IF( 0 ) + use_pkgconfig(UNZIP minizip) + ENDIF() + ELSE () + IF( NOT BUILD_SHARED_LIBS ) - IF( NOT ASSIMP_BUILD_MINIZIP ) -- use_pkgconfig(UNZIP minizip) -- ENDIF( NOT ASSIMP_BUILD_MINIZIP ) -- ENDIF ( NOT BUILD_SHARED_LIBS ) --ENDIF ( NOT IOS ) -+ find_package(minizip CONFIG REQUIRED) - - IF ( ASSIMP_NO_EXPORT ) - ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT) -@@ -633,7 +558,7 @@ IF(CMAKE_CPACK_COMMAND AND UNIX AND ASSIMP_OPT_BUILD_PACKAGES) - INCLUDE(DebSourcePPA) - ENDIF() - --if(WIN32) -+if(0) - if (CMAKE_SIZEOF_VOID_P EQUAL 8) - SET(BIN_DIR "${PROJECT_SOURCE_DIR}/bin64/") - SET(LIB_DIR "${PROJECT_SOURCE_DIR}/lib64/") -@@ -677,4 +602,4 @@ if(WIN32) - ADD_CUSTOM_COMMAND(TARGET UpdateAssimpLibsDebugSymbolsAndDLLs COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/code/assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb ${LIB_DIR}assimp-${ASSIMP_MSVC_VERSION}-mtd.pdb VERBATIM) ++ IF( 0 ) + use_pkgconfig(UNZIP minizip) ENDIF() - ENDIF(MSVC12 OR MSVC14 OR MSVC15 ) --ENDIF (WIN32) -+ENDIF (0) -diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in -index ab1a8d2..4b0729b 100644 ---- a/assimpTargets.cmake.in -+++ b/assimpTargets.cmake.in -@@ -5,6 +5,8 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) - endif() - cmake_policy(PUSH) - cmake_policy(VERSION 2.6) -+# Required for the evaluation of "if(@BUILD_SHARED_LIBS@)" below to function -+cmake_policy(SET CMP0012 NEW) - #---------------------------------------------------------------- - # Generated CMake target import file. - #---------------------------------------------------------------- -diff --git a/code/3MF/D3MFExporter.cpp b/code/3MF/D3MFExporter.cpp -index 1f388ad..1ccd2aa 100644 ---- a/code/3MF/D3MFExporter.cpp -+++ b/code/3MF/D3MFExporter.cpp -@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ENDIF () +diff --git a/cmake-modules/assimp-plain-config.cmake.in b/cmake-modules/assimp-plain-config.cmake.in +index 6551dcb..0796448 100644 +--- a/cmake-modules/assimp-plain-config.cmake.in ++++ b/cmake-modules/assimp-plain-config.cmake.in +@@ -1,5 +1,20 @@ + @PACKAGE_INIT@ + ++include(CMakeFindDependencyMacro) ++ ++find_dependency(pugixml CONFIG) ++if(NOT @BUILD_SHARED_LIBS@) ++ find_dependency(kubazip CONFIG) ++ find_dependency(minizip CONFIG) ++ #find_dependency(openddlparser CONFIG) ++ find_dependency(poly2tri CONFIG) ++ #find_dependency(polyclipping CONFIG) ++ find_dependency(RapidJSON CONFIG) ++ find_dependency(Stb MODULE) ++ find_dependency(utf8cpp CONFIG) ++ find_dependency(ZLIB) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") + + set(ASSIMP_ROOT_DIR ${PACKAGE_PREFIX_DIR}) +diff --git a/code/AssetLib/3MF/D3MFExporter.cpp b/code/AssetLib/3MF/D3MFExporter.cpp +index 42cd991..640e2fb 100644 +--- a/code/AssetLib/3MF/D3MFExporter.cpp ++++ b/code/AssetLib/3MF/D3MFExporter.cpp +@@ -57,7 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef ASSIMP_USE_HUNTER - # include + #include #else --# include -+# include +-#include ++#include #endif namespace Assimp { -@@ -255,7 +255,7 @@ void D3MFExporter::writeBaseMaterials() { - hexDiffuseColor.clear(); - tmp.clear(); - hexDiffuseColor = "#"; -- -+ - tmp = DecimalToHexa( color.r ); - hexDiffuseColor += tmp; - tmp = DecimalToHexa( color.g ); -diff --git a/code/Blender/BlenderTessellator.h b/code/Blender/BlenderTessellator.h -index 518e56c..ec4a653 100644 ---- a/code/Blender/BlenderTessellator.h -+++ b/code/Blender/BlenderTessellator.h +diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/BlenderTessellator.h +index 0d0ba32..c3703c4 100644 +--- a/code/AssetLib/Blender/BlenderTessellator.h ++++ b/code/AssetLib/Blender/BlenderTessellator.h @@ -147,7 +147,7 @@ namespace Assimp #ifdef ASSIMP_USE_HUNTER # include @@ -253,374 +139,394 @@ index 518e56c..ec4a653 100644 #endif namespace Assimp +diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp +index ef59542..17e00cd 100644 +--- a/code/AssetLib/IFC/IFCGeometry.cpp ++++ b/code/AssetLib/IFC/IFCGeometry.cpp +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # include + # include + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp +index 0c20686..e6b20a3 100644 +--- a/code/AssetLib/IFC/IFCLoader.cpp ++++ b/code/AssetLib/IFC/IFCLoader.cpp +@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + #include + #else +-#include ++#include + #endif + #endif + +diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.cpp +index 3c4a0b3..3fab616 100644 +--- a/code/AssetLib/IFC/IFCOpenings.cpp ++++ b/code/AssetLib/IFC/IFCOpenings.cpp +@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # include + # include + #else +-# include "../contrib/poly2tri/poly2tri/poly2tri.h" ++# include + # include "../contrib/clipper/clipper.hpp" + #endif + +diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp +index ca37ba1..2ce7bdd 100644 +--- a/code/AssetLib/MMD/MMDPmxParser.cpp ++++ b/code/AssetLib/MMD/MMDPmxParser.cpp +@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include "../contrib/utf8cpp/source/utf8.h" ++# include + #endif + #include + +diff --git a/code/AssetLib/SIB/SIBImporter.cpp b/code/AssetLib/SIB/SIBImporter.cpp +index 7b66afa..5adbe1d 100644 +--- a/code/AssetLib/SIB/SIBImporter.cpp ++++ b/code/AssetLib/SIB/SIBImporter.cpp +@@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + #include + #else +-#include "../contrib/utf8cpp/source/utf8.h" ++#include + #endif + #include + #include +diff --git a/code/AssetLib/STEPParser/STEPFileEncoding.cpp b/code/AssetLib/STEPParser/STEPFileEncoding.cpp +index d4456e6..812f29b 100644 +--- a/code/AssetLib/STEPParser/STEPFileEncoding.cpp ++++ b/code/AssetLib/STEPParser/STEPFileEncoding.cpp +@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #ifdef ASSIMP_USE_HUNTER + # include + #else +-# include ++# include + #endif + + #include diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index 55538d9..f5553e5 100644 +index 5339454..45e07c0 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt -@@ -862,89 +862,24 @@ SET( Extra_SRCS +@@ -897,8 +897,8 @@ SET( Extra_SRCS SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - # irrXML --IF(HUNTER_ENABLED) -- hunter_add_package(irrXML) - find_package(irrXML CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # irrXML already included in contrib directory by parent CMakeLists.txt. --ENDIF(HUNTER_ENABLED) -- --# utf8 --IF(HUNTER_ENABLED) + # pugixml +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(pugixml) ++IF(1) ++ #hunter_add_package(pugixml) + find_package(pugixml CONFIG REQUIRED) + ELSE() + SET( Pugixml_SRCS +@@ -910,15 +910,15 @@ ELSE() + ENDIF() + + # utf8 +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(utf8) -- find_package(utf8 CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- # utf8 is header-only, so Assimp doesn't need to do anything. --ENDIF(HUNTER_ENABLED) ++IF(1) ++ #hunter_add_package(utf8) + find_package(utf8cpp CONFIG REQUIRED) + ELSE() + # utf8 is header-only, so Assimp doesn't need to do anything. + ENDIF() # polyclipping --IF(HUNTER_ENABLED) -- hunter_add_package(polyclipping) +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + hunter_add_package(polyclipping) find_package(polyclipping CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) - SET( Clipper_SRCS - ../contrib/clipper/clipper.hpp - ../contrib/clipper/clipper.cpp - ) - SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS}) --ENDIF(HUNTER_ENABLED) + ELSE() +@@ -930,8 +930,8 @@ ELSE() + ENDIF() # poly2tri --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(poly2tri) ++IF(1) ++ #hunter_add_package(poly2tri) find_package(poly2tri CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( Poly2Tri_SRCS -- ../contrib/poly2tri/poly2tri/common/shapes.cc -- ../contrib/poly2tri/poly2tri/common/shapes.h -- ../contrib/poly2tri/poly2tri/common/utils.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.h -- ../contrib/poly2tri/poly2tri/sweep/advancing_front.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.cc -- ../contrib/poly2tri/poly2tri/sweep/cdt.h -- ../contrib/poly2tri/poly2tri/sweep/sweep.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep.h -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.cc -- ../contrib/poly2tri/poly2tri/sweep/sweep_context.h -- ) -- SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS}) --ENDIF(HUNTER_ENABLED) + ELSE() + SET( Poly2Tri_SRCS +@@ -951,8 +951,8 @@ ELSE() + ENDIF() # minizip/unzip --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(minizip) ++IF(1) ++ #hunter_add_package(minizip) find_package(minizip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( unzip_SRCS -- ../contrib/unzip/crypt.h -- ../contrib/unzip/ioapi.c -- ../contrib/unzip/ioapi.h -- ../contrib/unzip/unzip.c -- ../contrib/unzip/unzip.h -- ) -- SOURCE_GROUP(Contrib\\unzip FILES ${unzip_SRCS}) --ENDIF(HUNTER_ENABLED) - + ELSE() + SET( unzip_SRCS +@@ -969,9 +969,9 @@ ENDIF() # zip (https://github.com/kuba--/zip) --IF(HUNTER_ENABLED) -- hunter_add_package(zip) -- find_package(zip CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- SET( ziplib_SRCS -- ../contrib/zip/src/miniz.h -- ../contrib/zip/src/zip.c -- ../contrib/zip/src/zip.h -- ) -- -- # TODO if cmake required version has been updated to >3.12.0, collapse this to the second case only -- if(${CMAKE_VERSION} VERSION_LESS "3.12.0") -- add_definitions(-DMINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- else() -- add_compile_definitions(MINIZ_USE_UNALIGNED_LOADS_AND_STORES=0) -- endif() -- -- SOURCE_GROUP( ziplib FILES ${ziplib_SRCS} ) --ENDIF(HUNTER_ENABLED) -+ find_package(kubazip CONFIG REQUIRED) + separate_arguments(ASSIMP_EXPORTERS_LIST UNIX_COMMAND ${ASSIMP_EXPORTERS_ENABLED}) + IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) +- IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(zip) +- find_package(zip CONFIG REQUIRED) ++ IF(1) ++ #hunter_add_package(zip) ++ find_package(kubazip CONFIG REQUIRED) + ELSE() + SET( ziplib_SRCS + ../contrib/zip/src/miniz.h +@@ -991,7 +991,7 @@ IF(3MF IN_LIST ASSIMP_EXPORTERS_LIST) + ENDIF() # openddlparser - IF(HUNTER_ENABLED) -@@ -1021,13 +956,7 @@ ELSE () +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + hunter_add_package(openddlparser) + find_package(openddlparser CONFIG REQUIRED) + ELSE() +@@ -1014,7 +1014,7 @@ ELSE() + ENDIF() + + # Open3DGC +-IF(ASSIMP_HUNTER_ENABLED) ++IF(0) + # Nothing to do, not available in Hunter yet. + ELSE() + SET ( open3dgc_SRCS +@@ -1049,6 +1049,7 @@ ELSE() + ../contrib/Open3DGC/o3dgcVector.inl + ) + SOURCE_GROUP( Contrib\\open3dgc FILES ${open3dgc_SRCS}) ++ INCLUDE_DIRECTORIES("../contrib") + ENDIF() + + # Check dependencies for glTF importer with Open3DGC-compression. +@@ -1057,7 +1058,7 @@ ENDIF() + IF (NOT WIN32) + FIND_PACKAGE(RT QUIET) + ENDIF () +-IF (NOT ASSIMP_HUNTER_ENABLED AND (RT_FOUND OR WIN32)) ++IF (1) + SET( ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC 1 ) + ADD_DEFINITIONS( -DASSIMP_IMPORTER_GLTF_USE_OPEN3DGC=1 ) + ELSE () +@@ -1067,9 +1068,10 @@ ELSE () ENDIF () # RapidJSON --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) - hunter_add_package(RapidJSON) ++IF(1) ++ #hunter_add_package(RapidJSON) find_package(RapidJSON CONFIG REQUIRED) --ELSE(HUNTER_ENABLED) -- INCLUDE_DIRECTORIES( "../contrib/rapidjson/include" ) -- INCLUDE_DIRECTORIES( "../contrib" ) --ENDIF(HUNTER_ENABLED) - - # VC2010 fixes - if(MSVC10) -@@ -1044,15 +973,6 @@ if ( MSVC ) ++ ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) + ELSE() + INCLUDE_DIRECTORIES("../contrib/rapidjson/include") + ADD_DEFINITIONS( -DRAPIDJSON_HAS_STDSTRING=1) +@@ -1080,9 +1082,9 @@ ELSE() + ENDIF() + + # stb +-IF(ASSIMP_HUNTER_ENABLED) +- hunter_add_package(stb) +- find_package(stb CONFIG REQUIRED) ++IF(1) ++ #hunter_add_package(stb) ++ find_package(Stb REQUIRED) + ELSE() + SET( stb_SRCS + ../contrib/stb/stb_image.h +@@ -1106,7 +1108,7 @@ IF( MSVC OR "${CMAKE_CXX_SIMULATE_ID}" MATCHES "MSVC") # clang with MSVC ABI ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) - endif ( MSVC ) - --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- SET (unzip_compile_SRCS "") -- else (UNZIP_FOUND) -- SET (unzip_compile_SRCS ${unzip_SRCS}) -- INCLUDE_DIRECTORIES( "../contrib/unzip/" ) -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) -- - MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}") - MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}") - -@@ -1111,22 +1031,14 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - $ + endif () + +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(0) + if (UNZIP_FOUND) + SET (unzip_compile_SRCS "") + else () +@@ -1157,7 +1159,7 @@ SET( assimp_src + ) + ADD_DEFINITIONS( -DOPENDDLPARSER_BUILD ) + +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(1) + INCLUDE_DIRECTORIES( + ${IRRXML_INCLUDE_DIR} + ../contrib/openddlparser/include +@@ -1195,45 +1197,48 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC + $ + $ + $ ++ PRIVATE ++ ${Stb_INCLUDE_DIR} ) --IF(HUNTER_ENABLED) +-IF(ASSIMP_HUNTER_ENABLED) ++IF(1) TARGET_LINK_LIBRARIES(assimp - PUBLIC - polyclipping::polyclipping - irrXML::irrXML +- polyclipping::polyclipping - openddlparser::openddl_parser -- poly2tri::poly2tri ++ PRIVATE ++ #polyclipping::polyclipping ++ #openddlparser::openddl_parser ++ ${OPENDDL_PARSER_LIBRARIES} + poly2tri::poly2tri minizip::minizip - ZLIB::zlib - RapidJSON::rapidjson -- utf8::utf8 -- zip::zip + ZLIB::ZLIB -+ kubazip::kubazip -+ poly2tri::poly2tri ++ rapidjson + utf8cpp ++ PUBLIC + pugixml +- stb::stb ) --ELSE(HUNTER_ENABLED) -- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES} ${IRRXML_LIBRARY} ) --ENDIF(HUNTER_ENABLED) +- if(TARGET zip::zip) +- target_link_libraries(assimp PUBLIC zip::zip) ++ if(1) ++ target_link_libraries(assimp PRIVATE kubazip::kubazip) + endif() + + if (ASSIMP_BUILD_DRACO) +- target_link_libraries(assimp PUBLIC ${draco_LIBRARIES}) ++ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) + endif() + ELSE() +- TARGET_LINK_LIBRARIES(assimp ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${ZLIB_LIBRARIES} ${OPENDDL_PARSER_LIBRARIES}) + if (ASSIMP_BUILD_DRACO) +- target_link_libraries(assimp ${draco_LIBRARIES}) ++ target_link_libraries(assimp PRIVATE ${draco_LIBRARIES}) + endif() + ENDIF() if(ASSIMP_ANDROID_JNIIOSYSTEM) set(ASSIMP_ANDROID_JNIIOSYSTEM_PATH port/AndroidJNI) -@@ -1208,21 +1120,12 @@ ENDIF(APPLE) + add_subdirectory(../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/ ../${ASSIMP_ANDROID_JNIIOSYSTEM_PATH}/) +- target_link_libraries(assimp android_jniiosystem) ++ target_link_libraries(assimp PRIVATE android_jniiosystem) + endif() + + IF (ASSIMP_BUILD_NONFREE_C4D_IMPORTER) +- TARGET_LINK_LIBRARIES(assimp optimized ${C4D_RELEASE_LIBRARIES}) +- TARGET_LINK_LIBRARIES(assimp debug ${C4D_DEBUG_LIBRARIES}) +- TARGET_LINK_LIBRARIES(assimp ${C4D_EXTRA_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE optimized ${C4D_RELEASE_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE debug ${C4D_DEBUG_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${C4D_EXTRA_LIBRARIES}) + ENDIF () + + if( MSVC ) +@@ -1274,13 +1279,13 @@ if (MINGW) + ARCHIVE_OUTPUT_NAME assimp + ) + if (NOT BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES ( assimp -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. ++ TARGET_LINK_LIBRARIES ( assimp PRIVATE -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lwinpthread ) # winpthread is for libminizip. + endif () + endif() + + if (${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") + target_compile_definitions(assimp PUBLIC WindowsStore) +- TARGET_LINK_LIBRARIES(assimp advapi32) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE advapi32) + endif() + + SET_TARGET_PROPERTIES( assimp PROPERTIES +@@ -1310,10 +1315,10 @@ ENDIF() # Build against external unzip, or add ../contrib/unzip so # assimp can #include "unzip.h" --IF(NOT HUNTER_ENABLED) -- if (UNZIP_FOUND) -- INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) +-IF(NOT ASSIMP_HUNTER_ENABLED) ++IF(0) + if (UNZIP_FOUND) + INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) - TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) -- else (UNZIP_FOUND) -- INCLUDE_DIRECTORIES("../") -- endif (UNZIP_FOUND) --ENDIF(NOT HUNTER_ENABLED) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${UNZIP_LIBRARIES}) + else () + INCLUDE_DIRECTORIES("../") + endif () +@@ -1321,7 +1326,7 @@ ENDIF() # Add RT-extension library for glTF importer with Open3DGC-compression. IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) - ENDIF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC) - --IF(HUNTER_ENABLED) - INSTALL( TARGETS assimp - EXPORT "${TARGETS_EXPORT_NAME}" - LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -@@ -1231,14 +1134,6 @@ IF(HUNTER_ENABLED) - FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - COMPONENT ${LIBASSIMP_COMPONENT} - INCLUDES DESTINATION "include") --ELSE(HUNTER_ENABLED) --INSTALL( TARGETS assimp -- LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} -- FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} -- COMPONENT ${LIBASSIMP_COMPONENT}) --ENDIF(HUNTER_ENABLED) - INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev) - INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev) +- TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY}) ++ TARGET_LINK_LIBRARIES(assimp PRIVATE ${RT_LIBRARY}) + ENDIF () + + +diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp +index 71e312c..fa7fc36 100644 +--- a/code/Common/Assimp.cpp ++++ b/code/Common/Assimp.cpp +@@ -1290,7 +1290,7 @@ ASSIMP_API void aiQuaternionInterpolate( + # endif + + # define STB_IMAGE_IMPLEMENTATION +-# include "stb/stb_image.h" ++# include + # if _MSC_VER + # pragma warning(pop) diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp -index b77bbfe..51cba43 100644 +index 383300e..03fdd9a 100644 --- a/code/Common/BaseImporter.cpp +++ b/code/Common/BaseImporter.cpp -@@ -344,7 +344,7 @@ std::string BaseImporter::GetExtension( const std::string& file ) { +@@ -332,7 +332,7 @@ std::string BaseImporter::GetExtension(const std::string &file) { #ifdef ASSIMP_USE_HUNTER - # include + #include #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include +-#include "../contrib/utf8cpp/source/utf8.h" ++#include #endif // ------------------------------------------------------------------------------------------------ -@@ -364,8 +364,8 @@ void BaseImporter::ConvertToUTF8(std::vector& data) - data.resize(data.size()-3); - return; - } -- -- -+ -+ - // UTF 32 BE with BOM - if(*((uint32_t*)&data.front()) == 0xFFFE0000) { - -@@ -507,7 +507,7 @@ struct Assimp::BatchData { - , next_id(0xffff) - , validate( validate ) { - ai_assert( nullptr != pIO ); -- -+ - pImporter = new Importer(); - pImporter->SetIOHandler( pIO ); - } -diff --git a/code/Importer/IFC/IFCGeometry.cpp b/code/Importer/IFC/IFCGeometry.cpp -index d1c7aee..8e11373 100644 ---- a/code/Importer/IFC/IFCGeometry.cpp -+++ b/code/Importer/IFC/IFCGeometry.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - +diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp +index e0c9883..78b522a 100644 +--- a/code/Common/ZipArchiveIOSystem.cpp ++++ b/code/Common/ZipArchiveIOSystem.cpp +@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifdef ASSIMP_USE_HUNTER - # include --# include -+# include "../contrib/clipper/clipper.hpp" + # include #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" +-# include ++# include #endif -diff --git a/code/Importer/IFC/IFCOpenings.cpp b/code/Importer/IFC/IFCOpenings.cpp -index d6c40b3..387c625 100644 ---- a/code/Importer/IFC/IFCOpenings.cpp -+++ b/code/Importer/IFC/IFCOpenings.cpp -@@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - #ifdef ASSIMP_USE_HUNTER - # include --# include -+# include "../contrib/clipper/clipper.hpp" - #else --# include "../contrib/poly2tri/poly2tri/poly2tri.h" -+# include - # include "../contrib/clipper/clipper.hpp" - #endif - -@@ -911,14 +911,14 @@ size_t CloseWindows(ContourVector& contours, - // compare base poly normal and contour normal to detect if we need to reverse the face winding - if(curmesh.mVertcnt.size() > 0) { - IfcVector3 basePolyNormal = TempMesh::ComputePolygonNormal(curmesh.mVerts.data(), curmesh.mVertcnt.front()); -- -+ - std::vector worldSpaceContourVtx(it->contour.size()); -- -+ - for(size_t a = 0; a < it->contour.size(); ++a) - worldSpaceContourVtx[a] = minv * IfcVector3(it->contour[a].x, it->contour[a].y, 0.0); -- -+ - IfcVector3 contourNormal = TempMesh::ComputePolygonNormal(worldSpaceContourVtx.data(), worldSpaceContourVtx.size()); -- -+ - reverseCountourFaces = (contourNormal * basePolyNormal) > 0.0; - } - -diff --git a/code/Importer/STEPParser/STEPFileEncoding.cpp b/code/Importer/STEPParser/STEPFileEncoding.cpp -index 101dcdf..3f12403 100644 ---- a/code/Importer/STEPParser/STEPFileEncoding.cpp -+++ b/code/Importer/STEPParser/STEPFileEncoding.cpp -@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include -+# include - #endif - - #include -diff --git a/code/MMD/MMDPmxParser.cpp b/code/MMD/MMDPmxParser.cpp -index 80f0986..47725e2 100644 ---- a/code/MMD/MMDPmxParser.cpp -+++ b/code/MMD/MMDPmxParser.cpp -@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - -@@ -102,7 +102,7 @@ namespace pmx - const unsigned int targetSize = size * 3; // enough to encode - char *targetStart = new char[targetSize]; - std::memset(targetStart, 0, targetSize * sizeof(char)); -- -+ - utf8::utf16to8( sourceStart, sourceStart + size/2, targetStart ); - - std::string result(targetStart); -diff --git a/code/SIB/SIBImporter.cpp b/code/SIB/SIBImporter.cpp -index 20cdc80..46e9a32 100644 ---- a/code/SIB/SIBImporter.cpp -+++ b/code/SIB/SIBImporter.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - # include - #else - //# include "../contrib/ConvertUTF/ConvertUTF.h" --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - #include -@@ -90,10 +90,10 @@ struct SIBChunk { - uint32_t Size; - } PACK_STRUCT; - --enum { -- POS, -- NRM, -- UV, -+enum { -+ POS, -+ NRM, -+ UV, - N - }; - -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 9bb2c69..525a084 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -63,7 +63,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #ifdef ASSIMP_USE_HUNTER - # include - #else --# include "../contrib/utf8cpp/source/utf8.h" -+# include - #endif - #include - #include -diff --git a/contrib/clipper/clipper.hpp b/contrib/clipper/clipper.hpp -index 7cdac6c..2728425 100644 ---- a/contrib/clipper/clipper.hpp -+++ b/contrib/clipper/clipper.hpp -@@ -302,5 +302,3 @@ class clipperException : public std::exception - } //ClipperLib namespace - - #endif //clipper_hpp -- -- -diff --git a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -index 8d25aaa..e4bc306 100644 ---- a/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -+++ b/samples/SimpleTexturedOpenGL/SimpleTexturedOpenGL/src/model_loading.cpp -@@ -19,7 +19,7 @@ - #include - - #define STB_IMAGE_IMPLEMENTATION --#include "contrib/stb_image/stb_image.h" + namespace Assimp { +@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) { + zlib_filefunc_def mapping; + + mapping.zopen_file = (open_file_func)open; ++#ifdef ZOPENDISK64 + mapping.zopendisk_file = (opendisk_file_func)opendisk; ++#endif + mapping.zread_file = (read_file_func)read; + mapping.zwrite_file = (write_file_func)write; + mapping.ztell_file = (tell_file_func)tell; +diff --git a/code/Pbrt/PbrtExporter.cpp b/code/Pbrt/PbrtExporter.cpp +index 9590c49..e23b9b1 100644 +--- a/code/Pbrt/PbrtExporter.cpp ++++ b/code/Pbrt/PbrtExporter.cpp +@@ -83,7 +83,7 @@ Other: + #include + #include + +-#include "stb/stb_image.h" +#include - #include + using namespace Assimp; diff --git a/ports/assimp/irrlicht.patch b/ports/assimp/irrlicht.patch deleted file mode 100644 index 3457056c4f07cc..00000000000000 --- a/ports/assimp/irrlicht.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt -index f5553e5..5cffa0c 100644 ---- a/code/CMakeLists.txt -+++ b/code/CMakeLists.txt -@@ -862,7 +862,7 @@ SET( Extra_SRCS - SOURCE_GROUP( Extra FILES ${Extra_SRCS}) - - # irrXML -- find_package(irrXML CONFIG REQUIRED) -+ find_package(irrlicht CONFIG REQUIRED) - - # polyclipping - find_package(polyclipping CONFIG REQUIRED) -@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC - - TARGET_LINK_LIBRARIES(assimp - polyclipping::polyclipping -- irrXML::irrXML -+ Irrlicht - minizip::minizip - ZLIB::ZLIB - kubazip::kubazip -diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp -index 525a084..0cbca48 100644 ---- a/code/X3D/FIReader.cpp -+++ b/code/X3D/FIReader.cpp -@@ -654,8 +654,8 @@ public: - return currentNodeType; - } - -- virtual int getAttributeCount() const /*override*/ { -- return static_cast(attributes.size()); -+ virtual unsigned int getAttributeCount() const /*override*/ { -+ return static_cast(attributes.size()); - } - - virtual const char* getAttributeName(int idx) const /*override*/ { -@@ -1733,7 +1733,7 @@ public: - return reader->getNodeType(); - } - -- virtual int getAttributeCount() const /*override*/ { -+ virtual unsigned int getAttributeCount() const /*override*/ { - return reader->getAttributeCount(); - } - -diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h -index 77cfd5e..ba584a0 100644 ---- a/include/assimp/irrXMLWrapper.h -+++ b/include/assimp/irrXMLWrapper.h -@@ -133,8 +133,8 @@ public: - - // ---------------------------------------------------------------------------------- - //! Returns size of file in bytes -- virtual int getSize() { -- return (int)data.size(); -+ virtual long getSize() const override { -+ return (long)data.size(); - } - - private: diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 3527124ce163d5..c3083bac4a5559 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -1,51 +1,51 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO assimp/assimp - REF 8f0c6b04b2257a520aaab38421b2e090204b69df # v5.0.1 - SHA512 59b213428e2f7494cb5da423e6b2d51556318f948b00cea420090d74d4f5f0f8970d38dba70cd47b2ef35a1f57f9e15df8597411b6cd8732b233395080147c0f + REF v5.2.4 + SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf HEAD_REF master PATCHES build_fixes.patch - irrlicht.patch + 4542.patch # https://github.com/assimp/assimp/pull/4542 ) -file(REMOVE ${SOURCE_PATH}/cmake-modules/FindZLIB.cmake) -file(REMOVE ${SOURCE_PATH}/cmake-modules/FindIrrXML.cmake) -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/clipper) # https://github.com/assimp/assimp/issues/788 -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/poly2tri) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zlib) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/gtest) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/irrXML) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/rapidjson) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/stb_image) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/zip) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/unzip) -file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/utf8cpp) -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/Open3DGC) #TODO -#file(REMOVE_RECURSE ${SOURCE_PATH}/contrib/openddlparser) #TODO +file(REMOVE "${SOURCE_PATH}/cmake-modules/FindZLIB.cmake") + +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper") # https://github.com/assimp/assimp/issues/788 +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/draco") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/gtest") +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/Open3DGC") #TODO +#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/openddlparser") #TODO +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/poly2tri") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/pugixml") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/rapidjson") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/stb") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/unzip") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/utf8cpp") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/zip") +file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/zlib") set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS") set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ASSIMP_BUILD_SHARED_LIBS) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DASSIMP_BUILD_TESTS=OFF - -DASSIMP_BUILD_ASSIMP_VIEW=OFF - -DASSIMP_BUILD_ZLIB=OFF - -DASSIMP_BUILD_SHARED_LIBS=${ASSIMP_BUILD_SHARED_LIBS} - -DASSIMP_BUILD_ASSIMP_TOOLS=OFF - -DASSIMP_INSTALL_PDB=OFF - -DSYSTEM_IRRXML=ON - -DIGNORE_GIT_HASH=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DASSIMP_BUILD_ZLIB=OFF + -DASSIMP_BUILD_ASSIMP_TOOLS=OFF + -DASSIMP_BUILD_TESTS=OFF + -DASSIMP_WARNINGS_AS_ERRORS=OFF + -DASSIMP_IGNORE_GIT_HASH=ON + -DASSIMP_INSTALL_PDB=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/assimp") + +vcpkg_copy_pdbs() if(VCPKG_TARGET_IS_WINDOWS) - set(VCVER vc140 vc141 vc142 ) + set(VCVER vc140 vc141 vc142 vc143) set(CRT mt md) set(DBG_NAMES) set(REL_NAMES) @@ -67,24 +67,9 @@ if(ASSIMP_DBG) get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}") endif() - -vcpkg_fixup_cmake_targets() vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below -vcpkg_copy_pdbs() - -file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake ASSIMP_CONFIG) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/assimp/assimpConfig.cmake " -include(CMakeFindDependencyMacro) -find_dependency(ZLIB) -find_dependency(irrlicht CONFIG) -find_dependency(polyclipping CONFIG) -find_dependency(minizip CONFIG) -find_dependency(kubazip CONFIG) -find_dependency(poly2tri CONFIG) -find_dependency(utf8cpp CONFIG) -${ASSIMP_CONFIG}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 3e573c17d5ac41..0bffddb843334d 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,18 +1,26 @@ { "name": "assimp", - "version-string": "5.0.1", - "port-version": 5, + "version": "5.2.4", "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", + "license": "BSD-3-Clause", "dependencies": [ - "irrlicht", + "draco", "kubazip", "minizip", "poly2tri", - "polyclipping", + "pugixml", "rapidjson", "stb", "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 5e37676c575113..95815d67196785 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -28,13 +28,10 @@ find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(IRRLICHT_REL NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(IRRLICHT_DBG NAMES Irrlicht PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(POLYCLIPPING_REL NAMES polyclipping PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(POLYCLIPPING_DBG NAMES polyclipping polyclippingd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(PUGIXML_REL NAMES pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PUGIXML_DBG NAMES pugixml pugixmld PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -# poly2tri find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) if(BZ2_REL) @@ -50,7 +47,7 @@ elseif(VCPKG_TARGET_IS_OSX) else() set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") endif() -set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${POLYCLIPPING_REL} ${POLY2TRI_REL} ${IRRLICHT_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") -set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${POLYCLIPPING_DBG} ${POLY2TRI_DBG} ${IRRLICHT_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") +set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${PUGIXML_REL} ${POLY2TRI_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}") +set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${PUGIXML_DBG} ${POLY2TRI_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}") qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG}) diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 7094659eddd22f..4eaf540464860c 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-3d", "version": "5.15.5", + "port-version": 1, "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index b5ea85cc878942..54a01f5cbfc3bc 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtquick3d", "version": "6.3.1", + "port-version": 1, "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, @@ -26,7 +27,6 @@ ], "features": { "assimp": { - "$comment": "feature assimp requires a newer version of assimp than available within vcpkg. Install assimp with e.g. --head or use an overlay", "description": "assimp", "dependencies": [ "assimp" diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index a8986e751c308a..012a0e0c253f5c 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28eaf490bb2eaaf52c344b8e8dc16d4619cb863e", + "version": "5.2.4", + "port-version": 0 + }, { "git-tree": "cab54d6dedc48fcb9642f5fbe079e61105405543", "version-string": "5.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index f2b17f660e1794..334cf9bc4a7ee1 100755 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -201,8 +201,8 @@ "port-version": 1 }, "assimp": { - "baseline": "5.0.1", - "port-version": 5 + "baseline": "5.2.4", + "port-version": 0 }, "asynch": { "baseline": "2019-09-21", @@ -5746,7 +5746,7 @@ }, "qt5-3d": { "baseline": "5.15.5", - "port-version": 0 + "port-version": 1 }, "qt5-activeqt": { "baseline": "5.15.5", @@ -6006,7 +6006,7 @@ }, "qtquick3d": { "baseline": "6.3.1", - "port-version": 0 + "port-version": 1 }, "qtquickcontrols2": { "baseline": "deprecated", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index 71119fd8cf0eab..de753f204df261 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47a71a5fc9720cda647f0d1693f95024b434b5d3", + "version": "5.15.5", + "port-version": 1 + }, { "git-tree": "bdd0dea463c7b380c2747fcd45336712c4a381a5", "version": "5.15.5", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 7b6d067affcc1e..e6c1804bafd855 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd80e49b7976333f599d55bd5b186b2605f17700", + "version": "6.3.1", + "port-version": 1 + }, { "git-tree": "c3b68a69ca91b7485ada2416293d0a9447d0ba95", "version": "6.3.1", From cf287a6af93b2ef71e8c93ca4318048ff6ac98e5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Jul 2022 18:57:40 +0200 Subject: [PATCH 053/791] [vcpkg baseline][tmx] Fix libxml dependency (#25616) * Fix libxml2 dependency * Update versions --- ports/tmx/libxml2.patch | 12 ++++++++++++ ports/tmx/portfile.cmake | 2 ++ ports/tmx/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/t-/tmx.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/tmx/libxml2.patch mode change 100755 => 100644 versions/baseline.json diff --git a/ports/tmx/libxml2.patch b/ports/tmx/libxml2.patch new file mode 100644 index 00000000000000..4c43310be3b4eb --- /dev/null +++ b/ports/tmx/libxml2.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index abb5e18..30b88c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,7 +48,6 @@ else() + message("Zlib not wanted") + endif() + +-include(FindLibXml2) + find_package(LibXml2 REQUIRED) + target_link_libraries(tmx LibXml2::LibXml2) + diff --git a/ports/tmx/portfile.cmake b/ports/tmx/portfile.cmake index ee76169108b2d6..0c96c0eebf666a 100644 --- a/ports/tmx/portfile.cmake +++ b/ports/tmx/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF tmx_1.2.0 HEAD_REF master SHA512 cb29c67af560a1844e798d3fe2677a6b71866943b233c0700212b91de35f252a0a465c33911a2c432aa54be309e3ac10770bc95c6450227e39abe049c1fbbdd1 + PATCHES + libxml2.patch ) vcpkg_cmake_configure( diff --git a/ports/tmx/vcpkg.json b/ports/tmx/vcpkg.json index 764177045fe678..016d673d0109fe 100644 --- a/ports/tmx/vcpkg.json +++ b/ports/tmx/vcpkg.json @@ -1,8 +1,9 @@ { "name": "tmx", "version": "1.2.0", - "port-version": 1, + "port-version": 2, "description": "A portable C library to load tiled maps in your games.", + "license": "BSD-2-Clause", "dependencies": [ "libxml2", { diff --git a/versions/baseline.json b/versions/baseline.json old mode 100755 new mode 100644 index 334cf9bc4a7ee1..5452ea900487cd --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7158,7 +7158,7 @@ }, "tmx": { "baseline": "1.2.0", - "port-version": 1 + "port-version": 2 }, "tmxlite": { "baseline": "1.3.0", diff --git a/versions/t-/tmx.json b/versions/t-/tmx.json index 862004cd4473ae..1f74b06a67d57d 100644 --- a/versions/t-/tmx.json +++ b/versions/t-/tmx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad73505d8e08d0252406303852df5916e44209f6", + "version": "1.2.0", + "port-version": 2 + }, { "git-tree": "1b0ec7979f9a75aab71e9488940a4beff74bd745", "version": "1.2.0", From 087ef910dd5950e7f28489c1747f7601e4648125 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 7 Jul 2022 10:21:54 -0700 Subject: [PATCH 054/791] [protobuf] Update to 3.21.2 (#24400) * [protobuf] Update to 3.20.1 * x-add-version * [protobuf] Fix Linux build error * x-add-version * update protobuf to 3.21.2 and fix build error * x-add-version * Update protobuf.json * add version * x-add-version * fix gazebo build error * x-add-version * update gazebo version * update versions db Co-authored-by: Lily Wang Co-authored-by: Victor Romero --- ports/gazebo/portfile.cmake | 7 ++++ ports/gazebo/vcpkg.json | 2 +- ports/ignition-msgs1/fix-Add_std_string.patch | 29 ++++++++++++++ ports/ignition-msgs1/portfile.cmake | 4 +- ports/ignition-msgs1/vcpkg.json | 4 +- ports/ignition-msgs5/02-Add_std_string.patch | 29 ++++++++++++++ ports/ignition-msgs5/portfile.cmake | 3 +- ports/ignition-msgs5/vcpkg.json | 4 +- ports/ignition-msgs6/01-Add_std_string.patch | 29 ++++++++++++++ ports/ignition-msgs6/portfile.cmake | 3 +- ports/ignition-msgs6/vcpkg.json | 4 +- .../fix-default-proto-file-path.patch | 7 ++-- ports/protobuf/fix-static-build.patch | 39 +++++++------------ ports/protobuf/portfile.cmake | 10 +++-- ports/protobuf/vcpkg.json | 2 +- versions/baseline.json | 10 ++--- versions/g-/gazebo.json | 5 +++ versions/i-/ignition-msgs1.json | 5 +++ versions/i-/ignition-msgs5.json | 5 +++ versions/i-/ignition-msgs6.json | 5 +++ versions/p-/protobuf.json | 5 +++ 21 files changed, 162 insertions(+), 49 deletions(-) create mode 100644 ports/ignition-msgs1/fix-Add_std_string.patch create mode 100644 ports/ignition-msgs5/02-Add_std_string.patch create mode 100644 ports/ignition-msgs6/01-Add_std_string.patch diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake index 859c33d07cbdcc..40de3b16bff7d3 100644 --- a/ports/gazebo/portfile.cmake +++ b/ports/gazebo/portfile.cmake @@ -1,3 +1,9 @@ +vcpkg_download_distfile(gazebo3211 + URLS "https://patch-diff.githubusercontent.com/raw/osrf/gazebo/pull/3211.diff" + FILENAME "gazebo3211.diff" + SHA512 761e254866d4705acc0b81479285f979c436b3b611739a207a575031d8a8daba48de4fc0c8de5edb9a9f89725586c5caeef9e6e1e3d63a2d961ca09df974f7de +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/gazebo @@ -6,6 +12,7 @@ vcpkg_from_github( HEAD_REF gazebo11 PATCHES 0001-Fix-deps.patch + ${gazebo3211} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json index 23b9103c32ce2e..30b8dac5baac5b 100644 --- a/ports/gazebo/vcpkg.json +++ b/ports/gazebo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gazebo", "version-date": "2022-01-20", - "port-version": 2, + "port-version": 3, "description": "Open source robotics simulator.", "homepage": "http://gazebosim.org", "license": "Apache-2.0", diff --git a/ports/ignition-msgs1/fix-Add_std_string.patch b/ports/ignition-msgs1/fix-Add_std_string.patch new file mode 100644 index 00000000000000..8b20e43376ddc5 --- /dev/null +++ b/ports/ignition-msgs1/fix-Add_std_string.patch @@ -0,0 +1,29 @@ +diff --git a/include/ignition/msgs/Generator.hh b/include/ignition/msgs/Generator.hh +index 62d77c6..5785e51 100644 +--- a/include/ignition/msgs/Generator.hh ++++ b/include/ignition/msgs/Generator.hh +@@ -43,9 +43,9 @@ class Generator : public CodeGenerator + /// \param[in] _generatorContext Output directory. + /// \param[in] _error Unused string value + public: virtual bool Generate(const FileDescriptor *_file, +- const string &_parameter, ++ const std::string &_parameter, + OutputDirectory *_generatorContext, +- string *_error) const; ++ std::string *_error) const; + + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); + }; +diff --git a/src/Generator.cc b/src/Generator.cc +index f703fb8..922d637 100644 +--- a/src/Generator.cc ++++ b/src/Generator.cc +@@ -67,7 +67,7 @@ Generator::~Generator() + + ///////////////////////////////////////////////// + bool Generator::Generate(const FileDescriptor *_file, +- const string &/*_parameter*/, ++ const std::string &/*_parameter*/, + OutputDirectory *_generatorContext, + std::string * /*_error*/) const + { diff --git a/ports/ignition-msgs1/portfile.cmake b/ports/ignition-msgs1/portfile.cmake index fd8d1a227c0319..058c5996cad425 100644 --- a/ports/ignition-msgs1/portfile.cmake +++ b/ports/ignition-msgs1/portfile.cmake @@ -18,4 +18,6 @@ ignition_modular_library(NAME msgs REF ignition-msgs_1.0.0 SHA512 18475cc76cc3b58e451faf7a57a0145a9b419cf3e4312627202d96982b066df48cbabcc9991b79a176c5180b90f019dc30114286ad5562c483759052cf63d945 # Fix linking order of protobuf libraries (backport of https://bitbucket.org/ignitionrobotics/ign-msgs/pull-requests/151) - PATCHES fix-protobuf-static-link-order.patch) + PATCHES + fix-protobuf-static-link-order.patch + fix-Add_std_string.patch) diff --git a/ports/ignition-msgs1/vcpkg.json b/ports/ignition-msgs1/vcpkg.json index cdbb4a9dc32e25..903b1fcebe8633 100644 --- a/ports/ignition-msgs1/vcpkg.json +++ b/ports/ignition-msgs1/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ignition-msgs1", "version": "1.0.0", - "port-version": 5, + "port-version": 6, "description": "Middleware protobuf messages for robotics", - "license": null, + "license": "Apache-2.0", "dependencies": [ "ignition-cmake0", "ignition-math4", diff --git a/ports/ignition-msgs5/02-Add_std_string.patch b/ports/ignition-msgs5/02-Add_std_string.patch new file mode 100644 index 00000000000000..1bf22e3dff1867 --- /dev/null +++ b/ports/ignition-msgs5/02-Add_std_string.patch @@ -0,0 +1,29 @@ +diff --git a/src/Generator.cc b/src/Generator.cc +index 3729ad4..099a46b 100644 +--- a/src/Generator.cc ++++ b/src/Generator.cc +@@ -67,7 +67,7 @@ Generator::~Generator() + + ///////////////////////////////////////////////// + bool Generator::Generate(const FileDescriptor *_file, +- const string &/*_parameter*/, ++ const std::string &/*_parameter*/, + OutputDirectory *_generatorContext, + std::string * /*_error*/) const + { +diff --git a/src/Generator.hh b/src/Generator.hh +index c0f2336..6132274 100644 +--- a/src/Generator.hh ++++ b/src/Generator.hh +@@ -44,9 +44,9 @@ class Generator : public CodeGenerator + /// \param[in] _generatorContext Output directory. + /// \param[in] _error Unused string value + public: virtual bool Generate(const FileDescriptor *_file, +- const string &_parameter, ++ const std::string &_parameter, + OutputDirectory *_generatorContext, +- string *_error) const; ++ std::string *_error) const; + + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); + }; diff --git a/ports/ignition-msgs5/portfile.cmake b/ports/ignition-msgs5/portfile.cmake index 0a5dd24309fb0d..494a71795f2ee4 100644 --- a/ports/ignition-msgs5/portfile.cmake +++ b/ports/ignition-msgs5/portfile.cmake @@ -5,4 +5,5 @@ ignition_modular_library(NAME msgs VERSION "5.3.0" SHA512 645ae5317fb4c3c1b452e98c3581363fc939b5b963dae8a2097bcee97584819bd80357397d88728c5917142dd4ac9beecc335862df44fc06a46d8aa62c54e389 PATCHES - "01-protobuf.patch") + "01-protobuf.patch" + "02-Add_std_string.patch") diff --git a/ports/ignition-msgs5/vcpkg.json b/ports/ignition-msgs5/vcpkg.json index 0614ee322b87df..d5cb928c7729a7 100644 --- a/ports/ignition-msgs5/vcpkg.json +++ b/ports/ignition-msgs5/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ignition-msgs5", "version": "5.3.0", - "port-version": 5, + "port-version": 6, "description": "Middleware protobuf messages for robotics", - "license": null, + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ "ignition-cmake2", diff --git a/ports/ignition-msgs6/01-Add_std_string.patch b/ports/ignition-msgs6/01-Add_std_string.patch new file mode 100644 index 00000000000000..609d4ce38ab8bf --- /dev/null +++ b/ports/ignition-msgs6/01-Add_std_string.patch @@ -0,0 +1,29 @@ +diff --git a/src/Generator.cc b/src/Generator.cc +index d490b5a..4265845 100644 +--- a/src/Generator.cc ++++ b/src/Generator.cc +@@ -67,7 +67,7 @@ Generator::~Generator() + + ///////////////////////////////////////////////// + bool Generator::Generate(const FileDescriptor *_file, +- const string &/*_parameter*/, ++ const std::string &/*_parameter*/, + OutputDirectory *_generatorContext, + std::string * /*_error*/) const + { +diff --git a/src/Generator.hh b/src/Generator.hh +index c0f2336..6132274 100644 +--- a/src/Generator.hh ++++ b/src/Generator.hh +@@ -44,9 +44,9 @@ class Generator : public CodeGenerator + /// \param[in] _generatorContext Output directory. + /// \param[in] _error Unused string value + public: virtual bool Generate(const FileDescriptor *_file, +- const string &_parameter, ++ const std::string &_parameter, + OutputDirectory *_generatorContext, +- string *_error) const; ++ std::string *_error) const; + + // private: GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator); + }; diff --git a/ports/ignition-msgs6/portfile.cmake b/ports/ignition-msgs6/portfile.cmake index c7b6967060e251..7b2e50932a2b01 100644 --- a/ports/ignition-msgs6/portfile.cmake +++ b/ports/ignition-msgs6/portfile.cmake @@ -3,4 +3,5 @@ ignition_modular_library(NAME msgs VERSION "6.0.0" - SHA512 d7b76b61d37bc4bb2fd1319e2e2d8313fbcc52f51253b7c487bcdb7dabffcf50653fc5c709eb356d8b6ae20500c1fd32ffabc1fcfb28dd14346a10030fb6cd46) + SHA512 d7b76b61d37bc4bb2fd1319e2e2d8313fbcc52f51253b7c487bcdb7dabffcf50653fc5c709eb356d8b6ae20500c1fd32ffabc1fcfb28dd14346a10030fb6cd46 + PATCHES 01-Add_std_string.patch) diff --git a/ports/ignition-msgs6/vcpkg.json b/ports/ignition-msgs6/vcpkg.json index 9e8b193ec22de3..715b1ad12ce961 100644 --- a/ports/ignition-msgs6/vcpkg.json +++ b/ports/ignition-msgs6/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ignition-msgs6", "version": "6.0.0", - "port-version": 4, + "port-version": 5, "description": "Middleware protobuf messages for robotics", - "license": null, + "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ "ignition-cmake2", diff --git a/ports/protobuf/fix-default-proto-file-path.patch b/ports/protobuf/fix-default-proto-file-path.patch index a5af918b32786c..1c850b1dec2b97 100644 --- a/ports/protobuf/fix-default-proto-file-path.patch +++ b/ports/protobuf/fix-default-proto-file-path.patch @@ -1,11 +1,12 @@ diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc -index f192ae6..22900ed 100644 +index 5e9a2c4..8eaa6e0 100644 --- a/src/google/protobuf/compiler/command_line_interface.cc +++ b/src/google/protobuf/compiler/command_line_interface.cc -@@ -260,11 +260,15 @@ void AddDefaultProtoPaths( +@@ -261,12 +261,15 @@ void AddDefaultProtoPaths( + std::pair("", path + "/include")); return; } - // Check if the upper level directory has an "include" subdirectory. +- // Check if the upper level directory has an "include" subdirectory. + // change "'$/bin' is next to 'include'" assumption to "'$/bin/tools' is next to 'include'" + for (int i = 0; i < 2; i++) + { diff --git a/ports/protobuf/fix-static-build.patch b/ports/protobuf/fix-static-build.patch index d0e3ae010daf18..496c6c4d50524b 100644 --- a/ports/protobuf/fix-static-build.patch +++ b/ports/protobuf/fix-static-build.patch @@ -1,26 +1,13 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 51e8478..64347c4 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -182,7 +182,7 @@ else (protobuf_BUILD_SHARED_LIBS) - # making programmatic control difficult. Prefer the functionality in newer - # CMake versions when available. - if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) -- set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) -+ - else() - # In case we are building static libraries, link also the runtime library statically - # so that MSVCR*.DLL is not required at runtime. -diff --git a/cmake/install.cmake b/cmake/install.cmake -index 4e1c5de..d3aa865 100644 ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -32,7 +32,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) - install(TARGETS protoc EXPORT protobuf-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) -- if (UNIX AND NOT APPLE) -+ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) - set_property(TARGET protoc - PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") - elseif (APPLE) +diff --git a/cmake/install.cmake b/cmake/install.cmake +index 825cb25..4f453d6 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -32,7 +32,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) + install(TARGETS protoc EXPORT protobuf-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +- if (UNIX AND NOT APPLE) ++ if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) + set_property(TARGET protoc + PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") + elseif (APPLE) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 205cf7cd74353f..7c05a7edca09da 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -1,8 +1,10 @@ +set(version 3.21.2) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF v3.19.4 - SHA512 2653b9852e5ac69f1de9b6ac02887c366aa0a9efd2b29e53135f61a9a10f5a1b5853a8c4cbb3658f519dfdbde9f32c547c39751ab417f123162b08be9e76c9e1 + REF 839b18b1ba42639fedecfd751102afcc5736b5d4 #v3.21.2 + SHA512 41503e70094ea6a8355c3ef16cfd998b38edb99f3d98e27be197583d42933a6805566e3efc7311af7453bb3d40d51eb589c67324676a31ec86b3ce80000bcb98 HEAD_REF master PATCHES fix-static-build.patch @@ -31,7 +33,7 @@ if (VCPKG_DOWNLOAD_MODE) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH}/cmake + SOURCE_PATH "${SOURCE_PATH}/cmake" OPTIONS -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS} -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME} @@ -77,7 +79,7 @@ if(protobuf_BUILD_PROTOC_BINARIES) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) else() - vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.19.4.0 AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES protoc protoc-${version}.0 AUTO_CLEAN) endif() else() file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 3eaa26fc545522..90901a03f491db 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "protobuf", - "version-semver": "3.19.4", + "version-semver": "3.21.2", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 5452ea900487cd..9d6f09c6cfbe1b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2458,7 +2458,7 @@ }, "gazebo": { "baseline": "2022-01-20", - "port-version": 2 + "port-version": 3 }, "gcem": { "baseline": "1.14.1", @@ -2914,15 +2914,15 @@ }, "ignition-msgs1": { "baseline": "1.0.0", - "port-version": 5 + "port-version": 6 }, "ignition-msgs5": { "baseline": "5.3.0", - "port-version": 5 + "port-version": 6 }, "ignition-msgs6": { "baseline": "6.0.0", - "port-version": 4 + "port-version": 5 }, "ignition-plugin1": { "baseline": "1.1.0", @@ -5637,7 +5637,7 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.19.4", + "baseline": "3.21.2", "port-version": 0 }, "protobuf-c": { diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json index 8468bccec3fed7..202e801f08c750 100644 --- a/versions/g-/gazebo.json +++ b/versions/g-/gazebo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "094ba2b47c08f30d45b33081f8b2b3790b2ec070", + "version-date": "2022-01-20", + "port-version": 3 + }, { "git-tree": "324403bb31aad7705e0f444e9c49f2b11417b9b0", "version-date": "2022-01-20", diff --git a/versions/i-/ignition-msgs1.json b/versions/i-/ignition-msgs1.json index 2c09e9871df25d..89799ae235d135 100644 --- a/versions/i-/ignition-msgs1.json +++ b/versions/i-/ignition-msgs1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61644519b91178792399cda9a6f03cb8d7651eaf", + "version": "1.0.0", + "port-version": 6 + }, { "git-tree": "b906441e45012934421ddd0ad823bb7324939dd8", "version": "1.0.0", diff --git a/versions/i-/ignition-msgs5.json b/versions/i-/ignition-msgs5.json index f872442a4f7752..8276981c24fcf9 100644 --- a/versions/i-/ignition-msgs5.json +++ b/versions/i-/ignition-msgs5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7de105c1d93f5c86e6ee624d65fe1bd8d9a2beb", + "version": "5.3.0", + "port-version": 6 + }, { "git-tree": "ca89a878842c0d94483430295c59f9c24eb607bb", "version": "5.3.0", diff --git a/versions/i-/ignition-msgs6.json b/versions/i-/ignition-msgs6.json index 385aac055b8c95..2b167f3bdcc060 100644 --- a/versions/i-/ignition-msgs6.json +++ b/versions/i-/ignition-msgs6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "809e114122aec8103638b9c376b883f59376b1a1", + "version": "6.0.0", + "port-version": 5 + }, { "git-tree": "a15e3cd08c8481cb639dc9b741ea55df597f6cf8", "version": "6.0.0", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index fab9f2a6725b0e..9cb285b33259ea 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ae2a5d57f7d3bf934e4d773406cd0a323600031", + "version-semver": "3.21.2", + "port-version": 0 + }, { "git-tree": "984039810172eb397ca0ec6d426d60764d6dfe46", "version-semver": "3.19.4", From 0e4f9d4d1d89077f4a520d09165fb06a484c7eeb Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Fri, 8 Jul 2022 05:10:14 +0800 Subject: [PATCH 055/791] [pcre] Fix build failure for loongarch64 cpu (#25617) * Fix build failure for loongarch64 cpu. * update port version database. Co-authored-by: Jamlys Lee --- ports/pcre/portfile.cmake | 7 ++++++- ports/pcre/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pcre.json | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index ca1176fc2ff666..20347bcdef2895 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -19,6 +19,11 @@ vcpkg_from_sourceforge( PATCHES ${PATCHES} ) +set(IS_PCRE_SUPPORT_JIT YES) +if(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch") + set(IS_PCRE_SUPPORT_JIT NO) +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -27,7 +32,7 @@ vcpkg_cmake_configure( -DPCRE_BUILD_PCRE32=YES -DPCRE_BUILD_PCRE16=YES -DPCRE_BUILD_PCRE8=YES - -DPCRE_SUPPORT_JIT=YES + -DPCRE_SUPPORT_JIT=${IS_PCRE_SUPPORT_JIT} -DPCRE_SUPPORT_UTF=YES -DPCRE_SUPPORT_UNICODE_PROPERTIES=YES # optional dependencies for PCREGREP diff --git a/ports/pcre/vcpkg.json b/ports/pcre/vcpkg.json index 4c3f8dcb4b862d..ae2ee42494cb2b 100644 --- a/ports/pcre/vcpkg.json +++ b/ports/pcre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcre", "version": "8.45", - "port-version": 3, + "port-version": 4, "description": "Perl Compatible Regular Expressions", "homepage": "https://www.pcre.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9d6f09c6cfbe1b..791a10a277c3b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5398,7 +5398,7 @@ }, "pcre": { "baseline": "8.45", - "port-version": 3 + "port-version": 4 }, "pcre2": { "baseline": "10.40", diff --git a/versions/p-/pcre.json b/versions/p-/pcre.json index acbf3b73298ed6..44f92166cef5f1 100644 --- a/versions/p-/pcre.json +++ b/versions/p-/pcre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50ec11ace2145fac2b0b01dae365a6764f716c6e", + "version": "8.45", + "port-version": 4 + }, { "git-tree": "e8f61fdc5d1286667a8e14eb9521500b882394ad", "version": "8.45", From 4f0bb16fcdf440c7b177d17e419555c5787a25bf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Jul 2022 23:15:53 +0200 Subject: [PATCH 056/791] [cairo] Fix mingw-dynamic builds (#25606) * Fix mingw-dynamic builds * Trim portfile * Update versions --- ports/cairo/mingw-dllexport.patch | 13 +++++++++++++ ports/cairo/portfile.cmake | 9 +-------- ports/cairo/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/c-/cairo.json | 5 +++++ 5 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 ports/cairo/mingw-dllexport.patch diff --git a/ports/cairo/mingw-dllexport.patch b/ports/cairo/mingw-dllexport.patch new file mode 100644 index 00000000000000..8a9bbd78642f31 --- /dev/null +++ b/ports/cairo/mingw-dllexport.patch @@ -0,0 +1,13 @@ +diff --git a/src/cairoint.h b/src/cairoint.h +index cfa77dd..fbc0776 100644 +--- a/src/cairoint.h ++++ b/src/cairoint.h +@@ -48,7 +48,7 @@ + + #include "config.h" + +-#ifdef _MSC_VER ++#ifdef _WIN32 + #define cairo_public __declspec(dllexport) + #endif + diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 2a7390d8287b7f..02d11851124a35 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -1,5 +1,3 @@ -set(CAIRO_VERSION 1.17.4) - vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH @@ -10,6 +8,7 @@ vcpkg_from_gitlab( PATCHES cairo_static_fix.patch disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 + mingw-dllexport.patch ) if("fontconfig" IN_LIST FEATURES) @@ -25,9 +24,6 @@ else() endif() if ("x11" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature x11 only support UNIX.") - endif() message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") list(APPEND OPTIONS -Dxlib=enabled) else() @@ -37,9 +33,6 @@ list(APPEND OPTIONS -Dxcb=disabled) list(APPEND OPTIONS -Dxlib-xcb=disabled) if("gobject" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Feature gobject currently only supports dynamic build.") - endif() list(APPEND OPTIONS -Dglib=enabled) else() list(APPEND OPTIONS -Dglib=disabled) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index f503956c58ea7a..c185a2915e56dc 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.6", - "port-version": 2, + "port-version": 3, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "MPL-1.1", @@ -42,7 +42,8 @@ ] }, "x11": { - "description": "build with x11 support" + "description": "build with x11 support", + "supports": "!windows" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 791a10a277c3b8..af9d7b023a0ce2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1242,7 +1242,7 @@ }, "cairo": { "baseline": "1.17.6", - "port-version": 2 + "port-version": 3 }, "cairomm": { "baseline": "1.16.1", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index b4a94e391b9809..b59decf711f12f 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c339d543f41d311c7d4282ca1efa4e400eb30b73", + "version": "1.17.6", + "port-version": 3 + }, { "git-tree": "63bc79e8f9980f2b780bb296d96bfc3221dba137", "version": "1.17.6", From 526f862b7a7838ca79c8cfde40258d2bd74abdd1 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Fri, 8 Jul 2022 05:17:10 +0800 Subject: [PATCH 057/791] [ffmpeg] Fix failure of cross-compiling for ffmpeg due to use inappropriate strip. (#25596) * Fix failure of cross-compiling for ffmpeg due to use inappropriate strip. * Update port version of ffmpeg. * Remove redundant adjust condition. * Update version database Co-authored-by: Jamlys Lee --- ports/ffmpeg/portfile.cmake | 7 +++++++ ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 76cc00805ecc71..47296865a3e640 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -96,6 +96,8 @@ if(VCPKG_TARGET_IS_MINGW) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") string(APPEND OPTIONS " --target-os=mingw64") endif() +elseif(VCPKG_TARGET_IS_LINUX) + string(APPEND OPTIONS " --target-os=linux") elseif(VCPKG_TARGET_IS_WINDOWS) string(APPEND OPTIONS " --target-os=win32") elseif(VCPKG_TARGET_IS_OSX) @@ -458,6 +460,11 @@ endif() set(OPTIONS_CROSS " --enable-cross-compile") +# ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling. +if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "(/.+)gcc$") + string(APPEND OPTIONS_CROSS " --cross-prefix=${CMAKE_MATCH_1}") +endif() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") string(APPEND OPTIONS_CROSS " --arch=x86_64") else() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index b179216734c5b2..4d1444cfbc2e2c 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 13, + "port-version": 14, "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." diff --git a/versions/baseline.json b/versions/baseline.json index af9d7b023a0ce2..6f567aacc10985 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2234,7 +2234,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 13 + "port-version": 14 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a78b82a214556c..7579ec1bf4305c 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd232549fb2bcffed0dcfac1e7e6a54f5a91b5cc", + "version": "4.4.1", + "port-version": 14 + }, { "git-tree": "ad64f5ffe64b5fcd97e2e6d98273b70d498d6af0", "version": "4.4.1", From a7f0aca862e4557c3cb5998892fd260694a43176 Mon Sep 17 00:00:00 2001 From: Luiz Date: Thu, 7 Jul 2022 18:19:24 -0300 Subject: [PATCH 058/791] [json-c] Updated to the version 2022-06-22 (#25565) * [json-c] Updated to the latest version * [json-c] Change * [json-c] Fixes * [json-c] Changes that have been requested * [json-c] Formatted and x-add-version * [json-c] Changes that have been requested * [json-c] Changes that have been requested * [json-c] Fix SHA --- ports/json-c/portfile.cmake | 17 ++++++++--------- ports/json-c/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/j-/json-c.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake index d0893ebee9e4df..85367d692eb63b 100644 --- a/ports/json-c/portfile.cmake +++ b/ports/json-c/portfile.cmake @@ -1,24 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO json-c/json-c - REF eae040a84a479ccad1d1c48314345c51ecf1a4a4 - SHA512 18d8a31b341830b04676cad13fbc0608fb75a323522161ac8fd0bb5058db82c1c261d504696a1e12f4b03eb0967632885580ff81d808adf2f1dff7e32d131ba0 + REF d28ac67dde77566f53a97f22b4ea7cb36afe6582 + SHA512 30063c8e32eb82e170647363055119f2f7eab19e1c3152673b966f41ed07e0349c3d6141b215b9912f9e84c2e06677b3d7ac949f720c7ebc2c95d692dc3881fe HEAD_REF master PATCHES pkgconfig.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/json-c/vcpkg.json b/ports/json-c/vcpkg.json index ff61b336e01403..e4b60295abd6e2 100644 --- a/ports/json-c/vcpkg.json +++ b/ports/json-c/vcpkg.json @@ -1,7 +1,17 @@ { "name": "json-c", - "version-string": "2019-09-10", - "port-version": 2, + "version-date": "2022-06-26", "description": "A JSON implementation in C", - "homepage": "https://github.com/json-c/json-c" + "homepage": "https://github.com/json-c/json-c", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6f567aacc10985..fb686dd0137930 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3089,8 +3089,8 @@ "port-version": 1 }, "json-c": { - "baseline": "2019-09-10", - "port-version": 2 + "baseline": "2022-06-26", + "port-version": 0 }, "json-dto": { "baseline": "0.3.1", diff --git a/versions/j-/json-c.json b/versions/j-/json-c.json index 34a233e6d34b30..4dfac56a305ec9 100644 --- a/versions/j-/json-c.json +++ b/versions/j-/json-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84aaadc268ad278e102cdd7e9526e5c5929c1cd6", + "version-date": "2022-06-26", + "port-version": 0 + }, { "git-tree": "5c8d00d59a40b54cc9400f045b62e439740c2909", "version-string": "2019-09-10", From fb3190dcc5203da220d34de48d8c294f752198e2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Jul 2022 23:27:38 +0200 Subject: [PATCH 059/791] [vcpkg script] Test pkg-config integration (#25531) * Require cmake-user to pass CI * Update baseline state documentation * Test pkg-config integration * Prefer pkgconf * Make pkgconf required --- scripts/ci.baseline.txt | 23 +++++++++++++++---- scripts/test_ports/cmake-user/portfile.cmake | 3 +++ .../cmake-user/project/CMakeLists.txt | 1 + .../project/FindZLIBviaPkgConfig.cmake | 11 +++++++++ scripts/test_ports/cmake-user/vcpkg.json | 15 ++++++++++-- 5 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 299b8ff4d991b7..1d1447834c1eb6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -2,13 +2,18 @@ ## This file defines the current expected build state of ports in CI. ## ## States -## pass - (default) the port builds in the CI system. If a port is -## missing from this file then it is assumed to build. -## fail - the port does not build in the CI system. +## (default) - +## If a port is missing from this file then it is assumed +## to build successfully if not blocked by a dependency. +## pass - The port must build successfully in the CI system. It is a hard +## error if the port build is blocked by a failed dependency. +## fail - The port build is expected to fail in the CI system. ## This is not necessarily the same as if a port is expected to build ## on a developers machine because it may fail due to the machine -## configuration. When set to fail the CI system will still attempt -## to build the port and will report a CI failure until this file is updated. +## configuration. When set to fail the CI system will silently skip +## the port for pull request CI runs. But the CI system will still +## attempt to build the port in scheduled runs, reporting unexpected +## build success as a CI failure. ## skip - Do not build this port in the CI system. ## This is added to ports that may be flaky or conflict with other ## ports. Please comment for why a port is skipped so it can be @@ -1223,6 +1228,14 @@ angle:x64-uwp=fail angle:arm64-windows=fail angle:arm-uwp=fail +cmake-user:arm-uwp=pass +cmake-user:arm64-windows=pass +cmake-user:x64-linux=pass +cmake-user:x64-osx=pass +cmake-user:x64-windows-static-md=pass +cmake-user:x64-windows-static=pass +cmake-user:x64-windows=pass +cmake-user:x86-windows=pass vcpkg-ci-boost:x64-linux=pass vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index 66ff26c2dfca5d..b3b93419fc4725 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -85,6 +85,9 @@ function(get_packages out_packages cmake_version) endforeach() endif() endif() + if("pkg-check-modules" IN_LIST FEATURES) + list(APPEND packages "ZLIBviaPkgConfig") + endif() set("${out_packages}" "${packages}" PARENT_SCOPE) endfunction() diff --git a/scripts/test_ports/cmake-user/project/CMakeLists.txt b/scripts/test_ports/cmake-user/project/CMakeLists.txt index e2a9a86f3bbcae..5ce488701f4e8c 100644 --- a/scripts/test_ports/cmake-user/project/CMakeLists.txt +++ b/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -44,6 +44,7 @@ install(TARGETS exe lib # find_package overload and wrapper set(FIND_PACKAGES "" CACHE STRING "List of packages to be found and used") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") foreach(package ${FIND_PACKAGES}) string(TOUPPER "${package}" package_upper) set(CMAKE_FIND_DEBUG_MODE ON) diff --git a/scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake b/scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake new file mode 100644 index 00000000000000..5f46a943d59c66 --- /dev/null +++ b/scripts/test_ports/cmake-user/project/FindZLIBviaPkgConfig.cmake @@ -0,0 +1,11 @@ +# `pkgconf` is not recognized before CMake 3.22 +find_program(PKG_CONFIG_EXECUTABLE NAMES pkgconf REQUIRED) +find_package(PkgConfig REQUIRED) +pkg_check_modules(PC_ZLIB zlib) +if(PC_ZLIB_FOUND) + if(NOT PC_ZLIB_LDFLAGS) + message(SEND_ERROR "ZLIBviaPkgConfig_LIBRARIES is empty") + endif() + set(ZLIBviaPkgConfig_LIBRARIES "${PC_ZLIB_LDFLAGS}") + set(ZLIBviaPkgConfig_FOUND "${PC_ZLIB_FOUND}") +endif() diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index e386f672912bac..70d44b9f3a41e0 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cmake-user", - "version-date": "2022-06-11", + "version-date": "2022-07-02", "description": "Test port to verify the vcpkg toolchain in cmake user projects", "license": "MIT", "default-features": [ @@ -15,7 +15,8 @@ "default-features": false, "features": [ "cmake-current", - "find-package" + "find-package", + "pkg-check-modules" ] }, { @@ -128,6 +129,16 @@ "name": "zlib" } ] + }, + "pkg-check-modules": { + "description": "Test `find_package(PkgConfig)` and pkg_check_modules(...)", + "dependencies": [ + { + "name": "pkgconf", + "host": true + }, + "zlib" + ] } } } From 5955c45dcfbea4d4096f97ff29cebf24146b39dc Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 8 Jul 2022 00:28:29 +0300 Subject: [PATCH 060/791] [boost-regex] Fix icu feature (#25505) Explicitly disable icu feature if not selected in vcpkg Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> Co-authored-by: JackBoosY --- ports/boost-regex/b2-options.cmake | 2 ++ ports/boost-regex/vcpkg.json | 1 + versions/b-/boost-regex.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/boost-regex/b2-options.cmake b/ports/boost-regex/b2-options.cmake index ecbbcf974b8d2a..70597a0daadcb5 100644 --- a/ports/boost-regex/b2-options.cmake +++ b/ports/boost-regex/b2-options.cmake @@ -3,4 +3,6 @@ if("icu" IN_LIST FEATURES) if(APPLE) list(APPEND B2_OPTIONS cxxstd=11) endif() +else() + list(APPEND B2_OPTIONS --disable-icu) endif() diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 22e24b79401dc1..6648cb9e7bb2cf 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-regex", "version": "1.79.0", + "port-version": 1, "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "license": "BSL-1.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 22ea1104eb2753..0ccbe805f8f768 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49b26b133e2b9eb16d917930b2c697b58eff5530", + "version": "1.79.0", + "port-version": 1 + }, { "git-tree": "a10bdc49cf30856030ed08921a5a30f3c3f3bdb1", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index fb686dd0137930..5ff5caa94a3d2b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -978,7 +978,7 @@ }, "boost-regex": { "baseline": "1.79.0", - "port-version": 0 + "port-version": 1 }, "boost-safe-numerics": { "baseline": "1.79.0", From b01fbe8d6f1dcdd386971b9670a1d583377b94d5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Jul 2022 23:33:38 +0200 Subject: [PATCH 061/791] [tidy-html5] Update to 5.8.0, dynamic linkage, unique link lib name (#25478) * Update to 5.8.0 * Revise portfile * Disable doc * Enable shared linkage * Fix debug pc file * Fix PDB installation * Update versions * Revert lost version --- ports/tidy-html5/debug-postfix.patch | 25 ++++++++++++++++++ ports/tidy-html5/disable-doc.patch | 13 ++++++++++ ports/tidy-html5/portfile.cmake | 33 +++++++++++------------- ports/tidy-html5/static-vs-shared.patch | 34 +++++++++++++++++++++++++ ports/tidy-html5/vcpkg.json | 9 ++----- versions/baseline.json | 4 +-- versions/t-/tidy-html5.json | 5 ++++ 7 files changed, 96 insertions(+), 27 deletions(-) create mode 100644 ports/tidy-html5/debug-postfix.patch create mode 100644 ports/tidy-html5/disable-doc.patch create mode 100644 ports/tidy-html5/static-vs-shared.patch diff --git a/ports/tidy-html5/debug-postfix.patch b/ports/tidy-html5/debug-postfix.patch new file mode 100644 index 00000000000000..2c882f09aa46fc --- /dev/null +++ b/ports/tidy-html5/debug-postfix.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 979ae25..4eb88a1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -210,7 +210,9 @@ if(WIN32 AND MSVC) + set( MSVC_FLAGS "-DNOMINMAX -D_USE_MATH_DEFINES -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D__CRT_NONSTDC_NO_WARNINGS" ) + + # to distinguish between debug and release lib in windows ++ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set( CMAKE_DEBUG_POSTFIX "d" ) # little effect in unix ++ endif() + else() + # add any gcc flags + endif() +diff --git a/tidy.pc.cmake.in b/tidy.pc.cmake.in +index 7d819f1..cbdd299 100644 +--- a/tidy.pc.cmake.in ++++ b/tidy.pc.cmake.in +@@ -7,5 +7,5 @@ Name: @LIB_NAME@ + Description: @LIBTIDY_DESCRIPTION@ + URL: @LIBTIDY_URL@ + Version: @LIBTIDY_VERSION@ +-Libs: -L${libdir} -l@LIB_NAME@ ++Libs: -L${libdir} -l@LIB_NAME@@CMAKE_DEBUG_POSTFIX@ + Cflags: -I${includedir} diff --git a/ports/tidy-html5/disable-doc.patch b/ports/tidy-html5/disable-doc.patch new file mode 100644 index 00000000000000..105c766853075c --- /dev/null +++ b/ports/tidy-html5/disable-doc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8efec25..d2edac2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -508,7 +508,7 @@ endif () + # Create man pages + ################################################# + +-if (UNIX AND SUPPORT_CONSOLE_APP) ++if (0) + find_program( XSLTPROC_FOUND xsltproc ) + if (XSLTPROC_FOUND) + ## NOTE: man name must match exe ie currently `${LIB_NAME}.1` not `tidy.1` diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake index 40bdbb35c6b944..504e94807b8491 100644 --- a/ports/tidy-html5/portfile.cmake +++ b/ports/tidy-html5/portfile.cmake @@ -1,35 +1,32 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO htacg/tidy-html5 - REF d1b906991a7587688d384b648c55731f9be52506 - SHA512 ac1229f95db9ab6367d7650e27b87e76a0874e01c9d404e8c5fb75ba2761318218b658a4f7522188fda8008974393a333a8a5fbed8e3a472c98445f13e459ad5 + REF 5.8.0 + SHA512 f352165bdda5d1fca7bba3365560b64d6f70a4e010821cd246cde43bed5c23cea3408d461d3f889110fd35ec9b68aa2b4e95412b07775eb852b7ee1745007a44 HEAD_REF master + PATCHES + disable-doc.patch + static-vs-shared.patch + debug-postfix.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIB) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" NO_CHARSET_FLAG OPTIONS - -DBUILD_SHARED_LIB=OFF - -DTIDY_CONSOLE_SHARED=OFF + -DBUILD_SHARED_LIB=${BUILD_SHARED_LIB} + -DTIDY_CONSOLE_SHARED=${BUILD_SHARED_LIB} ) -vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt") vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd.exe") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd") +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin/tidyd${VCPKG_TARGET_EXECUTABLE_SUFFIX}" +) vcpkg_copy_tools(TOOL_NAMES tidy AUTO_CLEAN) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - file(INSTALL "${SOURCE_PATH}/README/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_fixup_pkgconfig() diff --git a/ports/tidy-html5/static-vs-shared.patch b/ports/tidy-html5/static-vs-shared.patch new file mode 100644 index 00000000000000..92b6c8e92133d4 --- /dev/null +++ b/ports/tidy-html5/static-vs-shared.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2edac2..979ae25 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,11 +395,11 @@ endif () + + #------------------------------------------------------------------------ + # Static Library +-# The static library always builds. ++if(NOT BUILD_SHARED_LIB) + #------------------------------------------------------------------------ + set(name tidy-static) + add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} ) +-if (WIN32) ++if (0) + set_target_properties( ${name} PROPERTIES + OUTPUT_NAME ${LIB_NAME}_static ) + else () +@@ -415,12 +415,14 @@ install(TARGETS ${name} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ) +-install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} ) + if(MSVC) + # install(FILES $ DESTINATION lib OPTIONAL) + INSTALL(FILES ${PROJECT_BINARY_DIR}/${name}.dir/Debug/${name}.pdb ++ OPTIONAL + DESTINATION lib CONFIGURATIONS Debug ) + endif() ++endif() ++install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} ) + + #------------------------------------------------------------------------ + # Dynamic Library diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json index 40bf229b9244e3..ecbe011c3c6fbc 100644 --- a/ports/tidy-html5/vcpkg.json +++ b/ports/tidy-html5/vcpkg.json @@ -1,15 +1,10 @@ { "name": "tidy-html5", - "version": "5.7.28", - "port-version": 6, + "version": "5.8.0", "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.", - "homepage": "https://github.com/htacg/tidy-html5", + "homepage": "https://www.html-tidy.org", "license": null, "dependencies": [ - { - "name": "libxslt", - "host": true - }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 5ff5caa94a3d2b..b23a9f15007398 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7033,8 +7033,8 @@ "port-version": 0 }, "tidy-html5": { - "baseline": "5.7.28", - "port-version": 6 + "baseline": "5.8.0", + "port-version": 0 }, "tiff": { "baseline": "4.4.0", diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json index c701d381b4c1fc..adbb220c80fd62 100644 --- a/versions/t-/tidy-html5.json +++ b/versions/t-/tidy-html5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16455cbec8214de37e3deb0ad41fe57323a7dd0", + "version": "5.8.0", + "port-version": 0 + }, { "git-tree": "2e4c85fc988591dc5b25baac22c4e83dde7b7f64", "version": "5.7.28", From 39b548c8e5b1bce9fb308fd6f810bac5c7c3befe Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Jul 2022 23:58:03 +0200 Subject: [PATCH 062/791] [scripts|world rebuild] Always save `config.log` and `CMakeCache.txt` (#25189) * Always save config.log, even on error * Always save config.log and CMakeCache.txt[.log] * Add SAVE_LOG_FILES option * Make implicit lookups explicit * Update versions --- ports/vcpkg-cmake/vcpkg.json | 4 ++-- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 3 +++ scripts/cmake/vcpkg_configure_cmake.cmake | 3 +++ scripts/cmake/vcpkg_configure_make.cmake | 5 +---- .../cmake/vcpkg_execute_required_process.cmake | 17 +++++++++++++++-- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 7 files changed, 30 insertions(+), 9 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index c8d13f3094aa76..bf449abfa07a97 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-06-07", - "documentation": "https://vcpkg.io/en/docs/README.html", + "version-date": "2022-07-02", + "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index a6150b1e439c17..37b29d6725c815 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -239,6 +239,7 @@ function(vcpkg_cmake_configure) COMMAND "${NINJA}" -v WORKING_DIRECTORY "${build_dir_release}/vcpkg-parallel-configure" LOGNAME "${arg_LOGFILE_BASE}" + SAVE_LOG_FILES ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt ../CMakeCache.txt ) vcpkg_list(APPEND config_logs @@ -251,6 +252,7 @@ function(vcpkg_cmake_configure) COMMAND ${dbg_command} WORKING_DIRECTORY "${build_dir_debug}" LOGNAME "${arg_LOGFILE_BASE}-dbg" + SAVE_LOG_FILES CMakeCache.txt ) vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-out.log" @@ -263,6 +265,7 @@ function(vcpkg_cmake_configure) COMMAND ${rel_command} WORKING_DIRECTORY "${build_dir_release}" LOGNAME "${arg_LOGFILE_BASE}-rel" + SAVE_LOG_FILES CMakeCache.txt ) vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-out.log" diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index abd566edef7483..c33ba403c9c4ac 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -300,6 +300,7 @@ function(vcpkg_configure_cmake) COMMAND "${NINJA}" -v WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" LOGNAME "${arg_LOGNAME}" + SAVE_LOG_FILES ../../${TARGET_TRIPLET}-dbg/CMakeCache.txt ../CMakeCache.txt ) vcpkg_list(APPEND config_logs @@ -313,6 +314,7 @@ function(vcpkg_configure_cmake) COMMAND ${dbg_command} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" LOGNAME "${arg_LOGNAME}-dbg" + SAVE_LOG_FILES CMakeCache.txt ) vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-out.log" @@ -326,6 +328,7 @@ function(vcpkg_configure_cmake) COMMAND ${rel_command} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME "${arg_LOGNAME}-rel" + SAVE_LOG_FILES CMakeCache.txt ) vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-out.log" diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 3ead0e58edc4ab..17a6d456c82664 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -708,6 +708,7 @@ function(vcpkg_configure_make) COMMAND ${command} WORKING_DIRECTORY "${target_dir}" LOGNAME "config-${TARGET_TRIPLET}-${short_name_${current_buildtype}}" + SAVE_LOG_FILES config.log ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(GLOB_RECURSE libtool_files "${target_dir}*/libtool") @@ -717,10 +718,6 @@ function(vcpkg_configure_make) file(WRITE "${lt_file}" "${_contents}") endforeach() endif() - - if(EXISTS "${target_dir}/config.log") - file(RENAME "${target_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/config.log-${TARGET_TRIPLET}-${short_name_${current_buildtype}}.log") - endif() endif() z_vcpkg_restore_pkgconfig_path() diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index ffdd2815dd39aa..0147b364370abf 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -2,7 +2,7 @@ function(vcpkg_execute_required_process) cmake_parse_arguments(PARSE_ARGV 0 arg "ALLOW_IN_DOWNLOAD_MODE" "WORKING_DIRECTORY;LOGNAME;TIMEOUT;OUTPUT_VARIABLE;ERROR_VARIABLE" - "COMMAND" + "COMMAND;SAVE_LOG_FILES" ) if(DEFINED arg_UNPARSED_ARGUMENTS) @@ -65,9 +65,22 @@ Halting portfile execution. ${output_variable_param} ${error_variable_param} ) + vcpkg_list(SET saved_logs) + foreach(logfile IN LISTS arg_SAVE_LOG_FILES) + set(filepath "${arg_WORKING_DIRECTORY}/${logfile}") + if(NOT EXISTS "${filepath}") + continue() + endif() + cmake_path(GET filepath FILENAME filename) + if(NOT filename MATCHES "[.]log\$") + string(APPEND filename ".log") + endif() + configure_file("${filepath}" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-${filename}" COPYONLY) + vcpkg_list(APPEND saved_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-${filename}") + endforeach() if(NOT error_code EQUAL 0) set(stringified_logs "") - foreach(log IN ITEMS "${log_out}" "${log_err}") + foreach(log IN LISTS saved_logs ITEMS "${log_out}" "${log_err}") if(NOT EXISTS "${log}") continue() endif() diff --git a/versions/baseline.json b/versions/baseline.json index b23a9f15007398..96da10ce1e965d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7397,7 +7397,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-06-07", + "baseline": "2022-07-02", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index c53e64742b830f..daad9b9265debe 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94abbd71a7fe495e883b13c077312f6d419cbc41", + "version-date": "2022-07-02", + "port-version": 0 + }, { "git-tree": "819e45a14fb875ec7e8373143c994b7bd8d8f7cb", "version-date": "2022-06-07", From e6c8c2bc051dc40c39cb4b5b49d180208bdfeda9 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Jul 2022 00:05:52 +0200 Subject: [PATCH 063/791] [gdal] Update to 3.5.1, build with CMake (#22392) * Build with CMake [skip actions] * Update to 3.5.0 RC1 [skip actions] * Update to 3.5.0RC2 * Use GDAL_USE_INTERNAL_LIBS=OFF * Use lower-case config path * Add LERC support * Fix tiff linkage in libgeotiff * uwp is unsupported * core doesn't imply lerc * Drop legacy build * Feature and portfile cleanup [skip actions] * Cleanup wrapper * Pass on libspatialite usage requirements * Update versions * Remove hfd5/netcdf from default for android * Update versions * Fix wrapper * Update versions * Fix libgeotiff config * The wrapper needs pkgconf for libspatialite * Update versions * Remove obsolete patch * Update to v3.5.1-RC1 * Burn host triplet into config, require pkg-config * Fix libspatialite link libraries [skip actions] * Update versions in manifests * Update versions * Remove obsolete wrapper code [skip actions] Complements 5c4f512. * Update to 3.5.1RC2 [skip actions] * Handle additional link dependencies using pkg-config [skip actions] * GDAL's find modules rely on PkgConfig * Update to 3.5.1 * Update versions --- ports/gdal/0001-Fix-debug-crt-flags.patch | 43 -- ports/gdal/0002-Fix-build.patch | 38 -- ports/gdal/0004-Fix-cfitsio.patch | 13 - ports/gdal/0005-Fix-configure.patch | 334 --------------- ports/gdal/0006-Fix-mingw-dllexport.patch | 13 - ports/gdal/0007-Control-tools.patch | 83 ---- ports/gdal/0008-Fix-absl-string_view.patch | 13 - ports/gdal/0009-atlbase.patch | 72 ---- ports/gdal/0010-symprefix.patch | 13 - ports/gdal/find-link-libraries.patch | 109 +++++ ports/gdal/portfile.cmake | 472 ++++++--------------- ports/gdal/usage | 5 +- ports/gdal/vcpkg-cmake-wrapper.cmake | 166 +------- ports/gdal/vcpkg.json | 154 +++++-- ports/libgeotiff/portfile.cmake | 1 + ports/libgeotiff/public-dependencies.patch | 47 ++ ports/libgeotiff/vcpkg.json | 1 + versions/baseline.json | 6 +- versions/g-/gdal.json | 5 + versions/l-/libgeotiff.json | 5 + 20 files changed, 426 insertions(+), 1167 deletions(-) delete mode 100644 ports/gdal/0001-Fix-debug-crt-flags.patch delete mode 100644 ports/gdal/0002-Fix-build.patch delete mode 100644 ports/gdal/0004-Fix-cfitsio.patch delete mode 100644 ports/gdal/0005-Fix-configure.patch delete mode 100644 ports/gdal/0006-Fix-mingw-dllexport.patch delete mode 100644 ports/gdal/0007-Control-tools.patch delete mode 100644 ports/gdal/0008-Fix-absl-string_view.patch delete mode 100644 ports/gdal/0009-atlbase.patch delete mode 100644 ports/gdal/0010-symprefix.patch create mode 100644 ports/gdal/find-link-libraries.patch create mode 100644 ports/libgeotiff/public-dependencies.patch diff --git a/ports/gdal/0001-Fix-debug-crt-flags.patch b/ports/gdal/0001-Fix-debug-crt-flags.patch deleted file mode 100644 index 76af77b9085067..00000000000000 --- a/ports/gdal/0001-Fix-debug-crt-flags.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/gdal/nmake.opt b/gdal/nmake.opt -index 8253ae2..9456b79 100644 ---- a/gdal/nmake.opt -+++ b/gdal/nmake.opt -@@ -148,16 +148,26 @@ GDAL_PDB = $(GDAL_ROOT)\gdal$(VERSION)$(POSTFIX).pdb - !ENDIF - - !IFDEF WITH_PDB --CXX_PDB_FLAGS=/Zi /Fd$(GDAL_PDB) -+CXX_PDB_FLAGS=/Z7 /Fd$(GDAL_PDB) - !ELSE - CXX_PDB_FLAGS= - !ENDIF - -+# Flags to choose CRT variant to link against (e.g. static: /MT, /MTd, dynamic: /MD, /MDd) -+# Ensure MRSID_CONFIG in mrsid/nmake.opt is set appropriately as well -+!IFNDEF CXX_CRT_FLAGS -+!IFNDEF DEBUG -+CXX_CRT_FLAGS=/MD -+!ELSE -+CXX_CRT_FLAGS=/MDd -+!ENDIF -+!ENDIF -+ - !IFNDEF OPTFLAGS - !IF "$(DEBUG)" == "0" --OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG -+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG - !ELSE --OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG -+OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG - !ENDIF - !ENDIF # OPTFLAGS - -@@ -175,7 +185,7 @@ OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP$(CPU_COUNT) /MDd /EH - # 4351: new behavior: elements of array 'array' will be default initialized (needed for https://trac.osgeo.org/gdal/changeset/35593) - # 4611: interaction between '_setjmp' and C++ object destruction is non-portable - # --WARNFLAGS = /W4 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611 -+WARNFLAGS = /W3 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4351 /wd4611 - - !ENDIF - diff --git a/ports/gdal/0002-Fix-build.patch b/ports/gdal/0002-Fix-build.patch deleted file mode 100644 index 9b62737d228e9c..00000000000000 --- a/ports/gdal/0002-Fix-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/gdal/makefile.vc b/gdal/makefile.vc -index 9e0bd44..8559f79 100644 ---- a/gdal/makefile.vc -+++ b/gdal/makefile.vc -@@ -84,7 +84,7 @@ staticlib: $(LIB_DEPENDS) - call < --#include -+#include - - #include - #include diff --git a/ports/gdal/0005-Fix-configure.patch b/ports/gdal/0005-Fix-configure.patch deleted file mode 100644 index 0a032c405acb81..00000000000000 --- a/ports/gdal/0005-Fix-configure.patch +++ /dev/null @@ -1,334 +0,0 @@ -diff --git a/gdal/configure.ac b/gdal/configure.ac -index 30cd613..43f1daf 100644 ---- a/gdal/configure.ac -+++ b/gdal/configure.ac -@@ -48,6 +48,8 @@ dnl Compute the canonical host-system (the system we are building for) - dnl type variable $host - AC_CANONICAL_HOST - -+PKG_PROG_PKG_CONFIG([0.21]) -+ - dnl Enable as much warnings as possible - AC_LANG_PUSH([C]) - AX_COMPILER_VENDOR -@@ -1111,6 +1111,8 @@ dnl --------------------------------------------------------------------------- - AC_ARG_WITH(libz,[ --with-libz[=ARG] Include libz support (ARG=internal or libz directory)],,) - - if test "$with_libz" = "external" -o "$with_libz" = "" -o "$with_libz" = "yes" ; then -+ PKG_CHECK_MODULES([ZLIB], [zlib], [LIBZ_SETTING=external], [LIBZ_SETTING=internal]) -+elif false ; then - - AC_CHECK_LIB(z,deflateInit_,LIBZ_SETTING=external,LIBZ_SETTING=internal,) - -@@ -1144,7 +1146,8 @@ elif test "$with_libz" != "no" -a "$with_libz" != "internal" ; then - fi - - if test "$LIBZ_SETTING" = "external" ; then -- LIBS="-lz $LIBS" -+ LIBS="${ZLIB_LIBS} $LIBS" -+ EXTRA_INCLUDES="${ZLIB_CFLAGS} $EXTRA_INCLUDES" - if test "$with_libz" != "" -a "$with_libz" != "yes" -a "$with_libz" != "external" ; then - EXTRA_INCLUDES="-I$with_libz -I$with_libz/include $EXTRA_INCLUDES" - fi -@@ -1336,12 +1338,15 @@ AC_MSG_CHECKING([for libtiff]) - - if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then - -- dnl Only automatically pick up the external libtiff if it is >= 4.0. -- AC_CHECK_LIB(tiff,TIFFScanlineSize64,TIFF_SETTING=external HAVE_BIGTIFF=yes,TIFF_SETTING=internal HAVE_BIGTIFF=yes,) -+ PKG_CHECK_MODULES([TIFF],[libtiff-4 > 4.0], [TIFF_SETTING=external], [TIFF_SETTING=internal HAVE_BIGTIFF=yes]) - - if test "$TIFF_SETTING" = "external" ; then -- LIBS="-ltiff $LIBS" - AC_MSG_RESULT([using pre-installed libtiff.]) -+ EXTRA_INCLUDES="$TIFF_CFLAGS $EXTRA_INCLUDES" -+ SAVED_LIBS="$LIBS" -+ LIBS="$TIFF_LIBS" -+ AC_SEARCH_LIBS(TIFFScanlineSize64,[],HAVE_BIGTIFF=yes,HAVE_BIGTIFF=no,) -+ LIBS="$TIFF_LIBS $SAVED_LIBS" - else - AC_MSG_RESULT([using internal TIFF code.]) - fi -@@ -1402,22 +1407,28 @@ AC_ARG_WITH(curl, - dnl Clear some cache variables - unset ac_cv_path_LIBCURL - -+LIBCURL_MODVERSION= - if test "`basename xx/$with_curl`" = "curl-config" ; then - LIBCURL_CONFIG="$with_curl" - elif test "$with_curl" = "no" ; then - LIBCURL_CONFIG=no -+elif test "$with_curl" = "yes" -o "$with_curl" = "" ; then -+ PKG_CHECK_EXISTS([libcurl], [LIBCURL_CONFIG="${PKG_CONFIG} libcurl"], [LIBCURL_CONFIG=false]) -+ LIBCURL_MODVERSION=`$LIBCURL_CONFIG --modversion` - else - AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no) - fi - - if test "$LIBCURL_CONFIG" != "no" ; then - -- CURL_VERNUM=`$LIBCURL_CONFIG --vernum` -- CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'` -+ CURL_VER="`$LIBCURL_CONFIG --version | awk '{print $2}'`$LIBCURL_MODVERSION" - - AC_MSG_RESULT([ found libcurl version $CURL_VER]) - -- AC_CHECK_LIB(curl,curl_global_init,CURL_SETTING=yes,CURL_SETTING=no,`$LIBCURL_CONFIG --libs`) -+ SAVED_LIBS="$LIBS" -+ LIBS=`$LIBCURL_CONFIG --libs` -+ AC_SEARCH_LIBS(curl_global_init,[],CURL_SETTING=yes,CURL_SETTING=no,) -+ LIBS="$SAVED_LIBS" - - fi - -@@ -1431,7 +1442,9 @@ dnl Proj depends on it so it must appear before. - dnl --------------------------------------------------------------------------- - - SQLITE3_REQ_VERSION="3.0.0" --AX_LIB_SQLITE3($SQLITE3_REQ_VERSION) -+AC_CHECK_LIB(sqlite3,sqlite3_open,HAVE_SQLITE3=yes,AC_MSG_ERROR([vcpkg sqlite3 not found]),) -+SQLITE3_CFLAGS= -+SQLITE3_LDFLAGS=-lsqlite3 - - if test "$HAVE_SQLITE3" = "yes"; then - LIBS="$SQLITE3_LDFLAGS $LIBS" -@@ -1571,6 +1584,11 @@ HAVE_SPATIALITE=no - if test -z "$with_spatialite" -o "$with_spatialite" = "no"; then - AC_MSG_RESULT(disabled) - elif test "$with_spatialite" = "yes"; then -+ PKG_CHECK_MODULES([SPATIALITE],[spatialite >= 5],[HAVE_SPATIALITE=yes],AC_MSG_ERROR([vcpkg libspatialite not found])) -+ SPATIALITE_INC="$SPATIALITE_CFLAGS" -+ LIBS="$LIBS $SPATIALITE_LIBS" -+ ac_cv_lib_spatialite_spatialite_target_cpu=yes -+elif false; then - AC_CHECK_HEADERS(sqlite3.h) - if test "$ac_cv_header_sqlite3_h" = "yes"; then - AC_MSG_CHECKING([for spatialite.h in /usr/include or /usr/local/include]) -@@ -1639,6 +1652,19 @@ dnl --------------------------------------------------------------------------- - AC_ARG_WITH(liblzma,[ --with-liblzma[=ARG] Include liblzma support (ARG=yes/no)],,) - - if test "$with_liblzma" = "yes" ; then -+ PKG_CHECK_MODULES([LIBLZMA],[liblzma],[HAVE_LIBLZMA_PC=yes],[HAVE_LIBLZMA_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$LIBLZMA_LIBS" -+ AC_SEARCH_LIBS(lzma_code,[],LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) -+ if test "$LIBLZMA_SETTING" = "yes" ; then -+ LIBS="$LIBLZMA_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBLZMA_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg liblzma broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ -+elif false; then - AC_CHECK_LIB(lzma,lzma_code,LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) - AC_CHECK_HEADERS(lzma.h) - -@@ -1661,6 +1687,19 @@ dnl --------------------------------------------------------------------------- - AC_ARG_WITH(zstd,[ --with-zstd[=ARG] Include zstd support (ARG=yes/no/installation_prefix)],,) - - if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then -+ PKG_CHECK_MODULES([ZSTD],[libzstd],[HAVE_LIBZSTD_PC=yes],[HAVE_LIBZSTD_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$ZSTD_LIBS" -+ AC_SEARCH_LIBS(ZSTD_decompressStream,[],ZSTD_SETTING=yes,ZSTD_SETTING=no,) -+ if test "$ZSTD_SETTING" = "yes" ; then -+ LIBS="$ZSTD_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBZSTD_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg libzstd broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ -+elif false; then - AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,) - - if test "$ZSTD_SETTING" = "yes" ; then -@@ -1962,6 +2001,12 @@ else - SAVED_LIBS="${LIBS}" - LIBS="${PG_LIB}" - AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no) -+ if test "${HAVE_PG}" = "no" ; then -+ unset ac_cv_lib_pq_PQconnectdb -+ PG_LIB="${PG_LIB} -lpgcommon -lpgport" -+ LIBS="${PG_LIB} ${SAVED_LIBS}" -+ AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,[-lpgcommon -lpgport]) -+ fi - LIBS="${SAVED_LIBS}" - if test "${HAVE_PG}" = "yes" ; then - LIBS="${PG_LIB} ${LIBS}" -@@ -2322,6 +2367,15 @@ AC_ARG_WITH(geotiff,[ --with-geotiff=ARG Libgeotiff library to use (ARG=inte - - if test "$with_geotiff" = "yes" -o "$with_geotiff" = "" ; then - -+ AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=internal) -+ if test $GEOTIFF_SETTING = "external" ; then -+ LIBS="-lgeotiff $LIBS" -+ else -+ AC_MSG_ERROR([vcpkg geotiff broken]) -+ fi -+ -+elif false; then -+ - if test "$TIFF_SETTING" = "internal" ; then - GEOTIFF_SETTING=internal - else -@@ -3005,7 +3059,7 @@ elif test "$with_hdf5" = "yes" -o "$with_hdf5" = "" ; then - # Test that the package found is for the right architecture - saved_LIBS="$LIBS" - LIBS="$HDF5_LIBS" -- AC_CHECK_LIB(hdf5,H5Fopen, [HAVE_HDF5=yes], [HAVE_HDF5=no]) -+ AC_SEARCH_LIBS(H5Fopen,[],[HAVE_HDF5=yes],[HAVE_HDF5=no],) - LIBS="$saved_LIBS" - - if test "$HAVE_HDF5" = "yes"; then -@@ -3135,6 +3189,24 @@ if test "$with_netcdf" = "no" ; then - - echo "netCDF support disabled." - -+elif true ; then -+ -+ PKG_CHECK_MODULES([NETCDF],[netcdf],[HAVE_NETCDF_PC=yes],[HAVE_NETCDF_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$NETCDF_LIBS" -+ AC_SEARCH_LIBS(nc_open,[],NETCDF_SETTING=yes,NETCDF_SETTING=no,) -+ if test "$NETCDF_SETTING" = "yes" ; then -+ LIBS="$NETCDF_LIBS $SAVED_LIBS" -+ EXTRA_INCLUDES="$NETCDF_CFLAGS $EXTRA_INCLUDES" -+ PKG_CHECK_VAR([NETCDF_ROOT],[netcdf],[prefix],,) -+ PKG_CHECK_VAR([NETCDF_INCLUDEDIR],[netcdf],[includedir],,) -+ NETCDF_NCCONFIG= -+ elif test "$HAVE_NETCDF_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg netcdf-c broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ - else - - dnl find nc-config location -@@ -3355,6 +3427,21 @@ if test "$with_openjpeg" = "no" ; then - - AC_MSG_NOTICE([OpenJPEG (JPEG2000) support disabled.]) - -+elif true ; then -+ -+ PKG_CHECK_MODULES([OPENJPEG],[libopenjp2 >= 2.1.0],[HAVE_LIBOPENJP2_PC=yes],[HAVE_LIBOPENJP2_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$OPENJPEG_LIBS" -+ AC_SEARCH_LIBS(opj_setup_decoder,[],HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) -+ if test "$HAVE_OPENJPEG" = "yes" ; then -+ EXTRA_INCLUDES="$OPENJPEG_CFLAGS $EXTRA_INCLUDES" -+ LIBS="$OPENJPEG_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBOPENJP2_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg libopenjpeg broken]) -+ else -+ LIBS="$SAVED_LIBS" -+ fi -+ - else - - PKG_PROG_PKG_CONFIG([0.21]) -@@ -4046,7 +4133,9 @@ dnl --------------------------------------------------------------------------- - - dnl Expat 1.95.0 released in 2000-09-28 - EXPAT_REQ_VERSION="1.95.0" --AX_LIB_EXPAT($EXPAT_REQ_VERSION) -+PKG_CHECK_MODULES([EXPAT],[expat],[HAVE_EXPAT=yes],[AC_MSG_ERROR([vcpkg expat not found])]) -+EXPAT_LDFLAGS="$EXPAT_LIBS" -+EXPAT_INCLUDE="" - - if test "$HAVE_EXPAT" = "yes"; then - LIBS="$EXPAT_LDFLAGS $LIBS" -@@ -4069,7 +4158,13 @@ dnl Check for Google libkml support. - dnl --------------------------------------------------------------------------- - - LIBKML_REQ_VERSION="1.3.0" -+if test "x${with_libkml}" = "xno"; then -+ echo "libkml support disabled." -+ HAVE_LIBKML="no" -+ LIBKML_CFLAGS= -+else - AX_LIB_LIBKML($LIBKML_REQ_VERSION) -+fi - - if test "$HAVE_LIBKML" = "yes"; then - LIBS="$LIBKML_LDFLAGS $LIBS" -@@ -4252,8 +4347,8 @@ else - dnl Add curl to LIBS; it might be local to DODS or generally installed - if test -x $DODS_BIN/curl-config; then - LIBS="$LIBS `$DODS_BIN/curl-config --libs`" -- elif which curl-config > /dev/null 2>&1; then -- LIBS="$LIBS `curl-config --libs`" -+ elif test "$CURL_SETTING" = "yes"; then -+ LIBS="$LIBS $CURL_LIB" - else - AC_MSG_ERROR([You gave a dods root, but I can't find curl!]) - fi -@@ -4295,7 +4390,7 @@ if test "x$with_xml2" = "xyes" -o "x$with_xml2" = "x" ; then - if test "${HAVE_LIBXML2}" = "yes"; then - SAVED_LIBS="${LIBS}" - LIBS="${LIBXML2_LIBS}" -- AC_CHECK_LIB(xml2,xmlParseDoc,HAVE_LIBXML2=yes,HAVE_LIBXML2=no) -+ AC_SEARCH_LIBS(xmlParseDoc,[],HAVE_LIBXML2=yes,HAVE_LIBXML2=no,) - LIBS="${SAVED_LIBS}" - fi - -@@ -4509,6 +4604,22 @@ WEBP_SETTING=no - - if test "$with_webp" = "yes" -o "$with_webp" = "" ; then - -+ PKG_CHECK_MODULES([WEBP],[libwebp],[HAVE_LIBWEBP_PC=yes],[HAVE_LIBWEBP_PC=no]) -+ SAVED_LIBS="$LIBS" -+ LIBS="$WEBP_LIBS" -+ AC_SEARCH_LIBS(WebPDecodeRGB,[],WEBP_SETTING=yes,WEBP_SETTING=no,) -+ -+ if test "$WEBP_SETTING" = "yes" ; then -+ LIBS="$WEBP_LIBS $SAVED_LIBS" -+ elif test "$HAVE_LIBWEBP_PC" = "yes" ; then -+ AC_MSG_ERROR([vcpkg libwebp broken]) -+ else -+ echo "libwebp not found - WEBP support disabled" -+ LIBS="$SAVED_LIBS" -+ fi -+ -+elif false ; then -+ - AC_CHECK_LIB(webp,WebPDecodeRGB,WEBP_SETTING=yes,WEBP_SETTING=no,) - - if test "$WEBP_SETTING" = "yes" ; then -@@ -4540,7 +4651,7 @@ dnl --------------------------------------------------------------------------- - dnl Check if geos library is available. - dnl --------------------------------------------------------------------------- - --GEOS_INIT(3.1.0) -+PKG_CHECK_MODULES(GEOS,geos >= 3.1.0,HAVE_GEOS=yes,AC_MSG_ERROR([vcpkg geos not found])) - if test "${HAVE_GEOS}" = "yes" ; then - AC_MSG_NOTICE([Using C API from GEOS $GEOS_VERSION]) - STRIP_SYSTEM_LIBRARY_PATHS("${GEOS_LIBS}") -@@ -4779,6 +4890,16 @@ dnl --------------------------------------------------------------------------- - - AC_ARG_WITH(libjson-c,[ --with-libjson-c[=ARG] Include libjson-c support (ARG=internal or libjson-c directory)],,) - -+PKG_CHECK_MODULES([JSONC],[json-c],[HAVE_JSONC=yes],[HAVE_JSONC=no]) -+SAVED_LIBS="$LIBS" -+LIBS="$JSONC_LIBS" -+AC_SEARCH_LIBS(json_object_set_serializer,[],LIBJSONC_SETTING=external,LIBJSONC_SETTING=,) -+if test "$LIBJSONC_SETTING" = "external" ; then -+ LIBS="$JSONC_LIBS $SAVED_LIBS" -+ JSON_INCLUDE="$JSONC_CFLAGS" -+else -+ LIBS="$SAVED_LIBS" -+ - if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjson_c" = "yes" ; then - AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,) - elif test "$with_libjson_c" = "internal" ; then -@@ -4807,6 +4928,8 @@ else - AC_MSG_RESULT([using internal libjson-c code]) - fi - -+fi # json-c.pc -+ - AC_SUBST(LIBJSONC_SETTING,$LIBJSONC_SETTING) - AC_SUBST(JSON_INCLUDE,$JSON_INCLUDE) - diff --git a/ports/gdal/0006-Fix-mingw-dllexport.patch b/ports/gdal/0006-Fix-mingw-dllexport.patch deleted file mode 100644 index c1f5245275b8c0..00000000000000 --- a/ports/gdal/0006-Fix-mingw-dllexport.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gdal/port/cpl_port.h b/gdal/port/cpl_port.h -index 98805cf..a6a1846 100644 ---- a/gdal/port/cpl_port.h -+++ b/gdal/port/cpl_port.h -@@ -343,7 +343,7 @@ typedef unsigned int GUIntptr_t; - #endif - - #ifndef CPL_DLL --#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL) -+#if defined(WIN32) && (!defined(CPL_DISABLE_DLL) || defined(DLL_EXPORT)) - # ifdef GDAL_COMPILATION - # define CPL_DLL __declspec(dllexport) - # else diff --git a/ports/gdal/0007-Control-tools.patch b/ports/gdal/0007-Control-tools.patch deleted file mode 100644 index fd1f5c9a35ecf7..00000000000000 --- a/ports/gdal/0007-Control-tools.patch +++ /dev/null @@ -1,83 +0,0 @@ -diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in -index e8d2b05..1f19a4b 100644 ---- a/gdal/GDALmake.opt.in -+++ b/gdal/GDALmake.opt.in -@@ -662,3 +662,6 @@ O_OBJ = $(foreach file,$(OBJ),../o/$(file)) - - %-clean: - $(MAKE) -C $* clean -+ -+ -+BUILD_TOOLS = @BUILD_TOOLS@ -\ No newline at end of file -diff --git a/gdal/apps/GNUmakefile b/gdal/apps/GNUmakefile -index 9624cf7..f91403d 100644 ---- a/gdal/apps/GNUmakefile -+++ b/gdal/apps/GNUmakefile -@@ -43,6 +43,11 @@ NON_DEFAULT_LIST = multireadtest$(EXE) dumpoverviews$(EXE) \ - gdaltorture$(EXE) gdal2ogr$(EXE) test_ogrsf$(EXE) \ - gdalasyncread$(EXE) testreprojmulti$(EXE) - -+ifeq ($(BUILD_TOOLS),no) -+BIN_LIST = -+NON_DEFAULT_LIST = -+endif -+ - default: gdal-config-inst gdal-config $(BIN_LIST) - - all: default $(NON_DEFAULT_LIST) -diff --git a/gdal/apps/makefile.vc b/gdal/apps/makefile.vc -index 6e1fc9b..66f9b29 100644 ---- a/gdal/apps/makefile.vc -+++ b/gdal/apps/makefile.vc -@@ -20,6 +20,7 @@ GNM_PROGRAMS = gnmmanage.exe gnmanalyse.exe - !ENDIF - - -+!IF "$(BUILD_TOOLS)" == "1" - default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ - nearblack.exe gdalmanage.exe gdalenhance.exe gdaltransform.exe\ - gdaldem.exe gdallocationinfo.exe gdalsrsinfo.exe gdalmdiminfo.exe \ -@@ -28,6 +29,10 @@ default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ - all: default multireadtest.exe \ - dumpoverviews.exe gdalwarpsimple.exe gdalflattenmask.exe \ - gdaltorture.exe gdal2ogr.exe test_ogrsf.exe -+!ELSE -+default: -+all: -+!ENDIF - OBJ = commonutils.obj gdalinfo_lib.obj gdal_translate_lib.obj gdalwarp_lib.obj ogr2ogr_lib.obj \ - gdaldem_lib.obj nearblack_lib.obj gdal_grid_lib.obj gdal_rasterize_lib.obj gdalbuildvrt_lib.obj \ - gdalmdiminfo_lib.obj gdalmdimtranslate_lib.obj -@@ -223,5 +228,9 @@ clean: - -del *.manifest - -del *.exp - -+!IF "$(BUILD_TOOLS)" == "1" - install: default - copy *.exe $(BINDIR) -+!ELSE -+install: -+!ENDIF -\ No newline at end of file -diff --git a/gdal/configure.ac b/gdal/configure.ac -index 1098b39..e4d985e 100644 ---- a/gdal/configure.ac -+++ b/gdal/configure.ac -@@ -6165,6 +6165,16 @@ case "${host_os}" in - ;; - esac - -+BUILD_TOOLS=yes -+AC_ARG_WITH([tools], AS_HELP_STRING([--with-tools], [Build the tools]),,) -+if test "$with_tools" = "yes"; then -+ AC_MSG_RESULT([enabled]) -+else -+ BUILD_TOOLS=no -+ AC_MSG_RESULT([disabled by user]) -+fi -+AC_SUBST(BUILD_TOOLS,$BUILD_TOOLS) -+ - AC_CONFIG_FILES([GDALmake.opt]) - AC_OUTPUT - diff --git a/ports/gdal/0008-Fix-absl-string_view.patch b/ports/gdal/0008-Fix-absl-string_view.patch deleted file mode 100644 index ff5af90f6dcf31..00000000000000 --- a/ports/gdal/0008-Fix-absl-string_view.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h -index 9557380..17edcf8 100644 ---- a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h -+++ b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h -@@ -213,7 +213,7 @@ namespace flatbuffers { - } - #define FLATBUFFERS_HAS_STRING_VIEW 1 - // Check for absl::string_view -- #elif __has_include("absl/strings/string_view.h") -+ #elif __has_include("absl/strings/string_view.h") && 0 - #include "absl/strings/string_view.h" - namespace flatbuffers { - typedef absl::string_view string_view; diff --git a/ports/gdal/0009-atlbase.patch b/ports/gdal/0009-atlbase.patch deleted file mode 100644 index b2c423e1c8a3ba..00000000000000 --- a/ports/gdal/0009-atlbase.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/gdal/nmake.opt b/gdal/nmake.opt -index 7e7871e..ac01bf2 100644 ---- a/gdal/nmake.opt -+++ b/gdal/nmake.opt -@@ -239,6 +239,11 @@ STDCALL=YES - VERSION = 304 - !ENDIF - -+# Set HAVE_ATLBASE_H=NO if atlbase.h header is not available -+!IFNDEF HAVE_ATLBASE_H -+HAVE_ATLBASE_H=YES -+!ENDIF -+ - # Comment the following out if you want PAM supported disabled - # by default. - !IFNDEF PAM_SETTING -diff --git a/gdal/port/cpl_aws.cpp b/gdal/port/cpl_aws.cpp -index eed23f9..e3a1578 100644 ---- a/gdal/port/cpl_aws.cpp -+++ b/gdal/port/cpl_aws.cpp -@@ -43,7 +43,7 @@ CPL_CVSID("$Id$") - // #define DEBUG_VERBOSE 1 - - #ifdef WIN32 --#if defined(_MSC_VER) -+#if defined(HAVE_ATLBASE_H) - bool CPLFetchWindowsProductUUID(CPLString &osStr); // defined in cpl_aws_win32.cpp - #endif - const char* CPLGetWineVersion(); // defined in cpl_vsil_win32.cpp -@@ -688,7 +688,7 @@ static bool IsMachinePotentiallyEC2Instance() - } - else - { --#if defined(_MSC_VER) -+#if defined(HAVE_ATLBASE_H) - CPLString osMachineUUID; - if( CPLFetchWindowsProductUUID(osMachineUUID) ) - { -diff --git a/gdal/port/cpl_aws_win32.cpp b/gdal/port/cpl_aws_win32.cpp -index 7742a35..98be522 100644 ---- a/gdal/port/cpl_aws_win32.cpp -+++ b/gdal/port/cpl_aws_win32.cpp -@@ -28,7 +28,7 @@ - - #include "cpl_port.h" - --#if defined(WIN32) && defined(_MSC_VER) -+#if defined(HAVE_ATLBASE_H) - - #define _WIN32_DCOM - #include -@@ -140,4 +140,4 @@ bool CPLFetchWindowsProductUUID(CPLString &osStr) - return !osWindowsProductUUID.empty(); - } - --#endif /* defined(WIN32) && defined(_MSC_VER) */ -+#endif /* defined(HAVE_ATLBASE_H) */ -diff --git a/gdal/port/makefile.vc b/gdal/port/makefile.vc -index a8b0e02..68da2dd 100644 ---- a/gdal/port/makefile.vc -+++ b/gdal/port/makefile.vc -@@ -141,6 +141,10 @@ EXTRAFLAGS = $(EXTRAFLAGS) $(LZ4_CFLAGS) -DHAVE_LZ4 - ODBC_OBJ = cpl_odbc.obj - !ENDIF - -+!IF "$(HAVE_ATLBASE_H)" == "YES" -+EXTRAFLAGS = $(EXTRAFLAGS) -DHAVE_ATLBASE_H -+!ENDIF -+ - default: prev_dllbuild cpl_config.h $(LIB) - - $(LIB): $(OBJ) diff --git a/ports/gdal/0010-symprefix.patch b/ports/gdal/0010-symprefix.patch deleted file mode 100644 index e21fb8d7790cc3..00000000000000 --- a/ports/gdal/0010-symprefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gdal/makefile.vc b/gdal/makefile.vc -index 9de546c..56f617d 100644 ---- a/gdal/makefile.vc -+++ b/gdal/makefile.vc -@@ -27,7 +27,7 @@ OGR_INCLUDE = $(OGR_BASE_INCLUDE) \ - CPPFLAGS = $(CPPFLAGS) -DGNM_ENABLED - !ENDIF - --!IF DEFINED(STDCALL) && !DEFINED(WIN64) -+!IF DEFINED(STDCALL) && !DEFINED(WIN64) && "$(SYM_PREFIX)" == "_" - - BASE_INCLUDE = /INCLUDE:_GDALSimpleImageWarp@36 \ - /INCLUDE:_GDALReprojectImage@48 \ diff --git a/ports/gdal/find-link-libraries.patch b/ports/gdal/find-link-libraries.patch new file mode 100644 index 00000000000000..8ee81f4d51904e --- /dev/null +++ b/ports/gdal/find-link-libraries.patch @@ -0,0 +1,109 @@ +diff --git a/cmake/modules/packages/FindFreeXL.cmake b/cmake/modules/packages/FindFreeXL.cmake +index 6c86fb8..0634412 100644 +--- a/cmake/modules/packages/FindFreeXL.cmake ++++ b/cmake/modules/packages/FindFreeXL.cmake +@@ -37,7 +37,15 @@ include(SelectLibraryConfigurations) + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_FREEXL QUIET freexl) ++ pkg_check_modules(PC_FREEXL QUIET IMPORTED_TARGET freexl) ++endif() ++if(PC_FREEXL_FOUND) ++ set(FREEXL_INCLUDE_DIR "${PC_FREEXL_INCLUDE_DIRS}" CACHE STRING "") ++ set(FREEXL_LIBRARY "${PC_FREEXL_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET FREEXL::freexl) ++ add_library(FREEXL::freexl INTERFACE IMPORTED) ++ set_target_properties(FREEXL::freexl PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_FREEXL) ++ endif() + endif() + + find_path(FREEXL_INCLUDE_DIR +diff --git a/cmake/modules/packages/FindOpenJPEG.cmake b/cmake/modules/packages/FindOpenJPEG.cmake +index c697484..6e83222 100644 +--- a/cmake/modules/packages/FindOpenJPEG.cmake ++++ b/cmake/modules/packages/FindOpenJPEG.cmake +@@ -32,9 +32,18 @@ endfunction() + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_OPENJPEG QUIET libopenjp2) ++ pkg_check_modules(PC_OPENJPEG QUIET IMPORTED_TARGET libopenjp2) + set(OPENJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION}) + endif() ++if(PC_OPENJPEG_FOUND) ++ set(OPENJPEG_INCLUDE_DIR "${PC_OPENJPEG_INCLUDE_DIRS}" CACHE STRING "") ++ set(OPENJPEG_LIBRARY "${PC_OPENJPEG_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET OPENJPEG::OpenJPEG) ++ add_library(OPENJPEG::OpenJPEG INTERFACE IMPORTED) ++ set_target_properties(OPENJPEG::OpenJPEG PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${PC_OPENJPEG_INCLUDE_DIRS}") ++ set_target_properties(OPENJPEG::OpenJPEG PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_OPENJPEG) ++ endif() ++endif() + + + find_path(OPENJPEG_INCLUDE_DIR opj_config.h +diff --git a/cmake/modules/packages/FindPoppler.cmake b/cmake/modules/packages/FindPoppler.cmake +index 3807ec0..8059eb4 100644 +--- a/cmake/modules/packages/FindPoppler.cmake ++++ b/cmake/modules/packages/FindPoppler.cmake +@@ -42,11 +42,19 @@ This module defines the following variables: + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_Poppler QUIET poppler) ++ pkg_check_modules(PC_Poppler QUIET IMPORTED_TARGET poppler) + if(PC_Poppler_VERSION) + set(Poppler_VERSION_STRING ${PC_Poppler_VERSION}) + endif() + endif() ++if(PC_Poppler_FOUND) ++ set(Poppler_INCLUDE_DIR "${PC_Poppler_INCLUDE_DIRS}" CACHE STRING "") ++ set(Poppler_LIBRARY "${PC_Poppler_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET Poppler::Poppler) ++ add_library(Poppler::Poppler INTERFACE IMPORTED) ++ set_target_properties(Poppler::Poppler PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_Poppler) ++ endif() ++endif() + find_path(Poppler_INCLUDE_DIR NAMES "poppler-config.h" "cpp/poppler-version.h" "qt5/poppler-qt5.h" "qt4/poppler-qt4.h" + "glib/poppler.h" + HINTS ${PC_Poppler_INCLUDE_DIRS} +@@ -77,6 +85,15 @@ endforeach() + foreach(_comp IN LISTS Poppler_known_components) + list(FIND Poppler_FIND_COMPONENTS "${_comp}" _nextcomp) + if(_nextcomp GREATER -1) ++ pkg_check_modules(PC_Poppler_${_comp} QUIET IMPORTED_TARGET ${Poppler_${_comp}_pkg_config}) ++ if(PC_Poppler_${_comp}_FOUND) ++ set(Poppler_${_comp}_INCLUDE_DIR "${PC_Poppler_${_comp}_INCLUDE_DIRS}" CACHE STRING "") ++ set(Poppler_${_comp}_LIBRARY "${PC_Poppler_${_comp}_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET Poppler::Poppler_${_comp}) ++ add_library(Poppler::${_comp} INTERFACE IMPORTED) ++ set_target_properties(Poppler::${_comp} PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_Poppler_${_comp}) ++ endif() ++ endif() + find_path(Poppler_${_comp}_INCLUDE_DIR + NAMES ${Poppler_${_comp}_header} + PATH_SUFFIXES poppler +diff --git a/cmake/modules/packages/FindSPATIALITE.cmake b/cmake/modules/packages/FindSPATIALITE.cmake +index 00612b0..6388719 100644 +--- a/cmake/modules/packages/FindSPATIALITE.cmake ++++ b/cmake/modules/packages/FindSPATIALITE.cmake +@@ -38,9 +38,17 @@ endif() + + find_package(PkgConfig QUIET) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(PC_SPATIALITE QUIET spatialite) ++ pkg_check_modules(PC_SPATIALITE QUIET IMPORTED_TARGET spatialite) + set(SPATIALITE_VERSION_STRING ${PC_SPATIALITE_VERSION}) + endif() ++if(PC_SPATIALITE_FOUND) ++ set(SPATIALITE_INCLUDE_DIR "${PC_SPATIALITE_INCLUDE_DIRS}" CACHE STRING "") ++ set(SPATIALITE_LIBRARY "${PC_SPATIALITE_LIBRARIES}" CACHE STRING "") ++ if(NOT TARGET SPATIALITE::SPATIALITE) ++ add_library(SPATIALITE::SPATIALITE INTERFACE IMPORTED) ++ set_target_properties(SPATIALITE::SPATIALITE PROPERTIES INTERFACE_LINK_LIBRARIES PkgConfig::PC_SPATIALITE) ++ endif() ++endif() + + find_path(SPATIALITE_INCLUDE_DIR + NAMES spatialite.h diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 1d80f45f9f2818..9d22a44cacf688 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,375 +1,147 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF v3.4.3 - SHA512 702bcb220abc7cf978e8f70a1b2835a20ce5abe405014b9690cab311c00837e57555bb371ff5e2655f9eed63cfd461d6cec5e654001b276dd79a6d2ec0c21f0b + REF v3.5.1 + SHA512 658e515a16ed2b45a0b3dffa6bb23f28d6454a902d8d9efbed320e353112463ff8e9c3efd5b6c98cf61cf187dc88a0dd13f4989041acc836de2b9c07e8da32e9 HEAD_REF master PATCHES - 0001-Fix-debug-crt-flags.patch - 0002-Fix-build.patch - 0004-Fix-cfitsio.patch - 0005-Fix-configure.patch - 0006-Fix-mingw-dllexport.patch - 0007-Control-tools.patch - 0008-Fix-absl-string_view.patch - 0009-atlbase.patch - 0010-symprefix.patch + find-link-libraries.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") -set(extra_exports "") -if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if (VCPKG_CRT_LINKAGE STREQUAL "static") - set(LINKAGE_FLAGS "/MT") - else() - set(LINKAGE_FLAGS "/MD") - endif() - - set(NMAKE_OPTIONS - "DATADIR=${CURRENT_PACKAGES_DIR}/share/gdal" - "HTMLDIR=${CURRENT_PACKAGES_DIR}/share/gdal/html" - "MSVC_VER=1900" - ) - set(NMAKE_OPTIONS_REL - "GDAL_HOME=${CURRENT_PACKAGES_DIR}" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" - ) - set(NMAKE_OPTIONS_DBG - "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" - DEBUG=1 - ) - - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - list(APPEND NMAKE_OPTIONS "WIN64=YES") - endif() - - if(VCPKG_TARGET_IS_UWP) - list(APPEND NMAKE_OPTIONS "SYM_PREFIX=" "EXTRA_LINKER_FLAGS=/APPCONTAINER WindowsApp.lib") - endif() - - if(NOT "aws-ec2-windows" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "HAVE_ATLBASE_H=NO") - endif() - - if(VCPKG_TARGET_ARCHITECTURE MATCHES "^arm") - list(APPEND NMAKE_OPTIONS "SSEFLAGS=/DNO_SSSE" "AVXFLAGS=/DNO_AVX") - endif() - - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND NMAKE_OPTIONS "DLLBUILD=0") - else() - list(APPEND NMAKE_OPTIONS "DLLBUILD=1" "WITH_PDB=1") - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") - find_dependency_win() +# Cf. cmake/helpers/CheckDependentLibraries.cmake +# The default for all `GDAL_USE_` dependencies is `OFF`. +# Here, we explicitly control dependencies provided via vpcpkg. +# "core" is used for a dependency which must be enabled to avoid vendored lib. +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cfitsio GDAL_USE_CFITSIO + curl GDAL_USE_CURL + recommended-features GDAL_USE_EXPAT + freexl GDAL_USE_FREEXL + geos GDAL_USE_GEOS + core GDAL_USE_GEOTIFF + default-features GDAL_USE_GIF + hdf5 GDAL_USE_HDF5 + default-features GDAL_USE_ICONV + default-features GDAL_USE_JPEG + core GDAL_USE_JSONC + lerc GDAL_USE_LERC + libkml GDAL_USE_LIBKML # TODO, needs policy patches to FindLibKML.cmake + default-features GDAL_USE_LIBLZMA + default-features GDAL_USE_LIBXML2 + mysql-libmariadb GDAL_USE_MYSQL + netcdf GDAL_USE_NETCDF + odbc GDAL_USE_ODBC + default-features GDAL_USE_OPENJPEG + default-features GDAL_USE_OPENSSL + default-features GDAL_USE_PCRE2 + default-features GDAL_USE_PNG + poppler GDAL_USE_POPPLER + postgresql GDAL_USE_POSTGRESQL + default-features GDAL_USE_QHULL + #core GDAL_USE_SHAPELIB # https://github.com/OSGeo/gdal/issues/5711, https://github.com/microsoft/vcpkg/issues/16041 + core GDAL_USE_SHAPELIB_INTERNAL + libspatialite GDAL_USE_SPATIALITE + recommended-features GDAL_USE_SQLITE3 + core GDAL_USE_TIFF + default-features GDAL_USE_WEBP + core GDAL_USE_ZLIB + default-features GDAL_USE_ZSTD +) +if(GDAL_USE_ICONV AND VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS -D_ICONV_SECOND_ARGUMENT_IS_NOT_CONST=ON) +endif() - if("tools" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=1") - else() - list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=0") - endif() - list(APPEND NMAKE_OPTIONS_DBG "BUILD_TOOLS=0") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS_RELEASE + FEATURES + tools BUILD_APPS +) - # Begin build process - vcpkg_install_nmake( - SOURCE_PATH "${SOURCE_PATH}/gdal" - TARGET devinstall - OPTIONS - ${NMAKE_OPTIONS} - OPTIONS_RELEASE - ${NMAKE_OPTIONS_REL} - OPTIONS_DEBUG - ${NMAKE_OPTIONS_DBG} - ) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_DOCS=OFF + -DBUILD_PYTHON_BINDINGS=OFF + -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_CSharp=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Java=ON + -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON + -DCMAKE_DISABLE_FIND_PACKAGE_SWIG=ON + -DGDAL_USE_INTERNAL_LIBS=OFF + -DGDAL_USE_EXTERNAL_LIBS=OFF + -DGDAL_BUILD_OPTIONAL_DRIVERS=ON + -DOGR_BUILD_OPTIONAL_DRIVERS=ON + -DGDAL_CHECK_PACKAGE_NetCDF_NAMES=netCDF + -DGDAL_CHECK_PACKAGE_NetCDF_TARGETS=netCDF::netcdf + OPTIONS_RELEASE + ${FEATURE_OPTIONS_RELEASE} + OPTIONS_DEBUG + -DBUILD_APPS=OFF +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gdal) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdal/GDALConfig.cmake" + "include(CMakeFindDependencyMacro)" + "include(CMakeFindDependencyMacro) +# gdal needs a pkg-config tool. A host dependency provides pkgconf. +get_filename_component(vcpkg_host_prefix \"\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}\" ABSOLUTE) +list(APPEND CMAKE_PROGRAM_PATH \"\${vcpkg_host_prefix}/tools/pkgconf\")" +) - if("tools" IN_LIST FEATURES) - set(GDAL_EXES - gdal_contour - gdal_create +if (BUILD_APPS) + vcpkg_copy_tools( + TOOL_NAMES + gdalinfo + gdalbuildvrt + gdaladdo gdal_grid - gdal_rasterize gdal_translate - gdal_viewshed - gdaladdo - gdalbuildvrt - gdaldem + gdal_rasterize + gdalsrsinfo gdalenhance - gdalinfo - gdallocationinfo gdalmanage - gdalmdiminfo - gdalmdimtranslate - gdalsrsinfo - gdaltindex gdaltransform - gdalwarp - gnmanalyse - gnmmanage + gdaltindex + gdaldem + gdal_create + gdal_viewshed nearblack - ogr2ogr - ogrinfo ogrlineref ogrtindex - ) - # vcpkg_copy_tools removes the bin directories for us so no need to remove again - vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) - elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/share/gdal/html") - - vcpkg_copy_pdbs() - - if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/gdal304_d.pdb" "${CURRENT_PACKAGES_DIR}/lib/gdal304.pdb") - endif() - -else() - # See https://github.com/microsoft/vcpkg/issues/16990 - file(TOUCH "${SOURCE_PATH}/gdal/config.rpath") - - set(CONF_OPTS - --with-gnm=yes - --with-hide-internal-symbols=yes - --with-java=no - --with-perl=no - --with-python=no - ) - set(CONF_CHECKS "") - function(add_config option check) - list(APPEND CONF_OPTS "${option}") - set(CONF_OPTS "${CONF_OPTS}" PARENT_SCOPE) - list(APPEND CONF_CHECKS "${check}") - set(CONF_CHECKS "${CONF_CHECKS}" PARENT_SCOPE) - endfunction() - # parameters in the same order as the dependencies in vcpkg.json - add_config("--with-curl=yes" "cURL support .wms/wcs/....:yes") - add_config("--with-expat=yes" "Expat support: yes") - add_config("--with-geos=yes" "GEOS support: yes") - add_config("--with-gif=yes" "LIBGIF support: external") - add_config("--with-libjson=yes" "checking for JSONC... yes") - add_config("--with-geotiff=yes" "LIBGEOTIFF support: external") - add_config("--with-jpeg=yes" "LIBJPEG support: external") - add_config("--with-liblzma=yes" "LIBLZMA support: yes") - add_config("--with-png=yes" "LIBPNG support: external") - add_config("--with-webp=yes" "WebP support: yes") - add_config("--with-xml2=yes" "libxml2 support: yes") - add_config("--with-openjpeg=yes" "OpenJPEG support: yes") - add_config("--with-proj=yes" "PROJ >= 6: yes") - add_config("--with-sqlite3=yes" "SQLite support: yes") - add_config("--with-libtiff=yes" "LIBTIFF support: external") - add_config("--with-libz=yes" "LIBZ support: external") - add_config("--with-zstd=yes" "ZSTD support: yes") - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND CONF_OPTS --without-libtool --without-ld-shared) - endif() - - if("system-libraries" IN_LIST FEATURES) - set(DISABLE_SYSTEM_LIBRARIES OFF) - else() - set(DISABLE_SYSTEM_LIBRARIES ON) - endif() - - if ("libspatialite" IN_LIST FEATURES) - add_config("--with-spatialite=yes" "SpatiaLite support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-spatialite=no" "SpatiaLite support: no") - endif() - - if ("poppler" IN_LIST FEATURES) - add_config("--with-poppler=yes" "Poppler support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-poppler=no" "Poppler support: no") - endif() - if ("postgresql" IN_LIST FEATURES) - add_config("--with-pg=yes" "PostgreSQL support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-pg=no" "PostgreSQL support: no") - endif() - - if ("mysql-libmariadb" IN_LIST FEATURES) - add_config("--with-mysql=yes" "MySQL support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-mysql=no" "MySQL support: no") - endif() - - if ("cfitsio" IN_LIST FEATURES) - add_config("--with-cfitsio=yes" "CFITSIO support: external") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-cfitsio=no" "CFITSIO support: no") - endif() - - if ("hdf5" IN_LIST FEATURES) - add_config("--with-hdf5=yes" "HDF5 support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-hdf5=no" "HDF5 support: no") - endif() - - if ("netcdf" IN_LIST FEATURES) - add_config("--with-netcdf=yes" "NetCDF support: yes") - elseif(DISABLE_SYSTEM_LIBRARIES) - add_config("--with-netcdf=no" "NetCDF support: no") - endif() - - if(DISABLE_SYSTEM_LIBRARIES) - list(APPEND CONF_OPTS - # Too much: --disable-all-optional-drivers - # alphabetical order - --with-armadillo=no - --with-blosc=no - --with-brunsli=no - --with-charls=no - --with-crypto=no - --with-cryptopp=no - --with-dds=no - --with-dods-root=no - --with-ecw=no - --with-epsilon=no - --with-exr=no - --with-fgdb=no - --with-fme=no - --with-freexl=no - --with-grass=no - --with-gta=no - --with-hdf4=no - --with-hdfs=no - --with-heif=no - --with-idb=no - --with-ingres=no - --with-jp2lura=no - --with-jp2mrsid=no - --with-jasper=no - --with-jxl=no - --with-kakadu=no - --with-kea=no - --with-lerc=no - --with-libdeflate=no - --with-libgrass=no - --with-libkml=no - --with-lz4=no - --with-mdb=no - --with-mongocxx=no - --with-mongocxxv3=no - --with-mrsid=no - --with-mrsid_lidar=no - --with-msg=no - --with-null=no - --with-oci=no - --with-odbc=no - --with-ogdi=no - --with-opencl=no - --with-pcidsk=no - --with-pcraster=no - --with-pcre=no - --with-pcre2=no - --with-pdfium=no - --with-podofo=no - --with-qhull=no - --with-rasdaman=no - --with-rasterlite2=no - --with-rdb=no - --with-sfcgal=no - --with-sosi=no - --with-teigha=no - --with-tiledb=no - --with-xerces=no - ) - endif() - - x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES proj LIBS) - - if("tools" IN_LIST FEATURES) - list(APPEND CONF_OPTS "--with-tools=yes") - else() - list(APPEND CONF_OPTS "--with-tools=no") - endif() - - if(VCPKG_TARGET_IS_ANDROID AND (VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm")) - list(APPEND CONF_OPTS --with-unix-stdio-64=no) - endif() - - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}/gdal" - AUTOCONFIG - COPY_SOURCE - OPTIONS - ${CONF_OPTS} - OPTIONS_RELEASE - "--with-proj-extra-lib-for-test=${PROJ_LIBS_RELEASE}" - OPTIONS_DEBUG - --enable-debug - --with-tools=no - "--with-proj-extra-lib-for-test=${PROJ_LIBS_DEBUG}" - ) - - # Verify configuration results (tightly coupled to vcpkg_configure_make) - function(check_config logfile) - set(failed_checks "") - file(READ "${logfile}" log) - foreach(check IN LISTS CONF_CHECKS) - if(NOT log MATCHES "${check}") - string(APPEND failed_checks "\n ${check}") - endif() - endforeach() - if(failed_checks) - get_filename_component(file "${logfile}" NAME_WE) - message(FATAL_ERROR "${file}: Configuration failed for ${failed_checks}") - endif() - endfunction() - foreach(suffix IN ITEMS rel dbg) - set(log "${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-${suffix}-out.log") - if(EXISTS "${log}") - check_config("${log}") - endif() - endforeach() - - vcpkg_install_make(MAKEFILE GNUmakefile) + gdalwarp + gdal_contour + gdallocationinfo + ogrinfo + ogr2ogr + ogrlineref + nearblack + gdalmdiminfo + gdalmdimtranslate + gnmanalyse + gnmmanage + AUTO_CLEAN + ) +endif() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) +file(GLOB bin_files "${CURRENT_PACKAGES_DIR}/bin/*") +list(REMOVE_ITEM bin_files "${CURRENT_PACKAGES_DIR}/bin/gdal-config") +if(NOT bin_files) file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/lib/gdalplugins" - "${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins" - "${CURRENT_PACKAGES_DIR}/debug/share" - ) - - vcpkg_fixup_pkgconfig() - set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdal.pc") - if(EXISTS "${pc_file_debug}") - vcpkg_replace_string("${pc_file_debug}" "\${prefix}/../../include" "\${prefix}/../include") - vcpkg_replace_string("${pc_file_debug}" "\${exec_prefix}/include" "\${prefix}/../include") - endif() - - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/debug/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") - - if("libspatialite" IN_LIST FEATURES) - list(APPEND extra_exports SPATIALITE) - x_vcpkg_pkgconfig_get_modules( - PREFIX SPATIALITE - MODULES spatialite - LIBS - ) - endif() + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) endif() -string(COMPARE NOTEQUAL "${NMAKE_OPTIONS}" "" NMAKE_BUILD) -set(GDAL_EXTRA_LIBS_DEBUG "") -set(GDAL_EXTRA_LIBS_RELEASE "") -foreach(prefix IN LISTS extra_exports) - string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_DEBUG}") - string(APPEND GDAL_EXTRA_LIBS_DEBUG " ${libs}") - string(REPLACE "${CURRENT_INSTALLED_DIR}/" "\${CMAKE_CURRENT_LIST_DIR}/../../" libs "${${prefix}_LIBS_RELEASE}") - string(APPEND GDAL_EXTRA_LIBS_RELEASE " ${libs}") -endforeach() -string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_DEBUG "${GDAL_EXTRA_LIBS_DEBUG}") -string(REPLACE "/lib/pkgconfig/../.." "" GDAL_EXTRA_LIBS_RELEASE "${GDAL_EXTRA_LIBS_RELEASE}") -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) - +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/gdal/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gdal/usage b/ports/gdal/usage index 63a67bc07d0748..6982a9a2425985 100644 --- a/ports/gdal/usage +++ b/ports/gdal/usage @@ -1,5 +1,4 @@ The package GDAL provides CMake targets: - find_package(GDAL REQUIRED) - target_include_directories(main PRIVATE ${GDAL_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${GDAL_LIBRARIES}) + find_package(GDAL CONFIG REQUIRED) + target_link_libraries(main PRIVATE GDAL::GDAL) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 305de834ed73ab..5b70b673b0979d 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -1,151 +1,23 @@ -include(SelectLibraryConfigurations) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0054 NEW) -find_path(GDAL_INCLUDE_DIR - NAMES gdal.h - PATHS "${CMAKE_CURRENT_LIST_DIR}/../../include" - NO_DEFAULT_PATH -) -find_library(GDAL_LIBRARY_DEBUG - NAMES gdal_d gdal_i_d gdal - NAMES_PER_DIR - PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" - NO_DEFAULT_PATH -) -find_library(GDAL_LIBRARY_RELEASE - NAMES gdal_i gdal - NAMES_PER_DIR - PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" - NO_DEFAULT_PATH -) -select_library_configurations(GDAL) - -if(NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY) - message(FATAL_ERROR "Installation of vcpkg port gdal is broken.") +list(REMOVE_ITEM ARGS "NO_MODULE" "CONFIG" "MODULE") +list(APPEND ARGS "CONFIG") +# The current port version should satisfy GDAL 3.0 ... 3.5 +list(GET ARGS 1 vcpkg_gdal_maybe_version) +if(vcpkg_gdal_maybe_version MATCHES "(^3\$|^3[.][0-5])") + list(REMOVE_AT ARGS "1") endif() - -set(GDAL_LIBRARY "${GDAL_LIBRARY}" CACHE STRING "") - -set(FindGDAL_SKIP_GDAL_CONFIG TRUE) - -_find_package(${ARGS}) - -set(_gdal_dep_find_args "") -if(";${ARGS};" MATCHES ";REQUIRED;") - list(APPEND _gdal_dep_find_args "REQUIRED") -endif() -function(_gdal_add_dependency target package) - find_package(${package} ${ARGN} ${_gdal_dep_find_args}) - if(${package}_FOUND) - foreach(suffix IN ITEMS "" "-shared" "_shared" "-static" "_static" "-NOTFOUND") - set(dependency "${target}${suffix}") - if(TARGET ${dependency}) - break() - endif() - endforeach() - if(NOT TARGET ${dependency}) - string(TOUPPER ${package} _gdal_deps_package) - if(DEFINED ${_gdal_deps_package}_LIBRARIES) - set(dependency ${${_gdal_deps_package}_LIBRARIES}) - elseif(DEFINED ${package}_LIBRARIES) - set(dependency ${${package}_LIBRARIES}) - elseif(DEFINED ${_gdal_deps_package}_LIBRARY) - set(dependency ${${_gdal_deps_package}_LIBRARY}) - elseif(DEFINED ${package}_LIBRARY) - set(dependency ${${package}_LIBRARY}) - endif() - endif() - if(dependency) - if(TARGET GDAL::GDAL) # CMake 3.14 - set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${dependency}) - endif() - if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") - set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${dependency}" PARENT_SCOPE) - endif() - else() - message(WARNING "Did not find which libraries are exported by ${package}") - set(GDAL_FOUND false PARENT_SCOPE) - endif() - else() - message(WARNING "Could not find package ${package}") - set(GDAL_FOUND false PARENT_SCOPE) - endif() -endfunction() -function(z_vcpkg_gdal_add_libs keyword config) - set(gdal_deps_target "unofficial::gdal::deps::${keyword}") - if(NOT TARGET "${gdal_deps_target}") - add_library("${gdal_deps_target}" INTERFACE IMPORTED) - if(TARGET GDAL::GDAL) # CMake 3.14 - set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "$<$:${gdal_deps_target}>") - endif() - if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") - set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${keyword};${gdal_deps_target}" PARENT_SCOPE) - endif() - endif() - # The Ninja build system stumbles over '/libpath:` in INTERFACE_LINK_LIBRARIES. - set(lib_paths "${ARGN}") - list(REMOVE_DUPLICATES lib_paths) # For lib paths, late duplicates are redundant. - foreach(item IN LISTS lib_paths) - # INTERFACE_LINK_OPTIONS needs CMake 3.13. There is no direct alternative for older versions. - if(item MATCHES "^/libpath:(.*)|^-L") - set_property(TARGET "${gdal_deps_target}" APPEND PROPERTY INTERFACE_LINK_OPTIONS "${item}") - list(REMOVE_ITEM ARGN "${item}") - endif() - endforeach() - foreach(item IN LISTS ARGN) - get_property(libs TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES) - if(item MATCHES "^-l|-pthread") - list(REMOVE_ITEM libs "${item}") # For libs, early duplicates are normally redundant. - endif() - list(APPEND libs "${item}") - set_property(TARGET "${gdal_deps_target}" PROPERTY INTERFACE_LINK_LIBRARIES "${libs}") - endforeach() -endfunction() +unset(vcpkg_gdal_maybe_version) +_find_package(${ARGS} CONFIG) if(GDAL_FOUND) - cmake_policy(PUSH) - cmake_policy(SET CMP0057 NEW) - set(Z_VCPKG_PORT_FEATURES "@FEATURES@") - if("cfitsio" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(cfitsio unofficial-cfitsio CONFIG) - endif() - _gdal_add_dependency(CURL::libcurl CURL CONFIG) - _gdal_add_dependency(expat::expat expat CONFIG) - _gdal_add_dependency(GEOS::geos_c geos CONFIG) - if(NOT "@NMAKE_BUILD@") - _gdal_add_dependency(GIF::GIF GIF) - endif() - if("hdf5" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) - endif() - if(NOT "@NMAKE_BUILD@") - _gdal_add_dependency(json-c::json-c json-c CONFIG) - endif() - _gdal_add_dependency(geotiff_library GeoTIFF CONFIG) - _gdal_add_dependency(JPEG::JPEG JPEG) - _gdal_add_dependency(LibLZMA::LibLZMA LibLZMA) - _gdal_add_dependency(png libpng CONFIG) - if("poppler" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(unofficial::poppler::poppler-private unofficial-poppler) - endif() - if("postgresql" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(PostgreSQL::PostgreSQL PostgreSQL) - endif() - _gdal_add_dependency(WebP::webp WebP CONFIG) - _gdal_add_dependency(LibXml2::LibXml2 LibXml2) - if("netcdf" IN_LIST Z_VCPKG_PORT_FEATURES) - _gdal_add_dependency(netCDF::netcdf netCDF CONFIG) - endif() - _gdal_add_dependency(openjp2 OpenJPEG CONFIG) - _gdal_add_dependency(PROJ::proj PROJ4 CONFIG) - _gdal_add_dependency(unofficial::sqlite3::sqlite3 unofficial-sqlite3 CONFIG) - _gdal_add_dependency(TIFF::TIFF TIFF) - _gdal_add_dependency(ZLIB::ZLIB ZLIB) - _gdal_add_dependency(zstd::libzstd zstd CONFIG) - z_vcpkg_gdal_add_libs(optimized Release @GDAL_EXTRA_LIBS_RELEASE@) - z_vcpkg_gdal_add_libs(debug Debug @GDAL_EXTRA_LIBS_DEBUG@) - list(FIND ARGS "REQUIRED" required) - if(NOT GDAL_FOUND AND NOT required EQUAL "-1") - message(FATAL_ERROR "Failed to find dependencies of GDAL") - endif() - unset(Z_VCPKG_PORT_FEATURES) - cmake_policy(POP) + get_filename_component(vcpkg_gdal_prefix "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) + set(GDAL_INCLUDE_DIR "${vcpkg_gdal_prefix}/include" CACHE INTERNAL "") + set(GDAL_INCLUDE_DIRS "${GDAL_INCLUDE_DIR}") + set(GDAL_LIBRARY GDAL::GDAL CACHE INTERNAL "") + set(GDAL_LIBRARIES "${GDAL_LIBRARY}") + unset(vcpkg_gdal_prefix) endif() + +cmake_policy(POP) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 1f7f58bdc49b2e..ac66a9aedf6e2f 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,45 +1,35 @@ { "name": "gdal", - "version-semver": "3.4.3", - "port-version": 3, + "version-semver": "3.5.1", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, + "supports": "!uwp", "dependencies": [ - "curl", - "expat", - "geos", + "json-c", + "libgeotiff", { - "name": "giflib", - "platform": "!windows | mingw" + "name": "pkgconf", + "host": true }, + "proj", + "tiff", { - "name": "json-c", - "platform": "!windows | mingw" + "name": "vcpkg-cmake", + "host": true }, - "libgeotiff", { - "name": "libiconv", - "platform": "windows & !mingw" - }, - "libjpeg-turbo", - "liblzma", - "libpng", - "libwebp", - "libxml2", - "openjpeg", - "proj", - "sqlite3", - "tiff", + "name": "vcpkg-cmake-config", + "host": true + }, { "name": "vcpkg-pkgconfig-get-modules", "host": true }, - "zlib", - "zstd" + "zlib" ], "default-features": [ - "supported-default-features" + "default-features" ], "features": { "aws-ec2-windows": { @@ -54,10 +44,85 @@ "cfitsio" ] }, + "curl": { + "description": "Enable CURL network support", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] + }, + "default-features": { + "description": "Default set of features, including recommended features", + "dependencies": [ + "expat", + { + "name": "gdal", + "default-features": false, + "features": [ + "curl", + "geos", + "libspatialite", + "recommended-features" + ] + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "postgresql" + ], + "platform": "!uwp" + }, + { + "name": "gdal", + "default-features": false, + "features": [ + "hdf5", + "netcdf" + ], + "platform": "!uwp & !(windows & arm64) & !android" + }, + "giflib", + "libiconv", + "libjpeg-turbo", + "liblzma", + "libpng", + "libwebp", + "libxml2", + "openjpeg", + "openssl", + "pcre2", + "qhull", + "zstd" + ] + }, + "freexl": { + "description": "Enable FREEXL support", + "dependencies": [ + "freexl" + ] + }, + "geos": { + "description": "Enable GEOS support", + "dependencies": [ + "geos" + ] + }, "hdf5": { "description": "Enable HDF5 support", "dependencies": [ - "hdf5" + { + "name": "hdf5", + "default-features": false + } + ] + }, + "lerc": { + "description": "Enable LERC support", + "dependencies": [ + "lerc" ] }, "libspatialite": { @@ -75,11 +140,14 @@ "netcdf": { "description": "Enable NetCDF support", "dependencies": [ - "netcdf-c" + { + "name": "netcdf-c", + "default-features": false + } ] }, "poppler": { - "description": "Enable poppler support", + "description": "Enable PDF reading support via poppler", "dependencies": [ { "name": "poppler", @@ -96,30 +164,32 @@ "libpq" ] }, - "supported-default-features": { - "description": "Default set of features, dependent on platform", + "recommended-features": { + "description": "Features that are explicity marked as recommended by GDAL.", "dependencies": [ + "expat", { - "name": "gdal", - "default-features": false, + "name": "sqlite3", "features": [ - "postgresql" - ], - "platform": "!uwp" - }, + "rtree" + ] + } + ] + }, + "supported-default-features": { + "description": "This feature is an alias for default-features. It is retained for compatibility.", + "dependencies": [ { "name": "gdal", - "default-features": false, "features": [ - "hdf5", - "netcdf" - ], - "platform": "!uwp & !(windows & arm64)" + "default-features" + ] } ] }, "system-libraries": { - "description": "Include drivers which need additional libraries" + "$supports": "!windows", + "description": "This feature does nothing. It is retained for compatibility." }, "tools": { "description": "Builds gdal and ogr executables" diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index d6cc3d7555f268..072a8da74f9855 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES cmakelists.patch skip-doc-install.patch + public-dependencies.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libgeotiff/public-dependencies.patch b/ports/libgeotiff/public-dependencies.patch new file mode 100644 index 00000000000000..c2729732a3919d --- /dev/null +++ b/ports/libgeotiff/public-dependencies.patch @@ -0,0 +1,47 @@ +diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt +index 1840258..fcf2dd0 100644 +--- a/libgeotiff/CMakeLists.txt ++++ b/libgeotiff/CMakeLists.txt +@@ -311,17 +311,18 @@ endif() + SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES + OUTPUT_NAME ${GEOTIFF_LIB_NAME}) + +-set(CONFIG_DEPENDENCIES "") ++set(CONFIG_PUBLIC_DEPENDENCIES "") ++set(CONFIG_PRIVATE_DEPENDENCIES "") + if(TARGET TIFF::TIFF) + set(TIFF_LIBRARIES TIFF::TIFF) +- string(APPEND CONFIG_DEPENDENCIES " find_dependency(TIFF)\n") ++ string(APPEND CONFIG_PUBLIC_DEPENDENCIES "find_dependency(TIFF)\n") + endif() + target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PUBLIC + ${TIFF_LIBRARIES}) + + if(TARGET PROJ::proj) + set(PROJ_LIBRARIES PROJ::proj) +- string(APPEND CONFIG_DEPENDENCIES " find_dependency(PROJ CONFIG)\n") ++ string(APPEND CONFIG_PRIVATE_DEPENDENCIES " find_dependency(PROJ CONFIG)\n") + endif() + target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE + ${PROJ_LIBRARIES}) +diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in +index 3690489..87de991 100644 +--- a/libgeotiff/cmake/project-config.cmake.in ++++ b/libgeotiff/cmake/project-config.cmake.in +@@ -22,13 +22,14 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin") + unset (_ROOT) + unset (_DIR) + ++include(CMakeFindDependencyMacro) ++@CONFIG_PUBLIC_DEPENDENCIES@ + set (@PROJECT_NAME@_LIBRARIES @GEOTIFF_LIBRARY_TARGET@) + if("@BUILD_SHARED_LIBS@") + set (@PROJECT_NAME@_SHARED_LIBRARIES ${@PROJECT_NAME@_LIBRARIES}) + else() + set (@PROJECT_NAME@_STATIC_LIBRARIES ${@PROJECT_NAME@_LIBRARIES}) +- include(CMakeFindDependencyMacro) +-@CONFIG_DEPENDENCIES@ ++@CONFIG_PRIVATE_DEPENDENCIES@ + endif() + + if(NOT @PROJECT_NAME@_FIND_QUIETLY) diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json index fc3ed37f7b602c..d6def89ba1c29e 100644 --- a/ports/libgeotiff/vcpkg.json +++ b/ports/libgeotiff/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgeotiff", "version": "1.7.1", + "port-version": 1, "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 96da10ce1e965d..290f7c1f6a8a8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2465,8 +2465,8 @@ "port-version": 0 }, "gdal": { - "baseline": "3.4.3", - "port-version": 3 + "baseline": "3.5.1", + "port-version": 0 }, "gdcm": { "baseline": "3.0.12", @@ -3630,7 +3630,7 @@ }, "libgeotiff": { "baseline": "1.7.1", - "port-version": 0 + "port-version": 1 }, "libgit2": { "baseline": "1.4.2", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 61c03b9ecd7638..70f860dce77b4a 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f623db2a0771ad4df6c248b046cd8f369ecbdcca", + "version-semver": "3.5.1", + "port-version": 0 + }, { "git-tree": "cf1b59dd5a8518c4003a7d23d0db857315af0db9", "version-semver": "3.4.3", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index 6c93ee7b6d60a5..a3b344bf260493 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa303b0481fcc35024bae8af620ab2271ca9b5b2", + "version": "1.7.1", + "port-version": 1 + }, { "git-tree": "5f9baab006dd2bd507b6b8f63d2226dc6ce97cd1", "version": "1.7.1", From a8f38e3f80b32f4f302a416dfd77bcba73dbf0ec Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 8 Jul 2022 19:13:10 +0200 Subject: [PATCH 064/791] [gdal] Fix hdf5 dependency (#25646) * Fix gdal hdf5 dependency * Update versions --- ports/gdal/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index ac66a9aedf6e2f..8fba9efc9bde81 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.5.1", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -115,7 +116,10 @@ "dependencies": [ { "name": "hdf5", - "default-features": false + "default-features": false, + "features": [ + "cpp" + ] } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 290f7c1f6a8a8e..4b3b00bdc1ce14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2466,7 +2466,7 @@ }, "gdal": { "baseline": "3.5.1", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 70f860dce77b4a..bf3f5a024fe1c9 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd8ff4159201d96aecb0cc2de325b56a522ae0e1", + "version-semver": "3.5.1", + "port-version": 1 + }, { "git-tree": "f623db2a0771ad4df6c248b046cd8f369ecbdcca", "version-semver": "3.5.1", From 687b901843db7726b05558a8e705808dee9370f2 Mon Sep 17 00:00:00 2001 From: Matthieu Penant Date: Fri, 8 Jul 2022 15:25:01 -0400 Subject: [PATCH 065/791] [gtest] update to 1.12.1 (#25630) * gtest 1.12.1 * Update gtest.json --- ports/gtest/portfile.cmake | 4 ++-- ports/gtest/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtest.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 2d8df71217c361..6b1446d4d5ca1b 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/googletest - REF release-1.12.0 - SHA512 6216e76a8c988b6b3739f3988c85f369eef2a8036c4412621a0d3d04ceeada00d35e487363be0a265035ac78f1a5065e1fe054a285c43df23b6abcc69f8bfe3d + REF release-1.12.1 + SHA512 a9104dc6c53747e36e7dd7bb93dfce51a558bd31b487a9ef08def095518e1296da140e0db263e0644d9055dbd903c0cb69380cb2322941dbfb04780ef247df9c HEAD_REF main PATCHES clang-tidy-no-lint.patch diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 28ad9d1329309e..a4ab44499b2de5 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtest", - "version-semver": "1.12.0", + "version-semver": "1.12.1", "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 4b3b00bdc1ce14..72a12536e303b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2709,7 +2709,7 @@ "port-version": 5 }, "gtest": { - "baseline": "1.12.0", + "baseline": "1.12.1", "port-version": 0 }, "gtk": { diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 4b947ebb7a0652..fe2b3942aca805 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f4ae2732d1a648bdfe56b16ae5d68df63ecf344", + "version-semver": "1.12.1", + "port-version": 0 + }, { "git-tree": "da295db55242fd454a3b42486c3f9043356ca40f", "version-semver": "1.12.0", From 0ee38930a52b5448cbf2879c5a7b180af17f8369 Mon Sep 17 00:00:00 2001 From: Aleksi Sapon Date: Fri, 8 Jul 2022 15:26:00 -0400 Subject: [PATCH 066/791] [boost-modular-build-helper] Add iOS platform (#25628) --- ports/boost-modular-build-helper/CMakeLists.txt | 6 +++++- ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 4fb8e4eee1ffd5..faa87bdad6e161 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -68,7 +68,11 @@ endif() if(WIN32) list(APPEND B2_OPTIONS target-os=windows) elseif(APPLE) - list(APPEND B2_OPTIONS target-os=darwin) + if(IOS) + list(APPEND B2_OPTIONS target-os=iphone) + else() + list(APPEND B2_OPTIONS target-os=darwin) + endif() elseif(ANDROID) list(APPEND B2_OPTIONS target-os=android) else() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index da2d5542eb6599..a2c7ed04a96ab6 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.79.0", - "port-version": 3, + "port-version": 4, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 1587b2ddd267b1..f89e97eb602681 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd7a5259d9e086b94af5673e581427f76957ce62", + "version": "1.79.0", + "port-version": 4 + }, { "git-tree": "e416ef5af7f6a850fd3ee6493fb3a359cd7ac6ba", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 72a12536e303b7..d40a0338a11e65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -834,7 +834,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.79.0", From 0e26a78abe4065dad523338e35d16666be0fca06 Mon Sep 17 00:00:00 2001 From: Berrae Meixsell Date: Fri, 8 Jul 2022 14:28:04 -0500 Subject: [PATCH 067/791] [cppcodec] Windows compatibility fix (#25624) * [cppcodec] Windows compatibility fix * Update version database * Updating version-string to version * Updating version database --- ports/cppcodec/0001-Fix-62.patch | 28 ++++++++++++++++++++++++++++ ports/cppcodec/portfile.cmake | 1 + ports/cppcodec/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/c-/cppcodec.json | 5 +++++ 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 ports/cppcodec/0001-Fix-62.patch diff --git a/ports/cppcodec/0001-Fix-62.patch b/ports/cppcodec/0001-Fix-62.patch new file mode 100644 index 00000000000000..af12439e9a10e7 --- /dev/null +++ b/ports/cppcodec/0001-Fix-62.patch @@ -0,0 +1,28 @@ +From 9f67d7026d3dee8fc6a0af614d97f9365cee2872 Mon Sep 17 00:00:00 2001 +From: Gabriele_Frau +Date: Wed, 17 Oct 2018 14:35:54 +0200 +Subject: [PATCH] Fix #62 + + includes macro definitions named max and min, wrap the call to max and min with parentheses, which prevent the macro expansion +--- + cppcodec/detail/stream_codec.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cppcodec/detail/stream_codec.hpp b/cppcodec/detail/stream_codec.hpp +index d4204bc..4d8d054 100644 +--- a/cppcodec/detail/stream_codec.hpp ++++ b/cppcodec/detail/stream_codec.hpp +@@ -187,8 +187,8 @@ template + static CPPCODEC_ALWAYS_INLINE constexpr size_t num_possible_values() + { + return static_cast( +- static_cast(std::numeric_limits::max()) +- - static_cast(std::numeric_limits::min()) + 1); ++ static_cast((std::numeric_limits::max)()) ++ - static_cast((std::numeric_limits::min)()) + 1); + } + + template +-- +2.32.0.windows.1 + diff --git a/ports/cppcodec/portfile.cmake b/ports/cppcodec/portfile.cmake index 792e734f5d4607..cd519b701a3092 100644 --- a/ports/cppcodec/portfile.cmake +++ b/ports/cppcodec/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v0.2 SHA512 50c9c81cdb12560c87e513e1fd22c1ad24ea37b7d20a0e3044d43fb887f4c6494c69468e4d0811cd2fc1ae8fdb01b01cfb9f3cfdd8611d4bb0221cbd38cbead3 HEAD_REF master + PATCHES 0001-Fix-62.patch ) vcpkg_configure_cmake( diff --git a/ports/cppcodec/vcpkg.json b/ports/cppcodec/vcpkg.json index 1066a7b85b689c..e685ad5eca926d 100644 --- a/ports/cppcodec/vcpkg.json +++ b/ports/cppcodec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppcodec", - "version-string": "0.2", - "port-version": 2, + "version": "0.2", + "port-version": 3, "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32." } diff --git a/versions/baseline.json b/versions/baseline.json index d40a0338a11e65..66da4a7ec7a8cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1618,7 +1618,7 @@ }, "cppcodec": { "baseline": "0.2", - "port-version": 2 + "port-version": 3 }, "cppcoro": { "baseline": "2020-02-28", diff --git a/versions/c-/cppcodec.json b/versions/c-/cppcodec.json index bfdbbaccc7159a..196cd3b0fc0ec6 100644 --- a/versions/c-/cppcodec.json +++ b/versions/c-/cppcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2b218c7d3aef05b777ea2537d59b6d1aa2bbf4e", + "version": "0.2", + "port-version": 3 + }, { "git-tree": "cb6b230ec592ba7bc54d85013007f501971f03fa", "version-string": "0.2", From 0ed00ce68b1e1834669241d11aed7c1596eec465 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Sat, 9 Jul 2022 03:30:46 +0800 Subject: [PATCH 068/791] [boost-build] Fix build failure for loongarch64 (#25613) * Fix build failure for loongarch64 cpu. * Update port version of boost-build. * Update port version database. * update sha512 of libharu-shading-pr-157.patch * update vcpkg.json of libharu * fix spelling wrong for 'version-date'. * update port version database * Revert "update sha512 of libharu-shading-pr-157.patch" This reverts commit 64410af12c45cae1c23fa48287ef08e6adfa41c0. * update port version database Co-authored-by: Jamlys Lee --- ...update-architecture-feature.jam-file.patch | 45 +++++++++++++++++++ ports/boost-build/portfile.cmake | 1 + ports/boost-build/vcpkg.json | 1 + versions/b-/boost-build.json | 5 +++ versions/baseline.json | 2 +- versions/l-/libharu.json | 5 +++ 6 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 ports/boost-build/0003-update-architecture-feature.jam-file.patch diff --git a/ports/boost-build/0003-update-architecture-feature.jam-file.patch b/ports/boost-build/0003-update-architecture-feature.jam-file.patch new file mode 100644 index 00000000000000..1f00a166d40f69 --- /dev/null +++ b/ports/boost-build/0003-update-architecture-feature.jam-file.patch @@ -0,0 +1,45 @@ +From f1c2f1ec0415e7259cd3ce3e4c20965a1642d9e2 Mon Sep 17 00:00:00 2001 +From: Jamlys Lee +Date: Thu, 7 Jul 2022 13:23:17 +0800 +Subject: [PATCH] update architecture-feature.jam file + +--- + src/tools/features/architecture-feature.jam | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/tools/features/architecture-feature.jam b/src/tools/features/architecture-feature.jam +index 3fb0059..a47c4bf 100755 +--- a/src/tools/features/architecture-feature.jam ++++ b/src/tools/features/architecture-feature.jam +@@ -10,7 +10,7 @@ import feature ; + [[bbv2.builtin.features.architecture]]`architecture`:: + *Allowed values:* `x86`, `ia64`, `sparc`, `power`, `mips`, `mips1`, `mips2`, + `mips3`, `mips4`, `mips32`, `mips32r2`, `mips64`, `parisc`, `arm`, +-`s390x`. ++`s390x`, `loongarch`. + + + Specifies the general processor family to generate code for. + +@@ -30,6 +30,9 @@ feature.feature architecture + # RS/6000 & PowerPC + power + ++ # LoongArch ++ loongarch ++ + # MIPS/SGI + mips mips1 mips2 mips3 mips4 mips32 mips32r2 mips64 + +@@ -44,6 +47,9 @@ feature.feature architecture + + # z Systems (aka s390x) + s390x ++ ++ # Combined architecture(s) ++ arm+x86 + : + propagated optional + ; +-- +2.25.1 + diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index ad45054ade14a1..c683414fc50e96 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( PATCHES 0001-don-t-skip-install-targets.patch 0002-fix-get-version.patch + 0003-update-architecture-feature.jam-file.patch ) vcpkg_download_distfile(ARCHIVE diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 75df22fac6ede7..9572452fba5ee5 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-build", "version": "1.79.0", + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "license": "BSL-1.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index be9fe150c2111f..b86a18058ea638 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5ddae928a30fbcc9d5cb01906a7ee846b1b6c62", + "version": "1.79.0", + "port-version": 1 + }, { "git-tree": "ba4fbdacb5988e8f753bf2098ec257453c50a27a", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 66da4a7ec7a8cd..454e44d62e86c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -582,7 +582,7 @@ }, "boost-build": { "baseline": "1.79.0", - "port-version": 0 + "port-version": 1 }, "boost-callable-traits": { "baseline": "1.79.0", diff --git a/versions/l-/libharu.json b/versions/l-/libharu.json index e08b48e1b6486b..176804b1366bfa 100644 --- a/versions/l-/libharu.json +++ b/versions/l-/libharu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfeaf0d13fce9156ac216daa37a2c945290fc0ed", + "version-date": "2017-08-15", + "port-version": 11 + }, { "git-tree": "312f4b697d2f46818c218e270bd447cdeb76322c", "version-string": "2017-08-15", From 83990a6d9ab690f400ce755fa6444c26e4ff7a7f Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 9 Jul 2022 03:35:19 +0800 Subject: [PATCH 069/791] [readline-win32] export target (#25611) * export target * update homepage url --- ports/readline-win32/CMakeLists.txt | 16 +++++++++++++--- ports/readline-win32/portfile.cmake | 20 +++++++++----------- ports/readline-win32/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 2 +- versions/r-/readline-win32.json | 5 +++++ 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/ports/readline-win32/CMakeLists.txt b/ports/readline-win32/CMakeLists.txt index ac062d0dc9c910..ae560029d16a36 100644 --- a/ports/readline-win32/CMakeLists.txt +++ b/ports/readline-win32/CMakeLists.txt @@ -50,7 +50,17 @@ add_library(readline mbutil.c support/wcwidth.c) +file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h") +install(FILES ${headers} DESTINATION include/readline) + +target_include_directories(readline PUBLIC $ $) + install(TARGETS readline - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) + EXPORT unofficial-readline-win32-config + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +install(EXPORT unofficial-readline-win32-config + NAMESPACE unofficial::readline-win32:: + DESTINATION share/unofficial-readline-win32) diff --git a/ports/readline-win32/portfile.cmake b/ports/readline-win32/portfile.cmake index c6fa9435f536e3..a3641df868e31b 100644 --- a/ports/readline-win32/portfile.cmake +++ b/ports/readline-win32/portfile.cmake @@ -6,21 +6,19 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -# Copy headers -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/readline) -file(GLOB headers "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/*.h") -file(COPY ${headers} DESTINATION ${CURRENT_PACKAGES_DIR}/include/readline) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-readline-win32) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/src/readline/5.0/readline-5.0-src/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/readline-win32/vcpkg.json b/ports/readline-win32/vcpkg.json index 79e3a7f7da34a6..61bf5f62a10bce 100644 --- a/ports/readline-win32/vcpkg.json +++ b/ports/readline-win32/vcpkg.json @@ -1,8 +1,19 @@ { "name": "readline-win32", "version": "5.0", - "port-version": 4, + "port-version": 5, "description": "Implementation of readline for Windows Desktop", - "homepage": "https://github.com/lltcggie", - "supports": "windows & !uwp" + "homepage": "https://github.com/lltcggie/readline", + "license": null, + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 454e44d62e86c6..78ef2c0efba84a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6202,7 +6202,7 @@ }, "readline-win32": { "baseline": "5.0", - "port-version": 4 + "port-version": 5 }, "readosm": { "baseline": "1.1.0a", diff --git a/versions/r-/readline-win32.json b/versions/r-/readline-win32.json index cfba5915001696..9776c9f0bfad6a 100644 --- a/versions/r-/readline-win32.json +++ b/versions/r-/readline-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19f9684f55a9aa01b5612a5ebec47960f51bacdd", + "version": "5.0", + "port-version": 5 + }, { "git-tree": "b1ed33b8ec37a1cf44926c9954b6943bce302b70", "version": "5.0", From 72ef222e774fd8940d7eb85eb9821b68bb1ca1c8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 9 Jul 2022 04:02:45 +0800 Subject: [PATCH 070/791] [libuv] update to 1.44.1 and use official CMakeLists (#24745) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [libuv] update to <1.44.1> * update version * fix ci error * update version * fix-ci-error * [libuv] update to <1.44.1> * update version * add patch * update version * add option * update version * delete patch * update evrsion * fix ci error * update version * delete patch * update evrsion * Use official CMakeLists.txt * Fix build type * Re-fix, fix pkgconfig * Fix usocket build * Fix uvw build * Fix wpilib build * Fix cmake build * Fix tensorpipe build * Fix qpid-proton build * modern portfile * update version * Add licese * update version * Update ports/usockets/CMakeLists.txt * update version * Add usage * Apply suggestion * version * Disable to build examples * version * typo * version * Fix find_package * version * Update version Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/libuv/CMakeLists.txt | 83 -------------- ports/libuv/fix-build-type.patch | 72 +++++++++++++ ports/libuv/portfile.cmake | 34 +++--- ports/libuv/unofficial-libuv-config.in.cmake | 7 -- ports/libuv/usage | 4 + ports/libuv/vcpkg-cmake-wrapper.cmake | 16 --- ports/libuv/vcpkg.json | 3 +- ports/qpid-proton/fix-dependencies.patch | 101 +++++++++--------- ports/qpid-proton/portfile.cmake | 1 + ports/qpid-proton/vcpkg.json | 2 +- ports/tensorpipe/use-vcpkg.patch | 14 ++- ports/tensorpipe/vcpkg.json | 1 + ports/usockets/CMakeLists.txt | 12 ++- ports/usockets/vcpkg.json | 2 + ports/uvw/CMakeLists.txt | 8 +- ports/uvw/vcpkg.json | 1 + ports/wpilib/fix-dependency-libuv.patch | 32 ++++++ ports/wpilib/portfile.cmake | 45 ++++---- ports/wpilib/vcpkg.json | 15 ++- .../cmake/fix-dependency-libuv.patch | 28 +++++ scripts/test_ports/cmake/portfile.cmake | 1 + scripts/test_ports/cmake/vcpkg.json | 3 +- versions/baseline.json | 14 +-- versions/l-/libuv.json | 5 + versions/q-/qpid-proton.json | 5 + versions/t-/tensorpipe.json | 5 + versions/u-/usockets.json | 5 + versions/u-/uvw.json | 5 + versions/w-/wpilib.json | 5 + 29 files changed, 305 insertions(+), 224 deletions(-) delete mode 100644 ports/libuv/CMakeLists.txt create mode 100644 ports/libuv/fix-build-type.patch delete mode 100644 ports/libuv/unofficial-libuv-config.in.cmake create mode 100644 ports/libuv/usage delete mode 100644 ports/libuv/vcpkg-cmake-wrapper.cmake create mode 100644 ports/wpilib/fix-dependency-libuv.patch create mode 100644 scripts/test_ports/cmake/fix-dependency-libuv.patch diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt deleted file mode 100644 index 7d2c38bdbb307b..00000000000000 --- a/ports/libuv/CMakeLists.txt +++ /dev/null @@ -1,83 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(libuv C) - -find_package(Threads REQUIRED) - -file(GLOB UV_SOURCES_COMMON src/*.c) - -file(GLOB UV_SOURCES_UNIX - src/unix/async.c - src/unix/core.c - src/unix/dl.c - src/unix/fs.c - src/unix/getaddrinfo.c - src/unix/getnameinfo.c - src/unix/loop.c - src/unix/loop-watcher.c - src/unix/pipe.c - src/unix/poll.c - src/unix/process.c - src/unix/signal.c - src/unix/stream.c - src/unix/tcp.c - src/unix/thread.c - src/unix/tty.c - src/unix/udp.c -) -file(GLOB UV_SOURCES_LINUX - src/unix/proctitle.c - src/unix/linux-core.c - src/unix/linux-inotify.c - src/unix/linux-syscalls.c - src/unix/procfs-exepath.c - src/unix/sysinfo-loadavg.c - src/unix/sysinfo-memory.c - src/unix/epoll.c -) -file(GLOB UV_SOURCES_DARWIN - src/unix/proctitle.c - src/unix/darwin.c - src/unix/fsevents.c - src/unix/darwin-proctitle.c - src/unix/bsd-ifaddrs.c - src/unix/kqueue.c -) -file(GLOB UV_SOURCES_FREEBSD - src/unix/freebsd.c - src/unix/posix-hrtime.c - src/unix/bsd-proctitle.c - src/unix/bsd-ifaddrs.c - src/unix/kqueue.c -) -file(GLOB UV_SOURCES_WIN src/win/*.c) - -if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN}) - target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600") - target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32) -elseif(APPLE) - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN}) -elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD}) -else() # Assume some Linux variant - add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_LINUX}) -endif() - -target_link_libraries(libuv PRIVATE Threads::Threads) -target_include_directories(libuv PUBLIC $ $ $) -set_target_properties(libuv PROPERTIES DEFINE_SYMBOL BUILDING_UV_SHARED) - -if(NOT UV_SKIP_HEADERS) - install( - DIRECTORY include/ - DESTINATION include - ) -endif() - -install(TARGETS libuv - EXPORT libuv - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) -install(EXPORT libuv FILE unofficial-libuv-targets.cmake NAMESPACE unofficial::libuv:: DESTINATION share/unofficial-libuv) diff --git a/ports/libuv/fix-build-type.patch b/ports/libuv/fix-build-type.patch new file mode 100644 index 00000000000000..9977e48d025ff6 --- /dev/null +++ b/ports/libuv/fix-build-type.patch @@ -0,0 +1,72 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ac52412..15d5cb2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -381,7 +381,7 @@ endif() + if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|Linux|NetBSD|OpenBSD") + list(APPEND uv_test_libraries util) + endif() +- ++if (BUILD_SHARED_LIBS) + add_library(uv SHARED ${uv_sources}) + target_compile_definitions(uv + INTERFACE +@@ -401,7 +401,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390") + set_target_properties(uv PROPERTIES LINKER_LANGUAGE CXX) + endif() + target_link_libraries(uv ${uv_libraries}) +- ++else() + add_library(uv_a STATIC ${uv_sources}) + target_compile_definitions(uv_a PRIVATE ${uv_defines}) + target_compile_options(uv_a PRIVATE ${uv_cflags}) +@@ -416,7 +416,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OS390") + set_target_properties(uv_a PROPERTIES LINKER_LANGUAGE CXX) + endif() + target_link_libraries(uv_a ${uv_libraries}) +- ++endif() + if(LIBUV_BUILD_TESTS) + # Small hack: use ${uv_test_sources} now to get the runner skeleton, + # before the actual tests are added. +@@ -659,26 +659,39 @@ string(REPLACE ";" " " LIBS "${LIBS}") + file(STRINGS configure.ac configure_ac REGEX ^AC_INIT) + string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" PACKAGE_VERSION "${configure_ac}") + set(UV_VERSION_MAJOR "${CMAKE_MATCH_1}") ++if (BUILD_SHARED_LIBS) + # The version in the filename is mirroring the behaviour of autotools. + set_target_properties(uv PROPERTIES + VERSION ${UV_VERSION_MAJOR}.0.0 + SOVERSION ${UV_VERSION_MAJOR}) ++endif() + set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) + set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(prefix ${CMAKE_INSTALL_PREFIX}) ++if (BUILD_SHARED_LIBS) + configure_file(libuv.pc.in libuv.pc @ONLY) ++else() + configure_file(libuv-static.pc.in libuv-static.pc @ONLY) ++endif() + + install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR}) +-install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ${PROJECT_BINARY_DIR}/libuv-static.pc ++if (BUILD_SHARED_LIBS) ++install(FILES ${PROJECT_BINARY_DIR}/libuv.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++else() ++install(FILES ${PROJECT_BINARY_DIR}/libuv-static.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++endif() ++if (BUILD_SHARED_LIBS) + install(TARGETS uv EXPORT libuvConfig + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++else() + install(TARGETS uv_a EXPORT libuvConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif() + install(EXPORT libuvConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libuv) + + if(MSVC) diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 8b927ae8041d68..5cc5a247b0c6cd 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,39 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF v1.43.0 - SHA512 66ee11f8f6fc1313c432858572789cf67acd6364b29a06c73323ab20626e2d6e3d3dcea748cf5d9d4368b40ad7fe0d5fd35e9369c22e531db523703f005248d3 + REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2 #v1.44.1 + SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea HEAD_REF v1.x + PATCHES fix-build-type.patch ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG - -DUV_SKIP_HEADERS=ON + OPTIONS + -DLIBUV_BUILD_TESTS=OFF + -DQEMU=OFF + -DASAN=OFF + -DTSAN=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libuv CONFIG_PATH share/unofficial-libuv) vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -configure_file( - "${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake" - "${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake" - @ONLY -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libuv) +vcpkg_fixup_pkgconfig() -file(READ "${CURRENT_PACKAGES_DIR}/include/uv.h" UV_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/uv.h" "defined(USING_UV_SHARED)" "1") else() - string(REPLACE "defined(USING_UV_SHARED)" "0" UV_H "${UV_H}") - configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/uv.h" "defined(USING_UV_SHARED)" "0") endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/uv.h" "${UV_H}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libuv/unofficial-libuv-config.in.cmake b/ports/libuv/unofficial-libuv-config.in.cmake deleted file mode 100644 index a591d4cdf23245..00000000000000 --- a/ports/libuv/unofficial-libuv-config.in.cmake +++ /dev/null @@ -1,7 +0,0 @@ - -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - include(CMakeFindDependencyMacro) - find_dependency(Threads) -endif() - -include(${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-targets.cmake) diff --git a/ports/libuv/usage b/ports/libuv/usage new file mode 100644 index 00000000000000..b93ab285523e98 --- /dev/null +++ b/ports/libuv/usage @@ -0,0 +1,4 @@ +libuv provides CMake targets: + + find_package(libuv CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,uv_a,uv>) diff --git a/ports/libuv/vcpkg-cmake-wrapper.cmake b/ports/libuv/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index d95350a6d4c7b9..00000000000000 --- a/ports/libuv/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,16 +0,0 @@ -_find_package(${ARGS}) - -if(WIN32) - list(APPEND LibUV_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) - if(TARGET LibUV::LibUV) - set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) - endif() -endif() -include(CMakeFindDependencyMacro) -find_dependency(Threads) -list(APPEND LibUV_LIBRARIES Threads::Threads) -if(TARGET LibUV::LibUV) - set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) -endif() - - diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 5b11cc1fdc57e3..2d863086d1ba0a 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libuv", - "version-semver": "1.43.0", + "version-semver": "1.44.1", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/qpid-proton/fix-dependencies.patch b/ports/qpid-proton/fix-dependencies.patch index 3c679af0bb8e17..6828a30150f01b 100644 --- a/ports/qpid-proton/fix-dependencies.patch +++ b/ports/qpid-proton/fix-dependencies.patch @@ -1,8 +1,26 @@ diff --git a/c/CMakeLists.txt b/c/CMakeLists.txt -index 27b40e7..1931b65 100644 +index 27b40e7..a3a5d38 100644 --- a/c/CMakeLists.txt +++ b/c/CMakeLists.txt -@@ -727,11 +727,6 @@ install (FILES +@@ -377,11 +377,15 @@ if (PROACTOR STREQUAL "iocp" OR (NOT PROACTOR AND NOT PROACTOR_OK)) + endif() + + if (PROACTOR STREQUAL "libuv" OR (NOT PROACTOR AND NOT PROACTOR_OK)) +- find_package(Libuv) ++ find_package(Libuv NAMES libuv CONFIG) + if (Libuv_FOUND) + set (PROACTOR_OK libuv) + set (qpid-proton-proactor src/proactor/libuv.c ${qpid-proton-proactor-common}) +- set (PROACTOR_LIBS Libuv::Libuv) ++ if (TARGET uv) ++ set (PROACTOR_LIBS uv) ++ else() ++ set (PROACTOR_LIBS uv_a) ++ endif() + endif() + endif() + +@@ -727,11 +731,6 @@ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/ProtonConfigVersion.cmake DESTINATION ${LIB_INSTALL_DIR}/cmake/Proton) @@ -14,37 +32,11 @@ index 27b40e7..1931b65 100644 if (ENABLE_BENCHMARKS) add_subdirectory(benchmarks) -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 03fe80a..fd6a31d 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -26,12 +26,15 @@ find_package(Threads) - include(versions.cmake) - - # Check for JSON-CPP support for connection configuration --find_package(JsonCpp) --option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND}) -+option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF) - if (ENABLE_JSONCPP) -- include_directories(${JsonCpp_INCLUDE_DIRS}) -+ find_package(jsoncpp CONFIG REQUIRED) - set(CONNECT_CONFIG_SRC src/connect_config.cpp) -- set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY}) -+ if (TARGET jsoncpp_lib) -+ set(CONNECT_CONFIG_LIBS jsoncpp_lib) -+ elseif (TARGET jsoncpp_static) -+ set(CONNECT_CONFIG_LIBS jsoncpp_static) -+ endif() - else() - set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp) - endif() - +diff --git a/c/src/ProtonConfig.cmake.in b/c/src/ProtonConfig.cmake.in +index 6bcc3c0..2f03dc4 100644 --- a/c/src/ProtonConfig.cmake.in +++ b/c/src/ProtonConfig.cmake.in -@@ -20,39 +20,40 @@ - # Name: Proton - # Description: Qpid Proton C library - # Version: @PN_VERSION@ +@@ -23,7 +23,8 @@ # URL: http://qpid.apache.org/proton/ @PACKAGE_INIT@ @@ -54,8 +46,7 @@ index 03fe80a..fd6a31d 100644 include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargets.cmake") else() include("${CMAKE_CURRENT_LIST_DIR}/ProtonTargetsStatic.cmake") - endif() - +@@ -32,24 +33,21 @@ endif() set(Proton_VERSION @PN_VERSION@) # find dependencies, because static libs don't transitively pull them @@ -63,8 +54,6 @@ index 03fe80a..fd6a31d 100644 - set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") +if (1) -+ #set(CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH}) -+ #set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") set(CyrusSASL_FOUND @CyrusSASL_FOUND@) if (CyrusSASL_FOUND) @@ -83,19 +72,38 @@ index 03fe80a..fd6a31d 100644 + find_dependency (Threads) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) -+ #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH_OLD}) endif() set (Proton_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@) - set (Proton_LIBRARIES Proton::qpid-proton) - set (Proton_FOUND True) +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 03fe80a..89c14ed 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -26,12 +26,15 @@ find_package(Threads) + include(versions.cmake) + # Check for JSON-CPP support for connection configuration +-find_package(JsonCpp) +-option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" ${JsonCpp_FOUND}) ++option(ENABLE_JSONCPP "Use jsoncpp parser for connection configuration" OFF) + if (ENABLE_JSONCPP) +- include_directories(${JsonCpp_INCLUDE_DIRS}) ++ find_package(jsoncpp CONFIG REQUIRED) + set(CONNECT_CONFIG_SRC src/connect_config.cpp) +- set(CONNECT_CONFIG_LIBS ${JsonCpp_LIBRARY}) ++ if (TARGET jsoncpp_lib) ++ set(CONNECT_CONFIG_LIBS jsoncpp_lib) ++ elseif (TARGET jsoncpp_static) ++ set(CONNECT_CONFIG_LIBS jsoncpp_static) ++ endif() + else() + set(CONNECT_CONFIG_SRC src/connect_config_dummy.cpp) + endif() +diff --git a/cpp/ProtonCppConfig.cmake.in b/cpp/ProtonCppConfig.cmake.in +index 74ddfaa..2fece73 100644 --- a/cpp/ProtonCppConfig.cmake.in +++ b/cpp/ProtonCppConfig.cmake.in -@@ -20,19 +20,21 @@ - # Name: Proton - # Description: Qpid Proton C library - # Version: @PN_VERSION@ +@@ -23,7 +23,9 @@ # URL: http://qpid.apache.org/proton/ @PACKAGE_INIT@ @@ -106,12 +114,3 @@ index 03fe80a..fd6a31d 100644 include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargets.cmake") else() include("${CMAKE_CURRENT_LIST_DIR}/ProtonCppTargetsStatic.cmake") - endif() - - set (ProtonCpp_VERSION @PN_VERSION@) - - set (ProtonCpp_INCLUDE_DIRS @PACKAGE_INCLUDE_INSTALL_DIR@) - set (ProtonCpp_LIBRARIES Proton::cpp) - set (ProtonCpp_FOUND True) - - check_required_components(ProtonCpp) diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index 3e29c19ee1fbb6..686c1c089acada 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -32,6 +32,7 @@ vcpkg_cmake_configure( -DENABLE_WARNING_ERROR=OFF -DENABLE_BENCHMARKS=OFF -DENABLE_FUZZ_TESTING=OFF + -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF -DCMAKE_INSTALL_RPATH=${rpath} -DPython_EXECUTABLE=${PYTHON3} diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index c57969ea32970b..1de560fe8f70ad 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qpid-proton", "version": "0.37.0", - "port-version": 2, + "port-version": 3, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "license": "Apache-2.0", diff --git a/ports/tensorpipe/use-vcpkg.patch b/ports/tensorpipe/use-vcpkg.patch index b08d2cb107d6ab..b69d01c1870163 100644 --- a/ports/tensorpipe/use-vcpkg.patch +++ b/ports/tensorpipe/use-vcpkg.patch @@ -1,19 +1,23 @@ diff --git a/tensorpipe/CMakeLists.txt b/tensorpipe/CMakeLists.txt -index efcffc2..e167fae 100644 +index efcffc2..dd9bd16 100644 --- a/tensorpipe/CMakeLists.txt +++ b/tensorpipe/CMakeLists.txt -@@ -119,8 +119,8 @@ list(APPEND TP_PUBLIC_HDRS +@@ -119,8 +119,12 @@ list(APPEND TP_PUBLIC_HDRS transport/uv/utility.h) # Add uv package -find_package(uv REQUIRED) -list(APPEND TP_LINK_LIBRARIES uv::uv) -+find_package(unofficial-libuv CONFIG REQUIRED) -+list(APPEND TP_LINK_LIBRARIES unofficial::libuv::libuv) ++find_package(libuv CONFIG REQUIRED) ++if (TARGET uv) ++list(APPEND TP_LINK_LIBRARIES uv) ++else() ++list(APPEND TP_LINK_LIBRARIES uv_a) ++endif() ### shm -@@ -184,7 +184,8 @@ configure_file(config.h.in config.h) +@@ -184,7 +188,8 @@ configure_file(config.h.in config.h) # We should keep libnop headers private as they should not be exposed to downstream users, # but they're currently transitively included by tensorpipe/transport/connection.h (which # is still unclear whether it should be a public or private header). diff --git a/ports/tensorpipe/vcpkg.json b/ports/tensorpipe/vcpkg.json index ac5f0d27122bbd..fb8fb8459a51f8 100644 --- a/ports/tensorpipe/vcpkg.json +++ b/ports/tensorpipe/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorpipe", "version-date": "2022-03-16", + "port-version": 1, "description": "A tensor-aware point-to-point communication primitive for machine learning", "homepage": "https://github.com/pytorch/tensorpipe", "license": "BSD-3-Clause", diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index 69a742db13307c..990176f30906d3 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -12,10 +12,12 @@ else() set(NOT_USE_OPENSSL "-DLIBUS_NO_SSL") endif() -find_package(unofficial-libuv CONFIG REQUIRED) -find_path(LIBUV_INCLUDE_DIR uv.h) -find_library(LIBUV_LIBRARY NAMES libuv) -include_directories(APPEND "${CMAKE_CURRENT_LIST_DIR}/src") +find_package(libuv CONFIG REQUIRED) +if (TARGET uv) + set(LIBUV_LIBRARY uv) +else() + set(LIBUV_LIBRARY uv_a) +endif() file(GLOB SOURCES src/*.c src/eventing/*.c) @@ -49,7 +51,7 @@ if (${LIBUS_USE_LIBUV}) endif() target_compile_definitions(uSockets PRIVATE ${NOT_USE_OPENSSL} ${USE_OPENSSL}) -target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${LIBUV_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR}) +target_include_directories(uSockets PUBLIC ${OPENSSL_INCLUDE_DIR} ${USOCKETS_EXT_INCLUDE_DIR} PRIVATE "${CMAKE_CURRENT_LIST_DIR}/src") target_link_libraries(uSockets PUBLIC ${OPENSSL_LIBRARIES} ${LIBUV_LIBRARY} ${USOCKETS_EXT_LIBS}) install(TARGETS uSockets diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json index 9300c6e9467790..ab920957b08b5b 100644 --- a/ports/usockets/vcpkg.json +++ b/ports/usockets/vcpkg.json @@ -1,8 +1,10 @@ { "name": "usockets", "version": "0.8.1", + "port-version": 1, "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", + "license": "Apache-2.0", "dependencies": [ "libuv", { diff --git a/ports/uvw/CMakeLists.txt b/ports/uvw/CMakeLists.txt index f359b735103955..d768716f7a4ba0 100644 --- a/ports/uvw/CMakeLists.txt +++ b/ports/uvw/CMakeLists.txt @@ -1,10 +1,14 @@ cmake_minimum_required(VERSION 3.8) project(uvw) -find_package(unofficial-libuv CONFIG REQUIRED) +find_package(libuv CONFIG REQUIRED) add_library(uvw INTERFACE) -target_link_libraries(uvw INTERFACE unofficial::libuv::libuv) +if (TARGET uv) + target_link_libraries(uvw INTERFACE uv) +else() + target_link_libraries(uvw INTERFACE uv_a) +endif() install(TARGETS uvw EXPORT uvw diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json index ba7b4673dc3dc0..f9cbcaa07ec1cd 100644 --- a/ports/uvw/vcpkg.json +++ b/ports/uvw/vcpkg.json @@ -1,6 +1,7 @@ { "name": "uvw", "version": "2.12.1", + "port-version": 1, "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", "homepage": "https://github.com/skypjack/uvw", "license": "MIT", diff --git a/ports/wpilib/fix-dependency-libuv.patch b/ports/wpilib/fix-dependency-libuv.patch new file mode 100644 index 00000000000000..e5c0ca8f11ab0a --- /dev/null +++ b/ports/wpilib/fix-dependency-libuv.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3930be2..f57a46b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,7 +87,7 @@ else() + endif() + + if (USE_VCPKG_LIBUV) +-set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") ++set (LIBUV_VCPKG_REPLACE "find_package(libuv CONFIG)") + endif() + + if (USE_VCPKG_EIGEN) +diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt +index 559c8ed..0fe60e9 100644 +--- a/wpiutil/CMakeLists.txt ++++ b/wpiutil/CMakeLists.txt +@@ -210,8 +210,12 @@ if (NOT USE_VCPKG_LIBUV) + endif() + endif() + else() +- find_package(unofficial-libuv CONFIG REQUIRED) +- target_link_libraries(wpiutil unofficial::libuv::libuv) ++ find_package(libuv CONFIG REQUIRED) ++ if (TARGET uv) ++ target_link_libraries(wpiutil uv) ++ else() ++ target_link_libraries(wpiutil uv_a) ++ endif() + endif() + + if (MSVC) diff --git a/ports/wpilib/portfile.cmake b/ports/wpilib/portfile.cmake index f4b48dc3084015..d680107fe5fe99 100644 --- a/ports/wpilib/portfile.cmake +++ b/ports/wpilib/portfile.cmake @@ -3,6 +3,7 @@ vcpkg_from_github( REPO wpilibsuite/allwpilib REF 35eb90c135eba994a2ca2cbd50a68c367910f4b6 SHA512 55bc608632ab67c097f3cce7c5ad9790b2b123a633c93bf5b4008f90bf79538cc142c911850d5f49b75e3a12f43ffad9f6f5f9bcdf1351cce7513ecc4b04e439 + PATCHES fix-dependency-libuv.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -11,10 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS allwpilib WITHOUT_ALLWPILIB ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITHOUT_JAVA=ON ${FEATURE_OPTIONS} @@ -22,39 +21,39 @@ vcpkg_configure_cmake( -DUSE_VCPKG_EIGEN=ON -DFLAT_INSTALL_WPILIB=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/ntcore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpiutil/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") if ("allwpilib" IN_LIST FEATURES) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/hal/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/gen) + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/wpilibc/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/hal/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/gen") endif() if ("cameraserver" IN_LIST FEATURES) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cameraserver/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/include/cscore/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") endif() if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") - file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dll") - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.so") - file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.so") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.so") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.so") - file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dylib") - file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dylib") + file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/bin" FILES_MATCHING PATTERN "*.dylib") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" FILES_MATCHING PATTERN "*.dylib") endif() -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib") -file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib") +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.lib") +file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.lib") -file(COPY ${CURRENT_PACKAGES_DIR}/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.a") -file(COPY ${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.a") +file(COPY "${CURRENT_PACKAGES_DIR}/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib" FILES_MATCHING PATTERN "*.a") +file(COPY "${CURRENT_PACKAGES_DIR}/debug/wpilib/lib/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" FILES_MATCHING PATTERN "*.a") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json index b0e07c291179d9..c928da52447643 100644 --- a/ports/wpilib/vcpkg.json +++ b/ports/wpilib/vcpkg.json @@ -1,13 +1,22 @@ { "name": "wpilib", - "version-string": "2020.3.2", - "port-version": 2, + "version-date": "2020-03-02", + "port-version": 3, "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.", "homepage": "https://github.com/wpilibsuite/allwpilib", + "license": null, "supports": "!osx", "dependencies": [ "eigen3", - "libuv" + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "allwpilib": { diff --git a/scripts/test_ports/cmake/fix-dependency-libuv.patch b/scripts/test_ports/cmake/fix-dependency-libuv.patch new file mode 100644 index 00000000000000..5402a788780193 --- /dev/null +++ b/scripts/test_ports/cmake/fix-dependency-libuv.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fdfe456..ef2d329 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,16 +647,16 @@ macro (CMAKE_BUILD_UTILITIES) + #--------------------------------------------------------------------- + # Build libuv library. + if(CMAKE_USE_SYSTEM_LIBUV) +- if(WIN32) +- find_package(LibUV 1.38.0) +- else() +- find_package(LibUV 1.10.0) +- endif() +- if(NOT LIBUV_FOUND) ++ find_package(libuv CONFIG REQUIRED) ++ if(0) + message(FATAL_ERROR + "CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!") + endif() +- set(CMAKE_LIBUV_LIBRARIES LibUV::LibUV) ++ if (TARGET uv) ++ set(CMAKE_LIBUV_LIBRARIES uv) ++ else() ++ set(CMAKE_LIBUV_LIBRARIES uv_a) ++ endif() + else() + set(CMAKE_LIBUV_LIBRARIES cmlibuv) + add_subdirectory(Utilities/cmlibuv) diff --git a/scripts/test_ports/cmake/portfile.cmake b/scripts/test_ports/cmake/portfile.cmake index 3e7276e4531c99..87ad4eb6d82083 100644 --- a/scripts/test_ports/cmake/portfile.cmake +++ b/scripts/test_ports/cmake/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_gitlab( SHA512 4a40656efe5854bd6b893d0b2b86eed5df42992d080edb9c0cb2da2c55ad8dd489a85072b138947933d94ef5ba90c7a59f0a4460e3722d0f898ceefbbf74d226 HEAD_REF master + PATCHES fix-dependency-libuv.patch ) set(OPTIONS) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) diff --git a/scripts/test_ports/cmake/vcpkg.json b/scripts/test_ports/cmake/vcpkg.json index 89668baefbc692..e5de5713252e53 100644 --- a/scripts/test_ports/cmake/vcpkg.json +++ b/scripts/test_ports/cmake/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cmake", - "version-string": "3.22.2", + "version": "3.22.2", + "port-version": 1, "description": "CMake is an open-source, cross-platform family of tools designed to build, test and package software.", "homepage": "https://cmake.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 78ef2c0efba84a..f22866c9c213b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4189,7 +4189,7 @@ "port-version": 11 }, "libuv": { - "baseline": "1.43.0", + "baseline": "1.44.1", "port-version": 0 }, "libuvc": { @@ -5726,7 +5726,7 @@ }, "qpid-proton": { "baseline": "0.37.0", - "port-version": 2 + "port-version": 3 }, "qscintilla": { "baseline": "2.12.0", @@ -6986,7 +6986,7 @@ }, "tensorpipe": { "baseline": "2022-03-16", - "port-version": 0 + "port-version": 1 }, "termcolor": { "baseline": "2.1.0", @@ -7322,7 +7322,7 @@ }, "usockets": { "baseline": "0.8.1", - "port-version": 0 + "port-version": 1 }, "usrsctp": { "baseline": "0.9.5.0", @@ -7358,7 +7358,7 @@ }, "uvw": { "baseline": "2.12.1", - "port-version": 0 + "port-version": 1 }, "uwebsockets": { "baseline": "20.11.0", @@ -7621,8 +7621,8 @@ "port-version": 1 }, "wpilib": { - "baseline": "2020.3.2", - "port-version": 2 + "baseline": "2020-03-02", + "port-version": 3 }, "wren": { "baseline": "0.4.0", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index fd88da0a514714..4fe57a4798e76d 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4560e3046488c518b6573a14d7ad063a02f52db9", + "version-semver": "1.44.1", + "port-version": 0 + }, { "git-tree": "fa2d73ef2b9197ea47572bc783826b650ed04f0f", "version-semver": "1.43.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index 95a109f9dc3d86..3a79b51b021f59 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32527f3a05b41a04ad42ab2e0827dfee69b18ec0", + "version": "0.37.0", + "port-version": 3 + }, { "git-tree": "e019a7a0cb758104296c13689ca86f44db64cfb6", "version": "0.37.0", diff --git a/versions/t-/tensorpipe.json b/versions/t-/tensorpipe.json index 0dd256c6db6587..4233d9f58e84f0 100644 --- a/versions/t-/tensorpipe.json +++ b/versions/t-/tensorpipe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b982c4ade4582a5728384f2871610b107fe1b9f", + "version-date": "2022-03-16", + "port-version": 1 + }, { "git-tree": "f78594bb71084f0ea1b9e0bba9b9804696e4c011", "version-date": "2022-03-16", diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json index efac4caed8cbef..b50ca1ffd7c72d 100644 --- a/versions/u-/usockets.json +++ b/versions/u-/usockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf42304e17879df7e100c97d4487adaeaadfd87e", + "version": "0.8.1", + "port-version": 1 + }, { "git-tree": "de62ce303388342f83a490f69bdb92ec41ecc0f2", "version": "0.8.1", diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json index 4d3cc82eb89a74..e0201c68a22651 100644 --- a/versions/u-/uvw.json +++ b/versions/u-/uvw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "609b48de110aa8763d8f4a674ac3aa7c5821382f", + "version": "2.12.1", + "port-version": 1 + }, { "git-tree": "eac81a2d74241ded58a1c503d91f226f86ca09c6", "version": "2.12.1", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index 2b2c63cfe10921..b4a4397f39ff9b 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1593dcc61c40d6205be6d47e3623dc6bb3ddbad3", + "version-date": "2020-03-02", + "port-version": 3 + }, { "git-tree": "cf10ef63982d54978a85c868d37462ce21643188", "version-string": "2020.3.2", From 1b9d2102627e3032bcc7cdadbb738652552ace74 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Sat, 9 Jul 2022 06:56:32 +1000 Subject: [PATCH 071/791] [nuklear] Upgrade to latest nuklear (12/05/2022) (#24829) * [ports/nuklear] Upgrade to latest nuklear; use correct LICENSE path; correct `GNUInstallDirs` usage * [ports/nuklear/vcpkg.json] Set license * [ports/nuklear/vcpkg.json] version-date Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * `./vcpkg x-add-version --all --overwrite-version` * [versions/n-/nuklear.json] Remove `2022-05-12` @ `"port-version": 1` * [ports/nuklear/portfile.cmake] Remove quotes around `${FEATURE_OPTIONS}` * [nuklear] Revert reformat Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/nuklear/CMakeLists.txt | 2 +- ports/nuklear/portfile.cmake | 6 +++--- ports/nuklear/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/n-/nuklear.json | 5 +++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ports/nuklear/CMakeLists.txt b/ports/nuklear/CMakeLists.txt index 28009f466b754b..eba91e1fd03c80 100644 --- a/ports/nuklear/CMakeLists.txt +++ b/ports/nuklear/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(Nuklear LANGUAGES C CXX) +project(Nuklear LANGUAGES C) option(INSTALL_EXAMPLE "Install the example code" OFF) option(INSTALL_DEMO "Install the demo code" OFF) diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index e13332986b517e..f30f54d0f5f8a1 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Immediate-Mode-UI/Nuklear - REF 6e80e2a646f35be4afc157a932f2936392ec8f74 # accessed on 2021-04-04 - SHA512 ce064dff721111749d4056717879f42d3e24bb94655dd2b04c137eb7391d2c90d0b1b95155912c100b537f74fd150aedc48e0ac85eb72963c66e35ac81048323 + REF 0a77211844458673446aa99b8a0ae1090a04e413 # 2022-05-12 + SHA512 57ad5578c534d19ce6dd5e9b8c7b725da6e7f379a5289daed6b7128a1671dc5c368175d1e780a7fcb3405fad989e3bc50a8a921d62301e64e58014e351845cae HEAD_REF master ) @@ -26,4 +26,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nuklear) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/Readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/src/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nuklear/vcpkg.json b/ports/nuklear/vcpkg.json index 1e48043bf8e890..25261916ed7537 100644 --- a/ports/nuklear/vcpkg.json +++ b/ports/nuklear/vcpkg.json @@ -1,9 +1,9 @@ { "name": "nuklear", - "version-date": "2021-03-18", - "port-version": 1, + "version-date": "2022-05-12", "description": "This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain", "homepage": "https://github.com/Immediate-Mode-UI/Nuklear", + "license": "Unlicense OR MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index f22866c9c213b4..462986e82a176a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4965,8 +4965,8 @@ "port-version": 0 }, "nuklear": { - "baseline": "2021-03-18", - "port-version": 1 + "baseline": "2022-05-12", + "port-version": 0 }, "numactl": { "baseline": "2.0.14", diff --git a/versions/n-/nuklear.json b/versions/n-/nuklear.json index 195260366136e2..c86d86b83cc42d 100644 --- a/versions/n-/nuklear.json +++ b/versions/n-/nuklear.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7a06d2b4b1e882bff894a676e9c89d25898d7c4", + "version-date": "2022-05-12", + "port-version": 0 + }, { "git-tree": "9c243e51fbb0d9fa4562a3e4a8eba9a7fb2e0cdd", "version-date": "2021-03-18", From 58a40102844112c6f55442b22452cc0ae2f70a88 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 9 Jul 2022 04:57:26 +0800 Subject: [PATCH 072/791] [OpenSSL] update to 3.0.5 (#25597) * [OpenSSL] update to 3.0.5 * update version --- ports/openssl/portfile.cmake | 4 ++-- ports/openssl/vcpkg-cmake-wrapper.cmake.in | 2 +- ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 7ea9843df55a53..f4adebca3d93c3 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -11,7 +11,7 @@ It can be installed on alpine systems via apk add linux-headers.]] ) endif() -set(OPENSSL_VERSION 3.0.4) +set(OPENSSL_VERSION 3.0.5) if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) set(OPENSSL_PATCHES "${CMAKE_CURRENT_LIST_DIR}/windows/flags.patch") @@ -21,7 +21,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openssl/openssl REF openssl-${OPENSSL_VERSION} - SHA512 c58b439addbfc0901cb8d99036494bac60d24a4311815b9b7a559f5daaa027d4b83e49e2eb526f0552ec53f09be89081a08c20b8b6f20a2463081cdb071d6faf + SHA512 e426f2d48dcd87ad938b246cea69988710198c3ed2f5bb9065aa9e74492161b056336f5b1f29be64e70dfd86a77808fe727ebb46eae10331c76f1ff08e341133 PATCHES ${OPENSSL_PATCHES} ) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in index cb3aba0e7ff909..123364f9a81602 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake.in +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -5,7 +5,7 @@ cmake_policy(SET CMP0057 NEW) set(OPENSSL_VERSION_MAJOR 3) set(OPENSSL_VERSION_MINOR 0) -set(OPENSSL_VERSION_FIX 3) +set(OPENSSL_VERSION_FIX 5) if(OPENSSL_USE_STATIC_LIBS) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic") diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index d407c6e5539cfc..fdafd634742bc2 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openssl", - "version": "3.0.4", + "version": "3.0.5", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 462986e82a176a..b81ee4dec450d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5225,7 +5225,7 @@ "port-version": 2 }, "openssl": { - "baseline": "3.0.4", + "baseline": "3.0.5", "port-version": 0 }, "openssl-unix": { diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 715d06e2ad578c..7fc56dbcef849e 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f3d4db3ea7bcbac9c79e8beb24c0a33c4da3e96", + "version": "3.0.5", + "port-version": 0 + }, { "git-tree": "b300461cf187df328c5d2269448840306f64a4e1", "version": "3.0.4", From 98f8d00e89fb6a8019c2045cfa1edbe9d92d3405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Fri, 8 Jul 2022 23:05:39 +0200 Subject: [PATCH 073/791] [ned14-internal-quickcpplib] Update port @2022-07-04 (#25560) * [quickcpplib] Update port @2022-07-04 * [quickcpplib] Invert polyfill features * [quickcpplib] Update version database * [quickcpplib] Exclude CI failures --- ports/llfio/portfile.cmake | 4 +- ports/llfio/vcpkg.json | 28 ++++++------ .../ned14-internal-quickcpplib/portfile.cmake | 45 ++++++++++++------- .../quicklib-depheaders.patch | 30 ++++++------- .../sha_manifest.cmake | 4 +- ports/ned14-internal-quickcpplib/vcpkg.json | 20 +++++---- scripts/ci.baseline.txt | 4 ++ versions/baseline.json | 4 +- versions/l-/llfio.json | 5 +++ versions/n-/ned14-internal-quickcpplib.json | 5 +++ 10 files changed, 87 insertions(+), 62 deletions(-) diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index 6f133d71c17bc9..b8b45822e8a2eb 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -1,4 +1,4 @@ -if (NOT "cxx20" IN_LIST FEATURES) +if ("polyfill-cxx20" IN_LIST FEATURES) message(WARNING [=[ LLFIO depends on Outcome which depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's, Outcome's and LLFIO's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. ]=]) @@ -70,7 +70,7 @@ vcpkg_cmake_configure( if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_cmake_build(TARGET install.dl) -else(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_cmake_build(TARGET install.sl) endif() diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 52457a800bf4bb..2ddcfa81036a8c 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llfio", "version": "2.0-20220112", - "port-version": 1, + "port-version": 2, "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", "license": "Apache-2.0 OR BSL-1.0", @@ -18,33 +18,33 @@ } ], "features": { - "cxx17": { - "description": "Do not polyfill C++17 entities", + "polyfill-cxx17": { + "description": "Polyfill C++17 entities", "dependencies": [ + { + "name": "llfio", + "default-features": false, + "features": [ + "polyfill-cxx20" + ] + }, { "name": "ned14-internal-quickcpplib", "default-features": false, "features": [ - "cxx17" + "polyfill-cxx17" ] } ] }, - "cxx20": { - "description": "Do not polyfill C++20 entities", + "polyfill-cxx20": { + "description": "Polyfill C++20 entities", "dependencies": [ - { - "name": "llfio", - "default-features": false, - "features": [ - "cxx17" - ] - }, { "name": "ned14-internal-quickcpplib", "default-features": false, "features": [ - "cxx20" + "polyfill-cxx20" ] } ] diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index 8f78243a0a80a2..d9878b6bf9c9a5 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -10,11 +10,19 @@ include("${CURRENT_PORT_DIR}/sha_manifest.cmake") -if (NOT "cxx20" IN_LIST FEATURES) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + INVERTED_FEATURES + polyfill-cxx17 QUICKCPPLIB_REQUIRE_CXX17 + polyfill-cxx20 QUICKCPPLIB_REQUIRE_CXX20 +) + +if (NOT QUICKCPPLIB_REQUIRE_CXX20) message(WARNING [=[ - QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.38.1 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: + QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against span-lite version 0.10.3 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: "overrides": [ - { "name": "gsl-lite", "version": "0.38.1" }, + { "name": "span-lite", "version": "0.10.3" }, { "name": "byte-lite", "version": "0.3.0" } ] Do not report issues to upstream without first pinning these previous versions. @@ -32,15 +40,13 @@ vcpkg_from_github( ) # Quickcpplib deploys subsets of the dependency headers into a private subdirectory -if (NOT "cxx17" IN_LIST FEATURES) +if (NOT QUICKCPPLIB_REQUIRE_CXX17) file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/byte.hpp" DESTINATION "${SOURCE_PATH}/include/quickcpplib/byte/include/nonstd") endif() -if (NOT "cxx20" IN_LIST FEATURES) - file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl/gsl-lite.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl") - file(COPY "${CURRENT_INSTALLED_DIR}/include/gsl-lite/gsl-lite.hpp" - DESTINATION "${SOURCE_PATH}/include/quickcpplib/gsl-lite/include/gsl-lite") +if (NOT QUICKCPPLIB_REQUIRE_CXX20) + file(COPY "${CURRENT_INSTALLED_DIR}/include/nonstd/span.hpp" + DESTINATION "${SOURCE_PATH}/include/quickcpplib/span-lite/include/nonstd") endif() vcpkg_from_github( @@ -56,13 +62,6 @@ file(COPY "${OPT_SOURCE_PATH}/." DESTINATION "${SOURCE_PATH}/include/quickcpplib # Because quickcpplib's deployed files are header-only, the debug build it not necessary set(VCPKG_BUILD_TYPE release) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - cxx17 QUICKCPPLIB_REQUIRE_CXX17 - cxx20 QUICKCPPLIB_REQUIRE_CXX20 -) - # Use QuickCppLib's own build process, skipping examples and tests. vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -78,6 +77,20 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +if (QUICKCPPLIB_REQUIRE_CXX17) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 1") +else () + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#if QUICKCPPLIB_USE_STD_BYTE" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/byte.hpp" "#include \"byte/include/nonstd/byte.hpp\"" "#include ") +endif() +if (QUICKCPPLIB_REQUIRE_CXX20) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 1") +else () + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#ifdef QUICKCPPLIB_USE_STD_SPAN" "#if 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#elif(_HAS_CXX20 || __cplusplus >= 202002) && __has_include()" "#elif 0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quickcpplib/span.hpp" "#include \"span-lite/include/nonstd/span.hpp\"" "#include ") +endif() + vcpkg_cmake_config_fixup( PACKAGE_NAME quickcpplib CONFIG_PATH lib/cmake/quickcpplib diff --git a/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch index 7ad3c3b9a77f75..de49af02340929 100644 --- a/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch +++ b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch @@ -1,5 +1,5 @@ diff --git a/cmake/headers.cmake b/cmake/headers.cmake -index 1aad359..e5053ed 100644 +index 3924a2a..f1e32d9 100644 --- a/cmake/headers.cmake +++ b/cmake/headers.cmake @@ -15,8 +15,6 @@ set(quickcpplib_HEADERS @@ -11,19 +11,15 @@ index 1aad359..e5053ed 100644 "include/quickcpplib/config.hpp" "include/quickcpplib/console_colours.hpp" "include/quickcpplib/cpp_feature.h" -@@ -27,15 +25,8 @@ set(quickcpplib_HEADERS - "include/quickcpplib/erasure_cast.hpp" - "include/quickcpplib/execinfo_win64.h" - "include/quickcpplib/function_ptr.hpp" -- "include/quickcpplib/gsl-lite/gsl-lite.natvis" - "include/quickcpplib/gsl-lite/include/gsl-lite/gsl-lite.hpp" -- "include/quickcpplib/gsl-lite/include/gsl.h" -- "include/quickcpplib/gsl-lite/include/gsl.hpp" -- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite-vc6.hpp" -- "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.h" - "include/quickcpplib/gsl-lite/include/gsl/gsl-lite.hpp" -- "include/quickcpplib/gsl-lite/test/gsl-lite.t.hpp" -- "include/quickcpplib/gsl-lite/test/lest_cpp03.hpp" - "include/quickcpplib/import.h" - "include/quickcpplib/in_place_detach_attach.hpp" - "include/quickcpplib/mem_flush_loads_stores.hpp" +@@ -40,11 +38,7 @@ set(quickcpplib_HEADERS + "include/quickcpplib/ringbuffer_log.hpp" + "include/quickcpplib/scope.hpp" + "include/quickcpplib/signal_guard.hpp" +- "include/quickcpplib/span-lite/example/nonstd/span.tweak.hpp" + "include/quickcpplib/span-lite/include/nonstd/span.hpp" +- "include/quickcpplib/span-lite/test/lest/lest_cpp03.hpp" +- "include/quickcpplib/span-lite/test/nonstd/span.tweak.hpp" +- "include/quickcpplib/span-lite/test/span-main.t.hpp" + "include/quickcpplib/span.hpp" + "include/quickcpplib/spinlock.hpp" + "include/quickcpplib/spinlock.natvis" diff --git a/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index d98e7c99c76774..25aa1d36afd32b 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF 568e1811edf0f47caafbeb62a4f9fe4e885a0f96) -set(QUICKCPPLIB_SHA512 1f14d9603a308258d7632817942125d4330c82a2b3f44cd1238c8cb76f3c0c6cd7c0ad7b2cac75259148fd76f323626e7fed1c613404b173982a1be18c27458c) +set(QUICKCPPLIB_REF 9cdcd45d9036247dcade3d3ab1ff4adbe14b1927) +set(QUICKCPPLIB_SHA512 c23831c7a43b678bc33f11b3ccfc31ccb580f7225bfb7771010cdb5bc2d6a45a1d3c7b6b2dda7c5691fae817da3b303265156d434d7cb6efb9a86714b0095675) set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643) set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4) diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index af40d4cc83b890..d3dbc2869563f0 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,12 +1,10 @@ { "name": "ned14-internal-quickcpplib", - "version-date": "2022-06-17", + "version-date": "2022-07-04", "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", "license": "Apache-2.0 OR BSL-1.0", "dependencies": [ - "byte-lite", - "gsl-lite", { "name": "vcpkg-cmake", "host": true @@ -17,20 +15,24 @@ } ], "features": { - "cxx17": { - "description": "Do not polyfill C++17 entities" - }, - "cxx20": { - "description": "Do not polyfill C++20 entities", + "polyfill-cxx17": { + "description": "Polyfill std::byte with byte-lite", "dependencies": [ + "byte-lite", { "name": "ned14-internal-quickcpplib", "default-features": false, "features": [ - "cxx17" + "polyfill-cxx20" ] } ] + }, + "polyfill-cxx20": { + "description": "Polyfill std::span with span-lite", + "dependencies": [ + "span-lite" + ] } } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1d1447834c1eb6..75898e8581c8ff 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -560,6 +560,10 @@ linenoise-ng:x64-uwp=fail live555:arm-uwp=fail live555:x64-osx=fail live555:x64-uwp=fail +# fails due to an upstream bug +llfio:arm64-windows=fail +# fails due to an outdated gcc version +llfio:x64-linux=fail llgl:arm-uwp=fail llgl:x64-uwp=fail log4cplus:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index b81ee4dec450d2..83f70f3bdf48d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4298,7 +4298,7 @@ }, "llfio": { "baseline": "2.0-20220112", - "port-version": 1 + "port-version": 2 }, "llgl": { "baseline": "2019-08-15", @@ -4857,7 +4857,7 @@ "port-version": 0 }, "ned14-internal-quickcpplib": { - "baseline": "2022-06-17", + "baseline": "2022-07-04", "port-version": 0 }, "neon2sse": { diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index f7910b2e6d0e8e..45d6ee4b2c8f96 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3d2d8d9dfddbbf74af7e1f603ac18e4aee2fe7a", + "version": "2.0-20220112", + "port-version": 2 + }, { "git-tree": "bc96b88ab308808ce26135e75038c4b316d5533c", "version": "2.0-20220112", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index 6d942e9b40c20c..aea00332456c68 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "081192c8586e086ef1fe8beb576255f86dc9458e", + "version-date": "2022-07-04", + "port-version": 0 + }, { "git-tree": "3ab059ed3893e5635482409f22bd73cdbcec2166", "version-date": "2022-06-17", From 0c5939ea29c9a191f23c066d699398455971354c Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 12 Jul 2022 04:57:02 +0800 Subject: [PATCH 074/791] [apsi] update to v0.8.2 and fix supports (#25461) * update to v0.8.1 and fix supports * skip x86-windows and arm64-windows in ci.baseline * add x86-windows and arm64-windows supports * update * update Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/apsi/portfile.cmake | 14 +++++++++++--- ports/apsi/vcpkg.json | 5 ++--- versions/a-/apsi.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index 5000897913c71f..6440b09bbfc753 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI - REF 6365cb774b81a2a731334c656db21e5fdfb92870 - SHA512 f21d710a345663aeb35035565c55fd900076589d087a03a1ad7df8b8004ae0e059196f3c94ee63b5ad815a858e5404eea34ae203f7778d4190fd323fd08b7084 + REF ba71aeb28a9f21e4ad59c45aa88232b099ce0b87 #0.8.2 + SHA512 810bcbe0afa3d1c9d299a85bc4266135bdf9adc33bfc754c59731f6cfa6a89d449fb134cef34c4614742bd50e9f8f3916e5b64998dcea69883ca27b7da3c5f04 HEAD_REF main ) @@ -14,6 +14,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zeromq APSI_USE_ZMQ ) +set(CROSSCOMP_OPTIONS "") +if (NOT HOST_TRIPLET STREQUAL TARGET_TRIPLET) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_ARM64_EXITCODE=0 -DAPSI_FOURQ_ARM64_EXITCODE__TRYRUN_OUTPUT="") + endif() +endif() + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE @@ -21,11 +28,12 @@ vcpkg_cmake_configure( "-DAPSI_BUILD_TESTS=OFF" "-DAPSI_BUILD_CLI=OFF" ${FEATURE_OPTIONS} + ${CROSSCOMP_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.7") +vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.8") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index 29b3035dff8829..32b639830ba00b 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,10 +1,9 @@ { "name": "apsi", - "version-semver": "0.7.0", - "port-version": 2, + "version-semver": "0.8.2", "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", - "supports": "static & !(arm & osx)", + "license": "MIT", "dependencies": [ "flatbuffers", "jsoncpp", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index 991bf7ddcf1556..c5504a33c4884d 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbe91971ef248ba844e254d91cbd73ad10fbe131", + "version-semver": "0.8.2", + "port-version": 0 + }, { "git-tree": "08bc0f650b7fa0ef77541eb74b90d0b9fe7fec03", "version-semver": "0.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index 83f70f3bdf48d6..a35b68fbcc1182 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -125,8 +125,8 @@ "port-version": 7 }, "apsi": { - "baseline": "0.7.0", - "port-version": 2 + "baseline": "0.8.2", + "port-version": 0 }, "arb": { "baseline": "2.21.1", From 88b3aedb3b948bb1849f87581e8c8ee8d4c67989 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Jul 2022 23:06:54 +0200 Subject: [PATCH 075/791] [wxwidgets] Update and fix (#25572) * Revert "[wxwidgets] Remove debug asserts from Release build. (#25240)" This reverts commit 6e16931acdf85ab5476973ba00d8eda733f42858. * Update to 3.1.7 * Update installation layout * Upstream CMake export is not ready for use * Update versions * Remove obsolete patch * Use msvc layout for mingw on windows * Add debug-support feature * Update versions * Fix condition * Update versions * Restore symlink patch * Update versions * Remove trace option from test port * Enable testing without feature debug-support * Fixup defaults for using without debug support * Expect wxrc-3.1 for mingw cross builds ("unix" layout) * Update versions --- ports/wxcharts/portfile.cmake | 2 - ports/wxcharts/vcpkg.json | 2 +- ports/wxwidgets/example/CMakeLists.txt | 5 -- ports/wxwidgets/install-layout.patch | 35 +++++----- ports/wxwidgets/mingw-output-name.patch | 21 ------ ports/wxwidgets/nanosvg-ext-depend.patch | 64 +++++++++---------- ports/wxwidgets/portfile.cmake | 29 +++++++-- ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 20 +++--- ports/wxwidgets/vcpkg.json | 11 ++-- .../vcpkg-ci-wxwidgets/portfile.cmake | 2 - .../test_ports/vcpkg-ci-wxwidgets/vcpkg.json | 1 + versions/baseline.json | 6 +- versions/w-/wxcharts.json | 5 ++ versions/w-/wxwidgets.json | 5 ++ 14 files changed, 100 insertions(+), 108 deletions(-) delete mode 100644 ports/wxwidgets/mingw-output-name.patch diff --git a/ports/wxcharts/portfile.cmake b/ports/wxcharts/portfile.cmake index 5fbb5c35c10d09..7d6534b1a26824 100644 --- a/ports/wxcharts/portfile.cmake +++ b/ports/wxcharts/portfile.cmake @@ -7,8 +7,6 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_RELEASE - -DwxBUILD_DEBUG_LEVEL=0 ) vcpkg_cmake_install() diff --git a/ports/wxcharts/vcpkg.json b/ports/wxcharts/vcpkg.json index 15e320e74b0f94..90226b7e409321 100644 --- a/ports/wxcharts/vcpkg.json +++ b/ports/wxcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wxcharts", - "version-date": "2022-06-16", + "version-date": "2022-07-05", "description": "Chart controls for the wxWidgets cross-platform GUI library", "homepage": "https://www.wxishiko.com/wxCharts", "license": "MIT", diff --git a/ports/wxwidgets/example/CMakeLists.txt b/ports/wxwidgets/example/CMakeLists.txt index 14720cf37e2766..7d5b12dba4cdbe 100644 --- a/ports/wxwidgets/example/CMakeLists.txt +++ b/ports/wxwidgets/example/CMakeLists.txt @@ -2,11 +2,6 @@ cmake_minimum_required(VERSION 3.7) project(wxwidgets-example) -option(wxBUILD_DEBUG_LEVEL "Debug Level" Default) -if(NOT wxBUILD_DEBUG_LEVEL STREQUAL "Default") - add_compile_options("-DwxDEBUG_LEVEL=${wxBUILD_DEBUG_LEVEL}") -endif() - add_executable(main WIN32 popup.cpp) find_package(wxWidgets REQUIRED) diff --git a/ports/wxwidgets/install-layout.patch b/ports/wxwidgets/install-layout.patch index a0676bcb330fa5..589a0adb19d388 100644 --- a/ports/wxwidgets/install-layout.patch +++ b/ports/wxwidgets/install-layout.patch @@ -1,5 +1,18 @@ diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index b5175236e2..8c9275974f 100644 +index 32bd959..74f31ed 100644 +--- a/build/cmake/functions.cmake ++++ b/build/cmake/functions.cmake +@@ -418,7 +418,7 @@ macro(wx_add_library name) + set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short}) + + # Setup install +- set(runtime_dir "lib") ++ set(runtime_dir "bin") + if(WIN32 AND NOT WIN32_MSVC_NAMING) + # configure puts the .dll in the bin directory + set(runtime_dir "bin") +diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake +index 3ff14ab..7bd00d3 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -146,7 +146,7 @@ if(WIN32) @@ -7,24 +20,12 @@ index b5175236e2..8c9275974f 100644 endif() -if(WIN32_MSVC_NAMING) -+if(WIN32_MSVC_NAMING AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) ++if(0) if(wxBUILD_SHARED) set(lib_suffix "_dll") else() -index 9e6aafa900..defd196d2e 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -417,7 +417,7 @@ macro(wx_add_library name) - - # Setup install - set(runtime_dir "lib") -- if(WIN32 AND NOT WIN32_MSVC_NAMING) -+ if(VCPKG_TOOLCHAIN OR (WIN32 AND NOT WIN32_MSVC_NAMING)) - # configure puts the .dll in the bin directory - set(runtime_dir "bin") - endif() diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake -index 7902646ef4..04ccd1aba7 100644 +index 84cb9f5..e2f460a 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake @@ -48,7 +48,7 @@ else() @@ -37,10 +38,10 @@ index 7902646ef4..04ccd1aba7 100644 ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ )" diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt -index 2b3a22834d..e0e964db9d 100644 +index d6b3465..870897b 100644 --- a/build/cmake/utils/CMakeLists.txt +++ b/build/cmake/utils/CMakeLists.txt -@@ -41,7 +41,7 @@ if(wxUSE_XRC) +@@ -38,7 +38,7 @@ if(wxUSE_XRC) endif() install(CODE "execute_process( \ diff --git a/ports/wxwidgets/mingw-output-name.patch b/ports/wxwidgets/mingw-output-name.patch deleted file mode 100644 index 772ac0743d4fdd..00000000000000 --- a/ports/wxwidgets/mingw-output-name.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 902b7c5..ad8d1c4 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -184,7 +184,6 @@ function(wx_set_target_properties target_name is_base) - set_target_properties(${target_name} - PROPERTIES - OUTPUT_NAME "wx_${lib_toolkit}${lib_unicode}${lib_flavour}${lib_suffix}-${lib_version}" -- OUTPUT_NAME_DEBUG "wx_${lib_toolkit}${lib_unicode}d${lib_flavour}${lib_suffix}-${lib_version}" - PREFIX "lib" - ) - endif() -@@ -486,7 +485,7 @@ function(wx_set_builtin_target_properties target_name) - PROPERTIES - OUTPUT_NAME ${target_name}${lib_unicode}${postfix} - ) -- if(WIN32) -+ if(WIN32 AND NOT MINGW) - set_target_properties(${target_name} - PROPERTIES - OUTPUT_NAME_DEBUG ${target_name}${lib_unicode}d diff --git a/ports/wxwidgets/nanosvg-ext-depend.patch b/ports/wxwidgets/nanosvg-ext-depend.patch index d9d96639f3f179..5b83abedd3fd02 100644 --- a/ports/wxwidgets/nanosvg-ext-depend.patch +++ b/ports/wxwidgets/nanosvg-ext-depend.patch @@ -1,35 +1,29 @@ -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index 8c9275974f..3758261299 100644 ---- a/build/cmake/init.cmake -+++ b/build/cmake/init.cmake -@@ -615,3 +615,6 @@ if(wxBUILD_PRECOMP) - wx_option_force_value(wxBUILD_PRECOMP OFF) - endif() - endif(wxBUILD_PRECOMP) -+ -+find_package(unofficial-nanosvg CONFIG REQUIRED) -+list(APPEND wxTOOLKIT_LIBRARIES unofficial::nanosvg::nanosvg) -diff --git a/src/generic/bmpsvg.cpp b/src/generic/bmpsvg.cpp -index 76f20dce4c..7a7c24b4dd 100644 ---- a/src/generic/bmpsvg.cpp -+++ b/src/generic/bmpsvg.cpp -@@ -26,7 +26,7 @@ - // your source tree doesn't contain 3rdparty/nanosvg and you should initialize - // and update the corresponding submodule. - #ifdef __has_include -- #if ! __has_include("../../3rdparty/nanosvg/src/nanosvg.h") -+ #if 0 - #error You need to run "git submodule update --init 3rdparty/nanosvg". - #undef wxHAS_SVG - #endif -@@ -60,8 +60,8 @@ - #define NANOSVG_IMPLEMENTATION - #define NANOSVGRAST_IMPLEMENTATION - #define NANOSVG_ALL_COLOR_KEYWORDS --#include "../../3rdparty/nanosvg/src/nanosvg.h" --#include "../../3rdparty/nanosvg/src/nanosvgrast.h" -+#include -+#include - - #ifdef __VISUALC__ - #pragma warning(pop) +diff --git a/build/cmake/lib/nanosvg.cmake b/build/cmake/lib/nanosvg.cmake +index 401bf48..b9e4b57 100644 +--- a/build/cmake/lib/nanosvg.cmake ++++ b/build/cmake/lib/nanosvg.cmake +@@ -16,9 +16,9 @@ elseif(wxUSE_NANOSVG) + set(NANOSVG_INCLUDE_DIRS ) + set(wxUSE_NANOSVG_EXTERNAL_ENABLE_IMPL TRUE) + +- find_package(NanoSVG REQUIRED) ++ find_package(unofficial-nanosvg CONFIG REQUIRED) + +- foreach(TARGETNAME NanoSVG::nanosvg NanoSVG::nanosvgrast unofficial::nanosvg) ++ foreach(TARGETNAME unofficial::nanosvg::nanosvg) + if(NOT TARGET ${TARGETNAME}) + continue() + endif() +diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake +index 49c536a..5630526 100644 +--- a/build/cmake/options.cmake ++++ b/build/cmake/options.cmake +@@ -114,7 +114,7 @@ wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_ + wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)") + wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)") + wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)") +-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG") ++wx_add_thirdparty_library(wxUSE_NANOSVG unofficial-nanosvg "use NanoSVG for rasterizing SVG") + + wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF) + set(wxTHIRD_PARTY_LIBRARIES ${wxTHIRD_PARTY_LIBRARIES} wxUSE_LIBLZMA "use liblzma for LZMA compression") diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index b8c9d3f54ffc82..f305f476ffdf25 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets - REF 35a6d7b15fedfdb5198bb6c28b31cda33b2c2a76 #v3.1.6-final - SHA512 f42b97a695e037130da9935e3abf117c0720325f194fcdabace95fa16a5ca06d49e35db9616bb0ef16600044397739459551a6276f3c239bd4fc160ecb6cdc16 + REF v3.1.7 + SHA512 d6c9613b82a7e697b60217ba8fe9be4406ce7fad1f8d2d16cbf94c9aa9b5a38f1f3e175cb7a80dac8a57196dd6aa2fc3db83b4099a4257bb1a79707002db4af2 HEAD_REF master PATCHES install-layout.patch @@ -38,6 +38,11 @@ vcpkg_check_features( vcpkg_find_acquire_program(PKGCONFIG) +set(OPTIONS_RELEASE "") +if(NOT "debug-support" IN_LIST FEATURES) + list(APPEND OPTIONS_RELEASE "-DwxBUILD_DEBUG_LEVEL=0") +endif() + set(OPTIONS "") if(VCPKG_TARGET_IS_OSX) list(APPEND OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) @@ -89,8 +94,8 @@ vcpkg_cmake_configure( -DwxUSE_LIBJPEG=sys -DwxUSE_LIBPNG=sys -DwxUSE_LIBTIFF=sys + -DwxUSE_NANOSVG=sys -DwxUSE_SECRETSTORE=FALSE - -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON -DwxUSE_STL=${WXWIDGETS_USE_STL} -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS} ${OPTIONS} @@ -99,13 +104,19 @@ vcpkg_cmake_configure( # however, we need to declare that the minimum cmake version requirement is at least 3.1 to use CMAKE_PREFIX_PATH as the path to find .pc. -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON OPTIONS_RELEASE - -DwxBUILD_DEBUG_LEVEL=0 + ${OPTIONS_RELEASE} ) vcpkg_cmake_install() +# The CMake export is not ready for use: It lacks a config file. +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/lib/cmake +) + set(tools wxrc) -if(VCPKG_TARGET_IS_MINGW OR NOT VCPKG_TARGET_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS OR NOT VCPKG_HOST_IS_WINDOWS) list(APPEND tools wxrc-3.1) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") @@ -176,6 +187,14 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") ) endif() +if(NOT "debug-support" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_HOST_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0") + else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx-3.1/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0") + endif() +endif() + if("example" IN_LIST FEATURES) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/example/CMakeLists.txt" diff --git a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake index f4a1403eee02c2..cbdd338090f6cf 100644 --- a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -7,18 +7,11 @@ set(wxWidgets_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") set(WX_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") unset(_vcpkg_wx_root) -if(MINGW) - # Force FindwxWidgets.cmake unix mode, matching mingw install layout - set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") - set(CMAKE_CROSSCOMPILING 1) -elseif(WIN32) - # Force FindwxWidgets.cmake win32 mode, matching win32 install layout +if(WIN32 AND CMAKE_HOST_WIN32) + # FindwxWidgets.cmake win32 mode, multi-config + # Force FindwxWidgets.cmake win32 mode for all windows targets built on windows set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") set(CMAKE_CROSSCOMPILING 0) -endif() - -if(WIN32 AND NOT CMAKE_CROSSCOMPILING) - # FindwxWidgets.cmake win32 mode, multi-config # Get cache variables for debug libs set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "") set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "") @@ -30,6 +23,11 @@ if(WIN32 AND NOT CMAKE_CROSSCOMPILING) set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") else() # FindwxWidgets.cmake unix mode, single-config + if(MINGW) + # Force FindwxWidgets.cmake unix mode for mingw cross builds + set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") + set(CMAKE_CROSSCOMPILING 1) + endif() set(_vcpkg_wxconfig "") if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST MAP_IMPORTED_CONFIG_${CMAKE_BUILD_TYPE}) # Debug @@ -53,7 +51,7 @@ if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling) unset(_vcpkg_wxwidgets_backup_crosscompiling) endif() -if(WIN32 AND NOT MINGW AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") +if(WIN32 AND CMAKE_HOST_WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") find_package(EXPAT QUIET) find_package(JPEG QUIET) find_package(PNG QUIET) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 2d222ef1265a9b..2075c208508457 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wxwidgets", - "version": "3.1.6", - "port-version": 2, + "version": "3.1.7", "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.", @@ -26,16 +25,16 @@ "name": "vcpkg-cmake", "host": true }, - { - "name": "vcpkg-cmake-config", - "host": true - }, "zlib" ], "default-features": [ + "debug-support", "sound" ], "features": { + "debug-support": { + "description": "Enable wxWidgets debugging support hooks even for release builds (wxDEBUG_LEVEL 1)" + }, "example": { "description": "Example source code and CMake project" }, diff --git a/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake index 7a1349c56bce1c..d301fa74a15038 100644 --- a/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake +++ b/scripts/test_ports/vcpkg-ci-wxwidgets/portfile.cmake @@ -12,8 +12,6 @@ vcpkg_cmake_configure( ${OPTIONS} -DCMAKE_CONFIG_RUN=1 "-DPRINT_VARS=CMAKE_CONFIG_RUN;wxWidgets_LIBRARIES" - OPTIONS_RELEASE - -DwxBUILD_DEBUG_LEVEL=0 ) vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json b/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json index 188d1069db05a9..989d47a579027a 100644 --- a/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-wxwidgets/vcpkg.json @@ -9,6 +9,7 @@ }, { "name": "wxwidgets", + "default-features": false, "features": [ "example" ] diff --git a/versions/baseline.json b/versions/baseline.json index a35b68fbcc1182..8343293aad9a7a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7641,12 +7641,12 @@ "port-version": 0 }, "wxcharts": { - "baseline": "2022-06-16", + "baseline": "2022-07-05", "port-version": 0 }, "wxwidgets": { - "baseline": "3.1.6", - "port-version": 2 + "baseline": "3.1.7", + "port-version": 0 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxcharts.json b/versions/w-/wxcharts.json index 8369741d8a4429..6804312bdfad21 100644 --- a/versions/w-/wxcharts.json +++ b/versions/w-/wxcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03603fb0a73094f361edd6b4f074b661654a19b2", + "version-date": "2022-07-05", + "port-version": 0 + }, { "git-tree": "0d4c30893a28468249d63c0f4c1a1a9e231ac817", "version-date": "2022-06-16", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 0f3a4e1566e334..41c90fb00f0fc7 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2610601e9e585455bc709f29636f79b5ad9382a2", + "version": "3.1.7", + "port-version": 0 + }, { "git-tree": "27a68f45cbdc9ab88864c353c7a8b91f76153509", "version": "3.1.6", From 538234bd53963b28e4c6c7ca40f1d8c46e52dce0 Mon Sep 17 00:00:00 2001 From: tkeinz Date: Tue, 12 Jul 2022 00:13:28 +0200 Subject: [PATCH 076/791] [ezfoundation] Add new port (#25604) * Add new port ezfoundation * Update version registry for ezfoundation * Skip unsupported Linux and OSX build for ezfoundation * Add license field for ezfoundation * Update version registry for ezfoundation * Add supports spec in manifest * Update version registry Co-authored-by: Mark Keinz --- ports/ezfoundation/ezFoundation_vcpkg.patch | 185 ++++++++++++++++++++ ports/ezfoundation/portfile.cmake | 62 +++++++ ports/ezfoundation/vcpkg.json | 18 ++ versions/baseline.json | 4 + versions/e-/ezfoundation.json | 9 + 5 files changed, 278 insertions(+) create mode 100644 ports/ezfoundation/ezFoundation_vcpkg.patch create mode 100644 ports/ezfoundation/portfile.cmake create mode 100644 ports/ezfoundation/vcpkg.json create mode 100644 versions/e-/ezfoundation.json diff --git a/ports/ezfoundation/ezFoundation_vcpkg.patch b/ports/ezfoundation/ezFoundation_vcpkg.patch new file mode 100644 index 00000000000000..f4b40c554003f4 --- /dev/null +++ b/ports/ezfoundation/ezFoundation_vcpkg.patch @@ -0,0 +1,185 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a04be90..f853a0c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,9 @@ + cmake_minimum_required(VERSION 3.19) + ++if(CMAKE_BUILD_TYPE STREQUAL Release) ++ set(CMAKE_BUILD_TYPE "Shipping" CACHE STRING "Release overridden with Shipping" FORCE) ++endif() ++ + if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + message(FATAL_ERROR "In-source builds are not supported. Please choose a different binary directory.") + return() +diff --git a/Code/Engine/CMakeLists.txt b/Code/Engine/CMakeLists.txt +index fb4bef4..ccda93d 100644 +--- a/Code/Engine/CMakeLists.txt ++++ b/Code/Engine/CMakeLists.txt +@@ -20,5 +20,3 @@ execute_process( + OUTPUT_VARIABLE EZ_GIT_BRANCH_NAME + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +- +-configure_file("${CMAKE_CURRENT_LIST_DIR}/ezBuildInfo.h.in" "${CMAKE_CURRENT_LIST_DIR}/ezBuildInfo.h" NEWLINE_STYLE LF) +\ No newline at end of file +diff --git a/Code/Engine/Foundation/Basics/Assert.cpp b/Code/Engine/Foundation/Basics/Assert.cpp +index 7a55afc..778fadd 100644 +--- a/Code/Engine/Foundation/Basics/Assert.cpp ++++ b/Code/Engine/Foundation/Basics/Assert.cpp +@@ -66,16 +66,6 @@ bool ezDefaultAssertHandler(const char* szSourceFile, ezUInt32 uiLine, const cha + + #if EZ_ENABLED(EZ_PLATFORM_WINDOWS) + +- // make sure the cursor is definitely shown, since the user must be able to click buttons +-# if EZ_ENABLED(EZ_PLATFORM_WINDOWS_UWP) +- // Todo: Use modern Windows API to show cursor in current window. +- // http://stackoverflow.com/questions/37956628/change-mouse-pointer-in-uwp-app +-# else +- ezInt32 iHideCursor = 1; +- while (ShowCursor(true) < 0) +- ++iHideCursor; +-# endif +- + # if EZ_ENABLED(EZ_COMPILE_FOR_DEBUG) + + ezInt32 iRes = _CrtDbgReport(_CRT_ASSERT, szSourceFile, uiLine, nullptr, "'%s'\nFunction: %s\nMessage: %s", szExpression, szFunction, szAssertMsg); +@@ -83,24 +73,9 @@ bool ezDefaultAssertHandler(const char* szSourceFile, ezUInt32 uiLine, const cha + // currently we will ALWAYS trigger the breakpoint / crash (except for when the user presses 'ignore') + if (iRes == 0) + { +- // when the user ignores the assert, restore the cursor show/hide state to the previous count +-# if EZ_ENABLED(EZ_PLATFORM_WINDOWS_UWP) +- // Todo: Use modern Windows API to restore cursor. +-# else +- for (ezInt32 i = 0; i < iHideCursor; ++i) +- ShowCursor(false); +-# endif +- + return false; + } + +-# else +- +- +-# if EZ_ENABLED(EZ_PLATFORM_WINDOWS_DESKTOP) +- MessageBoxA(nullptr, szTemp, "Assertion", MB_ICONERROR); +-# endif +- + # endif + + #endif +diff --git a/Code/Engine/Foundation/Logging/Implementation/Log.cpp b/Code/Engine/Foundation/Logging/Implementation/Log.cpp +index 1a0d2ed..afcde54 100644 +--- a/Code/Engine/Foundation/Logging/Implementation/Log.cpp ++++ b/Code/Engine/Foundation/Logging/Implementation/Log.cpp +@@ -260,12 +260,7 @@ void ezLog::OsMessageBox(const ezFormatString& text) + title = ezApplication::GetApplicationInstance()->GetApplicationName(); + } + +-#if EZ_ENABLED(EZ_PLATFORM_WINDOWS_DESKTOP) +- MessageBoxW(nullptr, ezStringWChar(display).GetData(), ezStringWChar(title), MB_OK); +-#else + ezLog::Print(display); +- EZ_ASSERT_NOT_IMPLEMENTED; +-#endif + } + + void ezLog::GenerateFormattedTimestamp(TimestampMode mode, ezStringBuilder& sTimestampOut) +diff --git a/Code/Engine/Foundation/Math/Implementation/Math_inl.h b/Code/Engine/Foundation/Math/Implementation/Math_inl.h +index 1a2962e..9b31f01 100644 +--- a/Code/Engine/Foundation/Math/Implementation/Math_inl.h ++++ b/Code/Engine/Foundation/Math/Implementation/Math_inl.h +@@ -80,6 +80,7 @@ namespace ezMath + #endif + } + ++#if EZ_ENABLED(EZ_PLATFORM_64BIT) + EZ_ALWAYS_INLINE ezUInt32 FirstBitLow(ezUInt64 value) + { + EZ_ASSERT_DEBUG(value != 0, "FirstBitLow is undefined for 0"); +@@ -95,6 +96,7 @@ namespace ezMath + return 0; + #endif + } ++#endif + + EZ_ALWAYS_INLINE ezUInt32 FirstBitHigh(ezUInt32 value) + { +@@ -112,6 +114,7 @@ namespace ezMath + #endif + } + ++#if EZ_ENABLED(EZ_PLATFORM_64BIT) + EZ_ALWAYS_INLINE ezUInt32 FirstBitHigh(ezUInt64 value) + { + EZ_ASSERT_DEBUG(value != 0, "FirstBitHigh is undefined for 0"); +@@ -127,6 +130,7 @@ namespace ezMath + return 0; + #endif + } ++#endif + + EZ_ALWAYS_INLINE ezUInt32 CountTrailingZeros(ezUInt32 bitmask) { return (bitmask == 0) ? 32 : FirstBitLow(bitmask); } + +diff --git a/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h b/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h +index fb839b3..21e2ec1 100644 +--- a/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h ++++ b/Code/Engine/Foundation/Memory/Implementation/AllocatorBase_inl.h +@@ -60,7 +60,11 @@ namespace ezInternal + template + EZ_FORCE_INLINE T* CreateRawBuffer(ezAllocatorBase* pAllocator, size_t uiCount) + { ++#if EZ_ENABLED(EZ_PLATFORM_64BIT) + ezUInt64 safeAllocationSize = ezMath::SafeMultiply64(uiCount, sizeof(T)); ++#else ++ ezUInt32 safeAllocationSize = ezMath::SafeMultiply32(uiCount, sizeof(T)); ++#endif + return static_cast(pAllocator->Allocate(safeAllocationSize, EZ_ALIGNMENT_OF(T))); + } + +diff --git a/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h b/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h +index 54939fb..15f928a 100644 +--- a/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h ++++ b/Code/Engine/Foundation/System/Implementation/Win/StackTracer_win.h +@@ -229,11 +229,23 @@ ezUInt32 ezStackTracer::GetStackTrace(ezArrayPtr& trace, void* pContext) + frame.AddrFrame.Offset = context.Rbp; + frame.AddrStack.Offset = context.Rsp; + machine_type = IMAGE_FILE_MACHINE_AMD64; +-#else ++#elif defined(_M_IX86) + frame.AddrPC.Offset = context.Eip; + frame.AddrFrame.Offset = context.Ebp; + frame.AddrStack.Offset = context.Esp; + machine_type = IMAGE_FILE_MACHINE_I386; ++#elif defined(_M_ARM64) ++ frame.AddrPC.Offset = context.Pc; ++ frame.AddrFrame.Offset = context.Fp; ++ frame.AddrStack.Offset = context.Sp; ++ machine_type = IMAGE_FILE_MACHINE_ARM64; ++#elif defined(_M_ARM) ++ frame.AddrPC.Offset = context.Pc; ++ frame.AddrFrame.Offset = context.R11; ++ frame.AddrStack.Offset = context.Sp; ++ machine_type = IMAGE_FILE_MACHINE_ARM; ++#else ++ #error Unknown architecture + #endif + for (ezInt32 i = 0; i < (ezInt32)trace.GetCount(); i++) + { +diff --git b/Code/Engine/ezBuildInfo.h b/Code/Engine/ezBuildInfo.h +new file mode 100644 +index 0000000..763271c +--- /dev/null ++++ b/Code/Engine/ezBuildInfo.h +@@ -0,0 +1,10 @@ ++// ++// This file is auto-generated by CMake. ++// ++ ++#pragma once ++ ++#define EZ_GIT_COMMIT_HASH_SHORT ++#define EZ_GIT_COMMIT_HASH_LONG ++#define EZ_GIT_BRANCH_NAME "" ++ diff --git a/ports/ezfoundation/portfile.cmake b/ports/ezfoundation/portfile.cmake new file mode 100644 index 00000000000000..c93b4389a7f2bc --- /dev/null +++ b/ports/ezfoundation/portfile.cmake @@ -0,0 +1,62 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ezEngine/ezEngine + REF 1448308ab99bae0d8d2a292ad345ff3a757f3124 #21.10 + SHA512 20da87772366d1612795f534b31600123c0d04beba252d27d895c3c3cff7dae65952bd890629d79a7a691c2f3444601552c4b4eca99e8f8a99dc935ce2ebd284 + PATCHES + ezFoundation_vcpkg.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DEZ_3RDPARTY_ENET_SUPPORT=OFF + -DEZ_3RDPARTY_ZSTD_SUPPORT=OFF + -DEZ_3RDPARTY_ZLIB_SUPPORT=OFF + -DEZ_BUILD_FILTER=FoundationOnly + -DEZ_BUILD_UNITTESTS=OFF + -DEZ_ENABLE_FOLDER_UNITY_FILES=OFF + -DEZ_ENABLE_QT_SUPPORT=OFF + -DEZ_USE_PCH=OFF + OPTIONS_DEBUG + -DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Lib + -DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Bin + OPTIONS_RELEASE + -DEZ_OUTPUT_DIRECTORY_LIB=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Lib + -DEZ_OUTPUT_DIRECTORY_DLL=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Bin +) + +vcpkg_cmake_build(TARGET Foundation) + +# EzEngine does not support CMake-based install; copy headers and libraries manually. +file(GLOB_RECURSE FOUNDATION_INCLUDE_FILES RELATIVE "${SOURCE_PATH}/Code/Engine/Foundation" "${SOURCE_PATH}/Code/Engine/Foundation/*.h") +foreach(SOURCE_FILE ${FOUNDATION_INCLUDE_FILES}) + get_filename_component(SOURCE_FILE_DIR "${SOURCE_FILE}" DIRECTORY) + if(SOURCE_FILE_DIR STREQUAL "") + set(TARGET_DIR "${CURRENT_PACKAGES_DIR}/include/Foundation") + else() + set(TARGET_DIR "${CURRENT_PACKAGES_DIR}/include/Foundation/${SOURCE_FILE_DIR}") + endif() + file(COPY "${SOURCE_PATH}/Code/Engine/Foundation/${SOURCE_FILE}" DESTINATION "${TARGET_DIR}") +endforeach() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + set(LIB_SOURCE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Output/Lib") + set(LIB_TARGET_DIR "${CURRENT_PACKAGES_DIR}/debug/lib") + file(GLOB_RECURSE LIB_FILES "${LIB_SOURCE_DIR}/*.lib") + foreach(LIB_FILE ${LIB_FILES}) + file(COPY "${LIB_FILE}" DESTINATION "${LIB_TARGET_DIR}") + endforeach() +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) + set(LIB_SOURCE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Output/Lib") + set(LIB_TARGET_DIR "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB_RECURSE LIB_FILES "${LIB_SOURCE_DIR}/*.lib") + foreach(LIB_FILE ${LIB_FILES}) + file(COPY "${LIB_FILE}" DESTINATION "${LIB_TARGET_DIR}") + endforeach() +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ezfoundation/vcpkg.json b/ports/ezfoundation/vcpkg.json new file mode 100644 index 00000000000000..6b60fd29d4a4b7 --- /dev/null +++ b/ports/ezfoundation/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ezfoundation", + "version": "21.10", + "description": "Foundation library out of ezEngine", + "homepage": "https://ezengine.net/", + "license": "MIT", + "supports": "windows | uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8343293aad9a7a..a25ba1335471e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2152,6 +2152,10 @@ "baseline": "1.4.7", "port-version": 0 }, + "ezfoundation": { + "baseline": "21.10", + "port-version": 0 + }, "faad2": { "baseline": "2.9.1", "port-version": 5 diff --git a/versions/e-/ezfoundation.json b/versions/e-/ezfoundation.json new file mode 100644 index 00000000000000..6c4c72ed8cb3b7 --- /dev/null +++ b/versions/e-/ezfoundation.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9db831cf3166d08f581365fccce852ae9aeb8b69", + "version": "21.10", + "port-version": 0 + } + ] +} From e562b659d10096681acf157117f952ea110a8f64 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Tue, 12 Jul 2022 06:14:32 +0800 Subject: [PATCH 077/791] [boost-modular-build-helper] Add support for loongarch64 cpu (#25614) * Add support for loongarch64 cpu. * update port version database * update port version * Do nothing... * Revert "Do nothing..." This reverts commit b73b0e4cb8ace91a2268b89d6260c454005d1b2e. Co-authored-by: Jamlys Lee Co-authored-by: Victor Romero --- ports/boost-modular-build-helper/CMakeLists.txt | 2 ++ ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index faa87bdad6e161..8cdb5d9c350dd8 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -38,6 +38,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STR list(APPEND B2_OPTIONS architecture=arm) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") list(APPEND B2_OPTIONS architecture=power) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch") + list(APPEND B2_OPTIONS architecture=loongarch) elseif("arm64" IN_LIST VCPKG_TARGET_ARCHITECTURE AND "x86_64" IN_LIST VCPKG_TARGET_ARCHITECTURE) list(APPEND B2_OPTIONS architecture=arm+x86) else() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index a2c7ed04a96ab6..9bebbebcd9c25d 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.79.0", - "port-version": 4, + "port-version": 5, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index f89e97eb602681..bbb9d39a7cf58c 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93946fc40b519f0f9afe1b0d36985b2def25d4ab", + "version": "1.79.0", + "port-version": 5 + }, { "git-tree": "cd7a5259d9e086b94af5673e581427f76957ce62", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index a25ba1335471e4..8f10e3bfccc6cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -834,7 +834,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 4 + "port-version": 5 }, "boost-move": { "baseline": "1.79.0", From e3316f695ba708c28a308eb37eae4fbe25f8b716 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 12 Jul 2022 00:24:05 +0200 Subject: [PATCH 078/791] [gdal] compatibility with 32bit devices android_api<24 (#25637) --- ports/gdal/portfile.cmake | 5 +++++ ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 9d22a44cacf688..7acf1640de654d 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -59,6 +59,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS_RELEASE tools BUILD_APPS ) +# Compatibility with older Android versions https://github.com/OSGeo/gdal/pull/5941 +if(VCPKG_TARGET_IS_ANDROID AND ANRDOID_PLATFORM VERSION_LESS 24 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) + list(APPEND FEATURE_OPTIONS -DBUILD_WITHOUT_64BIT_OFFSET=ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 8fba9efc9bde81..d42510690f8f77 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.5.1", - "port-version": 1, + "port-version": 2, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 8f10e3bfccc6cd..14106486a30ee1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2470,7 +2470,7 @@ }, "gdal": { "baseline": "3.5.1", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index bf3f5a024fe1c9..3e8f87955a875a 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d114225017db64685132cde062afde8ec8cbc9b", + "version-semver": "3.5.1", + "port-version": 2 + }, { "git-tree": "dd8ff4159201d96aecb0cc2de325b56a522ae0e1", "version-semver": "3.5.1", From 60e22b44bfefb1cd427d27709bf4c680ce55b200 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 12 Jul 2022 01:38:12 +0300 Subject: [PATCH 079/791] [basisu] Fix x64-linux-dynamic build, switch to vcpkg_cmake_configure (#25662) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/basisu/portfile.cmake | 29 +++++++---------------------- ports/basisu/vcpkg.json | 11 ++++++++--- versions/b-/basisu.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/ports/basisu/portfile.cmake b/ports/basisu/portfile.cmake index 8873c52fc51344..e04b993d9935c0 100644 --- a/ports/basisu/portfile.cmake +++ b/ports/basisu/portfile.cmake @@ -7,34 +7,19 @@ vcpkg_from_github( PATCHES fix-addostream.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -#vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/basisu) -if (WIN32) - set(TOOL_NAME basisu_tool.exe) -else() - set(TOOL_NAME basisu_tool) -endif() - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/basisu) +vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/basisu) +vcpkg_copy_tools(TOOL_NAMES "basisu_tool" AUTO_CLEAN) # Remove unnecessary files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/basisu/vcpkg.json b/ports/basisu/vcpkg.json index a0fe5cc685326c..2c51222ef7aac2 100644 --- a/ports/basisu/vcpkg.json +++ b/ports/basisu/vcpkg.json @@ -1,10 +1,15 @@ { "name": "basisu", - "version-string": "1.11", - "port-version": 5, + "version": "1.11", + "port-version": 6, "description": "Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats.", "homepage": "https://github.com/BinomialLLC/basis_universal", + "license": "Apache-2.0", "dependencies": [ - "lodepng" + "lodepng", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/b-/basisu.json b/versions/b-/basisu.json index c9940a435a31b6..d47b96590f8b7a 100644 --- a/versions/b-/basisu.json +++ b/versions/b-/basisu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8552deb382fab18170488ffdf05fdd50dd3e2d99", + "version": "1.11", + "port-version": 6 + }, { "git-tree": "70d762c5a7350879f47429ea6275ba34f1c0f449", "version-string": "1.11", diff --git a/versions/baseline.json b/versions/baseline.json index 14106486a30ee1..e50aa52515afbe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -402,7 +402,7 @@ }, "basisu": { "baseline": "1.11", - "port-version": 5 + "port-version": 6 }, "bcg729": { "baseline": "1.1.1", From e2b22a2ae5555275f46a1696fa3ad06c30ebbf3c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Jul 2022 00:52:46 +0200 Subject: [PATCH 080/791] [liblas] Fix geotiff dependency, document usage, add feature 'tools' (#25664) * [liblas] use supports expression * Fix linkage and license * Drop pointless stuff * Simplify cleanup, minor fixes * Fix exported config * Add tools feature * Install usage file * Update versions * Fix usage * Update versions * Add Windows prefix to usage * Update versions Co-authored-by: Leander Schulten --- ports/liblas/fix-cmake-config.patch | 13 +++++++ ports/liblas/misc-fixes.patch | 59 +++++++++++++++++++++++++++++ ports/liblas/portfile.cmake | 59 +++++++++++++++++------------ ports/liblas/usage | 9 +++++ ports/liblas/vcpkg.json | 27 ++++++++----- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/l-/liblas.json | 5 +++ 8 files changed, 138 insertions(+), 37 deletions(-) create mode 100644 ports/liblas/fix-cmake-config.patch create mode 100644 ports/liblas/misc-fixes.patch create mode 100644 ports/liblas/usage diff --git a/ports/liblas/fix-cmake-config.patch b/ports/liblas/fix-cmake-config.patch new file mode 100644 index 00000000000000..53a819aeafbabd --- /dev/null +++ b/ports/liblas/fix-cmake-config.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/liblas-config.cmake.in b/cmake/liblas-config.cmake.in +index 175e997..8a55804 100644 +--- a/cmake/liblas-config.cmake.in ++++ b/cmake/liblas-config.cmake.in +@@ -19,6 +19,8 @@ set (libLAS_INCLUDE_DIRS "${PROJECT_ROOT_DIR}/include") + set (libLAS_LIBRARY_DIRS "${PROJECT_ROOT_DIR}/lib") + set (libLAS_BINARY_DIRS "${PROJECT_ROOT_DIR}/bin") + ++include(CMakeFindDependencyMacro) ++find_dependency(GeoTIFF CONFIG) + include ("${_DIR}/liblas-depends.cmake") + if(WIN32) + set (libLAS_LIBRARIES liblas liblas_c) diff --git a/ports/liblas/misc-fixes.patch b/ports/liblas/misc-fixes.patch new file mode 100644 index 00000000000000..14f5ff6daca951 --- /dev/null +++ b/ports/liblas/misc-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d246a88..3da2106 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,7 @@ + # + ############################################################################### + # libLAS general settings ++cmake_minimum_required(VERSION 3.7.0) + project(libLAS) + + +@@ -64,7 +65,6 @@ set(WITH_ENDIANAWARE FALSE CACHE BOOL "Choose whether or not libLAS should do ru + + ############################################################################### + # CMake settings +-cmake_minimum_required(VERSION 2.6.0) + + set(CMAKE_COLOR_MAKEFILE ON) + +@@ -107,7 +107,6 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY}) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY}) + + file(READ "doc/index.txt" README ) +-file(WRITE "README.txt" "${README}") + + ############################################################################### + # Platform and compiler specific settings +@@ -138,8 +137,6 @@ if(WIN32) + + endif() + +- set(CMAKE_INCLUDE_PATH c:/osgeo4w64/include;$ENV{CMAKE_INCLUDE_PATH}) +- set(CMAKE_LIBRARY_PATH c:/osgeo4w64/lib;$ENV{CMAKE_LIBRARY_PATH}) + else() + + # Recommended C++ compilation flags +@@ -337,8 +334,6 @@ set(LIBLAS_DATA_DIR ${LIBLAS_DATA_SUBDIR}) + ############################################################################### + # Installation commands + +-install(FILES AUTHORS COPYING INSTALL LICENSE.txt README.txt +- DESTINATION ${LIBLAS_DATA_DIR}/doc) + + ############################################################################### + # Processing of project directories +diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt +index beb83e2..e328c95 100644 +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt +@@ -160,7 +160,7 @@ install(TARGETS ${LIBLAS_UTILITIES} + ARCHIVE DESTINATION ${LIBLAS_LIB_DIR}) + + +-if(UNIX) ++if(0) + + set(LIBLAS_UTILS_RPATH ${CMAKE_INSTALL_PREFIX}/lib ${Boost_LIBRARY_DIRS}) + if(LASZIP_FOUND) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index a50ede2f61d2f8..30976cb89db4e2 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + set(VERSION 1.8.1) vcpkg_download_distfile(ARCHIVE @@ -8,44 +10,51 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-boost-headers.patch + fix-cmake-config.patch + misc-fixes.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake) +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools WITH_UTILITIES +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_OSGEO4W=OFF # Disable osgeo4w +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_OSGEO4W=OFF -DWITH_TESTS=OFF + OPTIONS_DEBUG -DWITH_UTILITIES=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG} ) -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake) +vcpkg_cmake_install() if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS) + vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libLAS) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(WITH_UTILITIES) + set(tools lasinfo lasblock las2las las2txt txt2las ts2las) + if(NOT WIN32) + list(APPEND tools las2col las2pg) + endif() + vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) +endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/liblas/usage b/ports/liblas/usage new file mode 100644 index 00000000000000..87170054704a89 --- /dev/null +++ b/ports/liblas/usage @@ -0,0 +1,9 @@ +liblas provides CMake targets: + + # C API + find_package(libLAS CONFIG REQUIRED) + target_link_libraries(main PRIVATE $<$:lib>las_c) + + # C++ API + find_package(libLAS CONFIG REQUIRED) + target_link_libraries(main PRIVATE $<$:lib>las) diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index 049580bde09398..bfb042e370fab1 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -1,8 +1,10 @@ { "name": "liblas", "version": "1.8.1", - "port-version": 9, + "port-version": 10, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", + "license": null, + "supports": "!arm & !staticcrt", "dependencies": [ "boost-detail", "boost-filesystem", @@ -14,20 +16,25 @@ "boost-system", "boost-thread", "boost-uuid", - "libgeotiff" + "libgeotiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "jpeg": { - "description": "Support for jpeg", - "dependencies": [ - "libjpeg-turbo" - ] + "description": "This feature does nothing. It is retained for compatibility." + }, + "tools": { + "description": "Build utilities." }, "zlib": { - "description": "Support zlib for compression", - "dependencies": [ - "zlib" - ] + "description": "This feature does nothing. It is retained for compatibility." } } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 75898e8581c8ff..f8ecb4920b7608 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -426,7 +426,6 @@ libigl:x64-uwp=fail libirecovery:x64-windows-static-md=fail # 120 min build time for libjxl arm-uwp-rel, reason unknown libjxl:arm-uwp=skip -liblas:arm64-windows=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index e50aa52515afbe..915a3f34b1c878 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3758,7 +3758,7 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 9 + "port-version": 10 }, "liblbfgs": { "baseline": "1.10", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 547d1f6321b2c9..8d32b3242fa80f 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59d85ba2350ba688af5aad5a538382fd7b2963e3", + "version": "1.8.1", + "port-version": 10 + }, { "git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005", "version": "1.8.1", From d0521dadf6e44d09a6d98ac69ef0c1055eafae10 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 12 Jul 2022 02:08:31 +0300 Subject: [PATCH 081/791] [fastrtps] Update to 2.4.2, fix tool path and x64-linux-dynamic build (#25666) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/fastrtps/disable-symlink.patch | 18 +++++++++--------- ports/fastrtps/portfile.cmake | 9 ++++++--- ports/fastrtps/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fastrtps.json | 5 +++++ 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ports/fastrtps/disable-symlink.patch b/ports/fastrtps/disable-symlink.patch index a35558a19b1497..d9584c81efbdff 100644 --- a/ports/fastrtps/disable-symlink.patch +++ b/ports/fastrtps/disable-symlink.patch @@ -5,12 +5,12 @@ we force the build script to create a batch file in any case. diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt --- a/tools/fds/CMakeLists.txt +++ b/tools/fds/CMakeLists.txt -@@ -124,7 +124,7 @@ if(NOT BUILD_SHARED_LIBS) - if( WIN32 ) - # Use powershell to generate the link - install( -- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" -+ CODE "set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n" - COMPONENT discovery) - else() - # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix +@@ -116,7 +116,7 @@ # - on windows privileges to create symlinks (a .bat file is provided on unprivileged installations) + if( WIN32 ) + # Use powershell to generate the link + install( +- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" ++ CODE "set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n" + COMPONENT discovery) + else() + # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 48342bd53a2f97..4bcf76b0ea7f09 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-DDS - REF v2.4.0 - SHA512 2E9C0378AF86DD657391D577F6951096DD45970A2C4D9C384EE5A452A1DD129E6E0AED91E0B908A35A04CAF979253700560561D34082DA81FE737FE104C149AF + REF v2.7.0 + SHA512 289c94fb177209ffc80e93ae61822c83e7cb74ba7682f05a921c50ce048498bd811c19825d1fdb8af39b29a64904e96d87c5c59468139f0d8bb528549b80c94a HEAD_REF master PATCHES fix-find-package-asio.patch @@ -58,12 +58,15 @@ elseif(VCPKG_TARGET_IS_LINUX) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/ros-discovery" "$dir/../tools/fastdds/fastdds.py" "$dir/../fastdds/fastdds.py") endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fastdds/discovery/parser.py" "tool_path / '../../../bin'" "tool_path / '../../${PORT}'") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index 6c846645cb813e..117a007c832655 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,8 +1,9 @@ { "name": "fastrtps", - "version": "2.4.0", + "version": "2.7.0", "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", "homepage": "https://www.eprosima.com/", + "license": "Apache-2.0", "dependencies": [ "asio", "fastcdr", diff --git a/versions/baseline.json b/versions/baseline.json index 915a3f34b1c878..e738fe38ee3ca5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2209,7 +2209,7 @@ "port-version": 1 }, "fastrtps": { - "baseline": "2.4.0", + "baseline": "2.7.0", "port-version": 0 }, "fawdlstty-libfv": { diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index c8285d3e1e1fad..8b7d8d0814e09c 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a1b9df69d8a4219b390a65056d837dc6c0f385c", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "54873b953029cdd41ffee26b13af0c661de41462", "version": "2.4.0", From 88f7ab60545938c8affb4562d4200835d19c3435 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 12 Jul 2022 02:17:35 +0300 Subject: [PATCH 082/791] [freealut] Fix x64-linux-dynamic build (#25667) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/freealut/portfile.cmake | 13 ++++--------- ports/freealut/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/freealut.json | 5 +++++ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ports/freealut/portfile.cmake b/ports/freealut/portfile.cmake index 5db22992db1acf..429847754058e8 100644 --- a/ports/freealut/portfile.cmake +++ b/ports/freealut/portfile.cmake @@ -26,16 +26,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include" ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/freealut-config") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/freealut-config") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/freealut-config") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/freealut-config") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/freealut/vcpkg.json b/ports/freealut/vcpkg.json index a6f1860ae7865a..90a8aad4b064f7 100644 --- a/ports/freealut/vcpkg.json +++ b/ports/freealut/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freealut", "version": "1.1.0", - "port-version": 2, + "port-version": 3, "description": [ "FreeALUT is a free implementation of OpenAL's ALUT standard.", "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. " diff --git a/versions/baseline.json b/versions/baseline.json index e738fe38ee3ca5..540b096e3a99e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2354,7 +2354,7 @@ }, "freealut": { "baseline": "1.1.0", - "port-version": 2 + "port-version": 3 }, "freeglut": { "baseline": "3.2.2", diff --git a/versions/f-/freealut.json b/versions/f-/freealut.json index 457bdf8ebd8e70..e8da86da45b2c8 100644 --- a/versions/f-/freealut.json +++ b/versions/f-/freealut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "969ad25e70aeab73962cb7bea1df1ea30644ad20", + "version": "1.1.0", + "port-version": 3 + }, { "git-tree": "bb6f48903b677ac0c8560a068e53f7a028b2a5d4", "version": "1.1.0", From 82c7a4578abd317e019f02e05353ab7eabab8e15 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 12 Jul 2022 07:17:58 +0800 Subject: [PATCH 083/791] [uwebsockets] update to 20.14.0 (#25687) * [uwebsockets] update to 20.14.0 * update version --- ports/uwebsockets/portfile.cmake | 4 ++-- ports/uwebsockets/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 31984b177c7bac..52be4185db47b6 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF v20.11.0 - SHA512 cd4efb386b4d140c6ccbfa92e8be1d3c9b896474a3074b95ad35bedde9face80a1e4bae594359555010d76c2ccf8243b29e97079de8b0f18cda510274135b8e0 + REF e4c6fbf8defda2aeaf941e5c656bdc589d7d331c #v20.14.0 + SHA512 c58210819f26eacad4f2d269c1625e46391174a1840423fd198c03549b7a99be2e27ccd83c8711537618b8aa3087bcf71a6146582f221a205eb6d92c2f891ba1 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index fe675dbb0fe7d7..e36e533f2d8a76 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,8 +1,9 @@ { "name": "uwebsockets", - "version-semver": "20.11.0", + "version-semver": "20.14.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", + "license": "Apache-2.0", "dependencies": [ "usockets", "zlib" diff --git a/versions/baseline.json b/versions/baseline.json index 540b096e3a99e4..12c1bc257ea5b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7365,7 +7365,7 @@ "port-version": 1 }, "uwebsockets": { - "baseline": "20.11.0", + "baseline": "20.14.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index ce1397846d4627..9863751eb35fa8 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f25a78232935faad44896203386f3c282301805a", + "version-semver": "20.14.0", + "port-version": 0 + }, { "git-tree": "5b1e062e56cf8ea0bdfe07414a11791e62c964fe", "version-semver": "20.11.0", From 7f4476af9d2f2661c5db925d26a569dafdca0789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 11 Jul 2022 23:18:21 +0000 Subject: [PATCH 084/791] [sdformat9] Update to 9.8.0 (#25685) * [sdformat9] Update to 9.8.0 * version --- ports/sdformat9/portfile.cmake | 6 +++--- ports/sdformat9/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sdformat9.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/sdformat9/portfile.cmake b/ports/sdformat9/portfile.cmake index 058988450fdd93..54d083a293f4e8 100644 --- a/ports/sdformat9/portfile.cmake +++ b/ports/sdformat9/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osrf/sdformat - REF sdformat9_9.4.0 - SHA512 b7ed458a5a9ba5b5dcf457d3e0c9de0bca3d514a6870aa977a00a84f8a3b8d1bd21f3b437c0651af7f0cc9b9c6c8b905c968525194605b334ab62280b9d55b0e + REF a978ade73e7b3509d378667dca394681e55ca068 #9.8.0 + SHA512 958c0613da7c885f81cceee726da10574188e5edafb7d3aca680e40bbdca6ff1bc7b721ee1c56c53e3973960ae715912adfa6541cf3e35d32a5dc2ef2a997505 HEAD_REF sdf9 PATCHES fix-dependency-urdfdom.patch @@ -13,7 +13,7 @@ vcpkg_from_github( # Ruby is required by the sdformat build process vcpkg_find_acquire_program(RUBY) -get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) +get_filename_component(RUBY_PATH "${RUBY}" DIRECTORY) set(_path $ENV{PATH}) vcpkg_add_to_path("${RUBY_PATH}") diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json index df9310a61c9b7d..c541b726b34984 100644 --- a/ports/sdformat9/vcpkg.json +++ b/ports/sdformat9/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdformat9", - "version": "9.4.0", - "port-version": 6, + "version": "9.8.0", "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 12c1bc257ea5b1..f90ef43bd27a99 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6449,8 +6449,8 @@ "port-version": 6 }, "sdformat9": { - "baseline": "9.4.0", - "port-version": 6 + "baseline": "9.8.0", + "port-version": 0 }, "sdl1": { "baseline": "1.2.15", diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json index 379c64eb75ba3a..a4b2c78df32055 100644 --- a/versions/s-/sdformat9.json +++ b/versions/s-/sdformat9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32a06104ef8500390db26865dbc6f887de83f1ee", + "version": "9.8.0", + "port-version": 0 + }, { "git-tree": "0a599309f16afe5d3163ec1eb131eed575880ae4", "version": "9.4.0", From 1c284e9aa43c419d1024e4fa2d1a48bc5cea97bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 11 Jul 2022 23:20:49 +0000 Subject: [PATCH 085/791] [uvw] Fix usage (#25684) * [uvw] Fix usage * version --- ports/uvw/uvw-config.cmake | 2 +- ports/uvw/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uvw.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/uvw/uvw-config.cmake b/ports/uvw/uvw-config.cmake index 1fdc98f5384cb5..3a6d792f9a68ba 100644 --- a/ports/uvw/uvw-config.cmake +++ b/ports/uvw/uvw-config.cmake @@ -1,2 +1,2 @@ -find_package(unofficial-libuv CONFIG REQUIRED) +find_package(libuv CONFIG REQUIRED) include ("${CMAKE_CURRENT_LIST_DIR}/uvw-targets.cmake") diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json index f9cbcaa07ec1cd..ea974cfb14223a 100644 --- a/ports/uvw/vcpkg.json +++ b/ports/uvw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "uvw", "version": "2.12.1", - "port-version": 1, + "port-version": 2, "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", "homepage": "https://github.com/skypjack/uvw", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index f90ef43bd27a99..5760a5fdc5bc51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7362,7 +7362,7 @@ }, "uvw": { "baseline": "2.12.1", - "port-version": 1 + "port-version": 2 }, "uwebsockets": { "baseline": "20.14.0", diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json index e0201c68a22651..048053fbcfbeb1 100644 --- a/versions/u-/uvw.json +++ b/versions/u-/uvw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c36c66a8d5f4a6eed4aa9fe4399f32a516d3883c", + "version": "2.12.1", + "port-version": 2 + }, { "git-tree": "609b48de110aa8763d8f4a674ac3aa7c5821382f", "version": "2.12.1", From dbb8930ca33edd9b413f9628b8bdf190f8397c8d Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 11 Jul 2022 16:22:28 -0700 Subject: [PATCH 086/791] [vcpkg baseline][isal, spdk-isal] Fix conflict (#25679) * [vcpkg baseline][isal, spdk-isal] Fix conflict * format vcpkg.json * x-add-version * apply suggestion * x-add-version Co-authored-by: LilyWangLL --- ports/isal/portfile.cmake | 4 ++++ ports/isal/vcpkg.json | 3 ++- ports/spdk-isal/portfile.cmake | 3 +++ ports/spdk-isal/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 6 +++--- versions/i-/isal.json | 5 +++++ versions/s-/spdk-isal.json | 5 +++++ 8 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ports/isal/portfile.cmake b/ports/isal/portfile.cmake index 833338019979b1..1b786f6c938a46 100644 --- a/ports/isal/portfile.cmake +++ b/ports/isal/portfile.cmake @@ -1,3 +1,7 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/spdk-isal/copyright") + message(FATAL_ERROR "'${PORT}' conflicts with 'spdk-isal'. Please remove spdk-isal:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO 01org/isa-l diff --git a/ports/isal/vcpkg.json b/ports/isal/vcpkg.json index be4dfa9fe555a0..24e322b5f6211e 100644 --- a/ports/isal/vcpkg.json +++ b/ports/isal/vcpkg.json @@ -1,8 +1,9 @@ { "name": "isal", "version": "2.25.0", - "port-version": 2, + "port-version": 3, "description": "Intel(R) Intelligent Storage Acceleration Library", + "homepage": "https://github.com/intel/isa-l", "license": "BSD-3-Clause", "supports": "!(x86 | arm | uwp | osx)" } diff --git a/ports/spdk-isal/portfile.cmake b/ports/spdk-isal/portfile.cmake index 3a09af620ec7a4..1fae5d89832074 100644 --- a/ports/spdk-isal/portfile.cmake +++ b/ports/spdk-isal/portfile.cmake @@ -1,3 +1,6 @@ +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/isal/copyright") + message(FATAL_ERROR "'${PORT}' conflicts with 'isal'. Please remove isal:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/spdk-isal/vcpkg.json b/ports/spdk-isal/vcpkg.json index d2caf2dfca6c84..b1e6045d4191af 100644 --- a/ports/spdk-isal/vcpkg.json +++ b/ports/spdk-isal/vcpkg.json @@ -1,8 +1,9 @@ { "name": "spdk-isal", - "version-string": "20181006", - "port-version": 2, + "version-date": "2018-10-06", + "port-version": 3, "description": "SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library", + "homepage": "https://github.com/spdk/isa-l", "license": "BSD-3-Clause", "supports": "!windows & !(osx & x64)" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f8ecb4920b7608..0a3d4afe3ffddb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -369,6 +369,8 @@ intel-mkl:x86-windows=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail irrlicht:x64-uwp=fail +# Conflict with spdk-isal +isal:x64-linux=skip jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail jemalloc:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5760a5fdc5bc51..b062c23249da08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3034,7 +3034,7 @@ }, "isal": { "baseline": "2.25.0", - "port-version": 2 + "port-version": 3 }, "ismrmrd": { "baseline": "1.5.0", @@ -6749,8 +6749,8 @@ "port-version": 1 }, "spdk-isal": { - "baseline": "20181006", - "port-version": 2 + "baseline": "2018-10-06", + "port-version": 3 }, "spdlog": { "baseline": "1.10.0", diff --git a/versions/i-/isal.json b/versions/i-/isal.json index 3320325025e5c2..f6337b0b97af0e 100644 --- a/versions/i-/isal.json +++ b/versions/i-/isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fa8499c557c19920d80318d9a1999922cd28663", + "version": "2.25.0", + "port-version": 3 + }, { "git-tree": "121b0c9241ea1f704bf6cb9ad5f010f6ae732dd0", "version": "2.25.0", diff --git a/versions/s-/spdk-isal.json b/versions/s-/spdk-isal.json index 7439aac291e95c..585b96374f052b 100644 --- a/versions/s-/spdk-isal.json +++ b/versions/s-/spdk-isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41bee637d2dbd80179b39bb1c5b84ec1afce7304", + "version-date": "2018-10-06", + "port-version": 3 + }, { "git-tree": "de270891534b1e4332e4cfbd67437653a9217823", "version-string": "20181006", From 7f49d67ef8e43bf95c3a14403126c5aaa9e054b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 11 Jul 2022 23:24:23 +0000 Subject: [PATCH 087/791] [vcpkg baseline][yasm/vcpkg-tool-ninja] Fix build (#25678) * [yasm/vcpkg-tool-ninja] Fix build * version --- ports/vcpkg-tool-ninja/portfile.cmake | 4 +++- ports/vcpkg-tool-ninja/use-internal-re2c.patch | 13 +++++++++++++ ports/vcpkg-tool-ninja/vcpkg.json | 1 + ports/yasm/portfile.cmake | 1 + ports/yasm/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/v-/vcpkg-tool-ninja.json | 5 +++++ versions/y-/yasm.json | 5 +++++ 8 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 ports/vcpkg-tool-ninja/use-internal-re2c.patch diff --git a/ports/vcpkg-tool-ninja/portfile.cmake b/ports/vcpkg-tool-ninja/portfile.cmake index 8cb941b47b4282..eb4ef16dfbd260 100644 --- a/ports/vcpkg-tool-ninja/portfile.cmake +++ b/ports/vcpkg-tool-ninja/portfile.cmake @@ -13,7 +13,9 @@ vcpkg_from_github( REF 170c387a7461d476523ae29c115a58f16e4d3430 SHA512 75c0f263ad325d14c99c9a1d85e571832407b481271a2733e78183a478f7ecd22d84451fc8d7ce16ab20d641ce040761d7ab266695d66bbac5b2b9a3a29aa521 HEAD_REF master - PATCHES "${LONG_PATH_PATCH}" # Long path support windows + PATCHES + "${LONG_PATH_PATCH}" # Long path support windows + use-internal-re2c.patch ) set(VCPKG_BUILD_TYPE release) #we only need release here! vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") diff --git a/ports/vcpkg-tool-ninja/use-internal-re2c.patch b/ports/vcpkg-tool-ninja/use-internal-re2c.patch new file mode 100644 index 00000000000000..0b83263213b45b --- /dev/null +++ b/ports/vcpkg-tool-ninja/use-internal-re2c.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 42094d2..d4eda66 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,7 +43,7 @@ endif() + + # --- optional re2c + find_program(RE2C re2c) +-if(RE2C) ++if(0) + # the depfile parser and ninja lexers are generated using re2c. + function(re2c IN OUT) + add_custom_command(DEPENDS ${IN} OUTPUT ${OUT} diff --git a/ports/vcpkg-tool-ninja/vcpkg.json b/ports/vcpkg-tool-ninja/vcpkg.json index 434990e25f0353..e1eac612065882 100644 --- a/ports/vcpkg-tool-ninja/vcpkg.json +++ b/ports/vcpkg-tool-ninja/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vcpkg-tool-ninja", "version-date": "2022-03-31", + "port-version": 1, "description": "Ninja is a small build system with a focus on speed.", "homepage": "https://ninja-build.org/", "license": "Apache-2.0", diff --git a/ports/yasm/portfile.cmake b/ports/yasm/portfile.cmake index 4a69f7c24f188e..966a9f8f2b4f14 100644 --- a/ports/yasm/portfile.cmake +++ b/ports/yasm/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} ${HOST_TOOLS_OPTIONS} + "-DPYTHON_EXECUTABLE=${PYTHON3}" -DENABLE_NLS=OFF -DYASM_BUILD_TESTS=OFF ) diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json index 284d4f5cdf205c..b0bd9405894be6 100644 --- a/ports/yasm/vcpkg.json +++ b/ports/yasm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "yasm", "version": "1.3.0", - "port-version": 4, + "port-version": 5, "description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.", "homepage": "https://github.com/yasm/yasm", "license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index b062c23249da08..22fb454b32f050 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7454,7 +7454,7 @@ }, "vcpkg-tool-ninja": { "baseline": "2022-03-31", - "port-version": 0 + "port-version": 1 }, "vcpkg-tool-nodejs": { "baseline": "14.17.4", @@ -7762,7 +7762,7 @@ }, "yasm": { "baseline": "1.3.0", - "port-version": 4 + "port-version": 5 }, "yasm-tool": { "baseline": "2021-12-14", diff --git a/versions/v-/vcpkg-tool-ninja.json b/versions/v-/vcpkg-tool-ninja.json index 643a736c0a0e50..989abb5d8657c4 100644 --- a/versions/v-/vcpkg-tool-ninja.json +++ b/versions/v-/vcpkg-tool-ninja.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4dafd8bf3868653e8e4fa81340dfeaea288a43c", + "version-date": "2022-03-31", + "port-version": 1 + }, { "git-tree": "0d55ba6e9ede00479127566b8f39fce7034e1b05", "version-date": "2022-03-31", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index 3d6a299e3fc517..2611a7bf6b148d 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9ad958de17f5b7661720dc322cff96b2dff8355", + "version": "1.3.0", + "port-version": 5 + }, { "git-tree": "796bb1f691c8ef8b04eb6577e95ab04167470dac", "version": "1.3.0", From edf3441180126e4e84527585b63c6064097ca187 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 12 Jul 2022 02:25:36 +0300 Subject: [PATCH 088/791] [pcre] Fix x64-linux-dynamic build (#25671) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/pcre/portfile.cmake | 6 +++--- ports/pcre/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/pcre.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index 20347bcdef2895..f7b42765fc1f66 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -67,10 +67,10 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcre-config" "${CURRENT_PACKAGES_DIR}/debug/bin/pcre-config") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/pcre-config" "${CURRENT_PACKAGES_DIR}/debug/bin/pcre-config") endif() vcpkg_copy_pdbs() diff --git a/ports/pcre/vcpkg.json b/ports/pcre/vcpkg.json index ae2ee42494cb2b..576d1b239601b4 100644 --- a/ports/pcre/vcpkg.json +++ b/ports/pcre/vcpkg.json @@ -1,9 +1,10 @@ { "name": "pcre", "version": "8.45", - "port-version": 4, + "port-version": 5, "description": "Perl Compatible Regular Expressions", "homepage": "https://www.pcre.org/", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 22fb454b32f050..44fc2f2efa749b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5402,7 +5402,7 @@ }, "pcre": { "baseline": "8.45", - "port-version": 4 + "port-version": 5 }, "pcre2": { "baseline": "10.40", diff --git a/versions/p-/pcre.json b/versions/p-/pcre.json index 44f92166cef5f1..ce8dc8682df841 100644 --- a/versions/p-/pcre.json +++ b/versions/p-/pcre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c8089ce40f585844a2ae5b9c80ba095b172d53d", + "version": "8.45", + "port-version": 5 + }, { "git-tree": "50ec11ace2145fac2b0b01dae365a6764f716c6e", "version": "8.45", From 3c37f48862595546f5103671013a36150a1e2a62 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 12 Jul 2022 07:26:21 +0800 Subject: [PATCH 089/791] update to 37 (#25677) --- ports/ngspice/portfile.cmake | 6 +++--- ports/ngspice/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/ngspice.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake index ecf9cf9677bd52..105ab23f9c1ecd 100644 --- a/ports/ngspice/portfile.cmake +++ b/ports/ngspice/portfile.cmake @@ -6,9 +6,9 @@ set(VCPKG_CRT_LINKAGE static) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO ngspice/ng-spice-rework - REF 35 - FILENAME "ngspice-35.tar.gz" - SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b + REF 37 + FILENAME "ngspice-37.tar.gz" + SHA512 d49f7e78d3dd17ac8ea03d79dfbe8a9cf57c012395285cc0c0cf379e0c0c81f11cad68d5366dc2d2478959ed197e4d43380fbc15baf44f987f20ad00f1ee04ca PATCHES use-winbison-sharedspice.patch use-winbison-vngspice.patch diff --git a/ports/ngspice/vcpkg.json b/ports/ngspice/vcpkg.json index 11517e0c1ed7bb..62c2a443877b0a 100644 --- a/ports/ngspice/vcpkg.json +++ b/ports/ngspice/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ngspice", - "version": "35", - "port-version": 2, + "version": "37", "description": "Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE", "homepage": "http://ngspice.sourceforge.net/", "license": "CC-BY-SA-4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 44fc2f2efa749b..0841775be20557 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4893,8 +4893,8 @@ "port-version": 0 }, "ngspice": { - "baseline": "35", - "port-version": 2 + "baseline": "37", + "port-version": 0 }, "nifly": { "baseline": "1.0.0", diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json index 79a6d2a47756c7..cf170a13f43632 100644 --- a/versions/n-/ngspice.json +++ b/versions/n-/ngspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a20625f4656372060074ee98cf95ef002b16178", + "version": "37", + "port-version": 0 + }, { "git-tree": "ec514c4b9a568123369d7d081d004a2d92f6d592", "version": "35", From d769781d113bb1675fe4a1671f7f081f72afd722 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 12 Jul 2022 02:27:05 +0300 Subject: [PATCH 090/791] [qtbase] Fix x64-linux-dynamic build (#25672) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/qtbase/portfile.cmake | 2 +- ports/qtbase/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index a087c84636adcb..2b812f45d87db1 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -342,7 +342,7 @@ string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_ string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") file(WRITE "${qttoolchain}" "${toolchain_contents}") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script endif() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 176b32d8b36a95..d3b0abddaee516 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.3.1", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 0841775be20557..90019a7b2b832e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5934,7 +5934,7 @@ }, "qtbase": { "baseline": "6.3.1", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.3.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 018e1b36cf356c..e847c3a605d1b2 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53f9f138ffa51742c27c5e44606f86b6b70b2734", + "version": "6.3.1", + "port-version": 1 + }, { "git-tree": "436e3f3fbaac28eabd4199c4ac97407bb701e929", "version": "6.3.1", From 6b036f45451e17d412753dd1af72a02409601458 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 13 Jul 2022 01:48:00 +0800 Subject: [PATCH 091/791] [simdjson] Update to 2.2.0 (#25581) * [simdjson] Update to 2.0.0 * [simdjson] Bump version * [simdjson] Update to 2.2.0 * [simdjson] Overwrite version * [simdjson] Remove version 2.0.0 --- ports/simdjson/portfile.cmake | 4 ++-- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 4d110769472f03..6b33989f738985 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF v1.1.0 + REF 1075e8609c4afa253162d441437af929c29e31bb # v2.2.0 HEAD_REF master - SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723 + SHA512 c479a1a5f63686b3852a8407d3cb3f6ebf418dde40000c96bf973ebb2d31095ecd3e6a5353b8bdffd57f26179b6668d8ac39bfdb012d8b04ec6115cc39495b66 ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index f31850d16957a6..ef043d24381816 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-semver": "1.1.0", + "version-semver": "2.2.0", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 90019a7b2b832e..fe01f4aad45e69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6589,7 +6589,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "1.1.0", + "baseline": "2.2.0", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 85ee12e87c9955..de568761a40252 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bc3bd74a2cb0719ba123f23538e9e974f88c320", + "version-semver": "2.2.0", + "port-version": 0 + }, { "git-tree": "18a23d4f86c9f4d0db8feb5bb7eeb32ebcc3a3f2", "version-semver": "1.1.0", From 81b10ef999bfb3126671ce0a7994fe3f54fc4cd3 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 12 Jul 2022 10:49:24 -0700 Subject: [PATCH 092/791] [speex] update to 1.2.1 (#25726) * [speex] update to 1.2.1 * x-add-version Co-authored-by: LilyWangLL --- ports/speex/portfile.cmake | 8 ++++---- ports/speex/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/s-/speex.json | 5 +++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/speex/portfile.cmake b/ports/speex/portfile.cmake index b3c81875c3728e..b37fb9e1891ee2 100644 --- a/ports/speex/portfile.cmake +++ b/ports/speex/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiph/speex - REF Speex-1.2.0 - SHA512 612dfd67a9089f929b7f2a613ed3a1d2fda3d3ec0a4adafe27e2c1f4542de1870b42b8042f0dcb16d52e08313d686cc35b76940776419c775417f5bad18b448f + REF 5dceaaf3e23ee7fd17c80cb5f02a838fd6c18e01 #Speex-1.2.1 + SHA512 d03da906ec26ddcea2e1dc4157ac6dd056e1407381b0f37edd350552a02a7372e9108b4e39ae522f1b165be04b813ee11db0b47d17607e4dad18118b9041636b HEAD_REF master PATCHES ${PATCHES} ) @@ -15,7 +15,7 @@ if(VCPKG_TARGET_IS_WINDOWS) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) vcpkg_cmake_install() @@ -33,7 +33,7 @@ else() 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} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS --disable-binaries # no example programs (require libogg) ) diff --git a/ports/speex/vcpkg.json b/ports/speex/vcpkg.json index b5f4250c00bf22..3da263af821bc5 100644 --- a/ports/speex/vcpkg.json +++ b/ports/speex/vcpkg.json @@ -1,10 +1,9 @@ { "name": "speex", - "version": "1.2.0", - "port-version": 11, + "version": "1.2.1", "description": "Speex is an Open Source/Free Software patent-free audio compression format designed for speech.", "homepage": "https://github.com/xiph/speex", - "license": null, + "license": "LGPL-2.0-or-later", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index fe01f4aad45e69..87d191f0031de3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6761,8 +6761,8 @@ "port-version": 0 }, "speex": { - "baseline": "1.2.0", - "port-version": 11 + "baseline": "1.2.1", + "port-version": 0 }, "speexdsp": { "baseline": "1.2.0", diff --git a/versions/s-/speex.json b/versions/s-/speex.json index 87a027137f63fb..092587ccc1a502 100644 --- a/versions/s-/speex.json +++ b/versions/s-/speex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0520509fd60e20c5362959a7549dd29f7d04d54b", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "7cbe163c0a5fabd08cb6665c092d6b13dfa51d69", "version": "1.2.0", From d303fe640be5fafc7afa497b2da840757af289fe Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 13 Jul 2022 01:50:03 +0800 Subject: [PATCH 093/791] update to v1.2.1 (#25722) --- ports/speexdsp/CMakeLists.txt | 1 - ports/speexdsp/portfile.cmake | 8 ++++---- ports/speexdsp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/speexdsp.json | 5 +++++ 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/speexdsp/CMakeLists.txt b/ports/speexdsp/CMakeLists.txt index 6cfb6d8c71df3e..673dbda27ac4df 100644 --- a/ports/speexdsp/CMakeLists.txt +++ b/ports/speexdsp/CMakeLists.txt @@ -34,7 +34,6 @@ set(LIBSPEEXDSP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_neon.h" "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/resample_sse.h" "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/smallft.h" - "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/stack_alloc.h" "${CMAKE_CURRENT_LIST_DIR}/libspeexdsp/vorbis_psy.h" "${CMAKE_CURRENT_LIST_DIR}/include/speex/speex_buffer.h" ) diff --git a/ports/speexdsp/portfile.cmake b/ports/speexdsp/portfile.cmake index 0d983e4db525cc..55421684870aca 100644 --- a/ports/speexdsp/portfile.cmake +++ b/ports/speexdsp/portfile.cmake @@ -8,14 +8,14 @@ if(VCPKG_USE_HEAD_VERSION) else() # Since the github repo is out-dated, use official download URL for release builds to reduce traffic to the Gitlab host vcpkg_download_distfile(ARCHIVE - URLS "http://downloads.xiph.org/releases/speex/speexdsp-1.2.0.tar.gz" - FILENAME "speexdsp-1.2.0.tar.gz" - SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec + URLS "http://downloads.xiph.org/releases/speex/speexdsp-1.2.1.tar.gz" + FILENAME "speexdsp-1.2.1.tar.gz" + SHA512 41b5f37b48db5cb8c5a0f6437a4a8266d2627a5b7c1088de8549fe0bf0bb3105b7df8024fe207eef194096e0726ea73e2b53e0a4293d8db8e133baa0f8a3bad3 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF "1.2.0" + REF "1.2.1" PATCHES jitter_ctl.patch ) diff --git a/ports/speexdsp/vcpkg.json b/ports/speexdsp/vcpkg.json index c68add9f9e5f1b..19fac1b3385cdd 100644 --- a/ports/speexdsp/vcpkg.json +++ b/ports/speexdsp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "speexdsp", - "version": "1.2.0", - "port-version": 8, + "version": "1.2.1", "description": "A patent-free, Open Source/Free Software DSP library.", "homepage": "https://speex.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 87d191f0031de3..c342ec2ad5b52c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6765,8 +6765,8 @@ "port-version": 0 }, "speexdsp": { - "baseline": "1.2.0", - "port-version": 8 + "baseline": "1.2.1", + "port-version": 0 }, "spirit-po": { "baseline": "1.1.2", diff --git a/versions/s-/speexdsp.json b/versions/s-/speexdsp.json index c2ff79b687b9cf..a598b990f32080 100644 --- a/versions/s-/speexdsp.json +++ b/versions/s-/speexdsp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d3a05d75970beec385a36ceb592f9f9e928d62f", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "602238d14eef169fff22244c05d364c55177bdbc", "version": "1.2.0", From 1cf8af0b650ebe4c7a04544de0e4e534971a78b4 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 13 Jul 2022 02:06:15 +0800 Subject: [PATCH 094/791] fix stdalign.h not find issue (#25721) --- ports/air-ctl/portfile.cmake | 5 +++-- ports/air-ctl/vcpkg.json | 1 + versions/a-/air-ctl.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/air-ctl/portfile.cmake b/ports/air-ctl/portfile.cmake index 6aeff236a64c4b..78df4e36f99113 100644 --- a/ports/air-ctl/portfile.cmake +++ b/ports/air-ctl/portfile.cmake @@ -1,13 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO inie0722/CTL - REF v1.1.2 - SHA512 5669db0448359023cc55b0f9134084cda3aea716996d58ef7e8e63d3721c074af27f59a52c1976c72decea93630f64c463718344f34fdae3e5a832c9d876913a + REF fc9129720646b7e4e2bda9565aff8b2f447fbc2c #v1.1.2 + SHA512 23cd6d17997ab6bba8fba117fc0bd5a50fd4a37a2f2ce11164596b19fe3284536dbe19108ca27576842fdf808c40961c471c898844fe74580d3d6d1877833920 HEAD_REF master ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-DCTL_CACHE_LINE_SIZE=0" ) vcpkg_cmake_install() diff --git a/ports/air-ctl/vcpkg.json b/ports/air-ctl/vcpkg.json index ac463978200d2a..03a8eb766ce4da 100644 --- a/ports/air-ctl/vcpkg.json +++ b/ports/air-ctl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "air-ctl", "version": "1.1.2", + "port-version": 1, "description": "C template container library", "homepage": "https://github.com/inie0722/CTL", "license": "BSL-1.0", diff --git a/versions/a-/air-ctl.json b/versions/a-/air-ctl.json index beabaf3a563c01..ab32921e1aac10 100644 --- a/versions/a-/air-ctl.json +++ b/versions/a-/air-ctl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "334287af2a9a10d76ce270d72f4df58e5ddc7434", + "version": "1.1.2", + "port-version": 1 + }, { "git-tree": "7ba95e186d0f375425730cf877027e7e3b9961b1", "version": "1.1.2", diff --git a/versions/baseline.json b/versions/baseline.json index c342ec2ad5b52c..eb428c261a8e65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -38,7 +38,7 @@ }, "air-ctl": { "baseline": "1.1.2", - "port-version": 0 + "port-version": 1 }, "aixlog": { "baseline": "1.5.0", From 553c7dff3c1e9baaf308e6455b548514cb33d8f2 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 13 Jul 2022 02:06:44 +0800 Subject: [PATCH 095/791] update to 20211114 (#25719) --- ports/libpff/portfile.cmake | 6 +++--- ports/libpff/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libpff.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libpff/portfile.cmake b/ports/libpff/portfile.cmake index 00be14f6675b7e..04e25f71f530d9 100644 --- a/ports/libpff/portfile.cmake +++ b/ports/libpff/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -set(LIB_VERSION 20180714) -set(LIB_FILENAME libpff-experimental-${LIB_VERSION}.tar.gz) +set(LIB_VERSION 20211114) +set(LIB_FILENAME libpff-alpha-${LIB_VERSION}.tar.gz) # Release distribution file contains configured sources, while the source code in the repository does not. vcpkg_download_distfile(ARCHIVE URLS "https://github.com/libyal/libpff/releases/download/${LIB_VERSION}/${LIB_FILENAME}" FILENAME "${LIB_FILENAME}" - SHA512 7207ba87607ea2fd4609a081c2f4b061344a783e188605e88df99fd473f2a8da1269b065e57b054f4622888d40aa8f2b8272dc4748334ddfe358b28d443d6ad1 + SHA512 ad2cf4b0841c448b60738cd2f340868c0f11eb34167bfe5b093645a2a080d694e199afe4fef5eeea1016487820132be33f8e51910d2142ff032320ad2dbeb59d ) vcpkg_extract_source_archive_ex( diff --git a/ports/libpff/vcpkg.json b/ports/libpff/vcpkg.json index b8eaba407ed2ac..079e4fa826e0bc 100644 --- a/ports/libpff/vcpkg.json +++ b/ports/libpff/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpff", - "version-date": "2018-07-14", - "port-version": 3, + "version-date": "2021-11-14", "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", "homepage": "https://github.com/libyal/libpff", "license": "LGPL-3.0", diff --git a/versions/baseline.json b/versions/baseline.json index eb428c261a8e65..26f3ea2c4ea2fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3929,8 +3929,8 @@ "port-version": 1 }, "libpff": { - "baseline": "2018-07-14", - "port-version": 3 + "baseline": "2021-11-14", + "port-version": 0 }, "libplist": { "baseline": "1.3.6", diff --git a/versions/l-/libpff.json b/versions/l-/libpff.json index 7d305a1681c936..3b6c8eb07bdc67 100644 --- a/versions/l-/libpff.json +++ b/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a47e314b091400914616ff8c5e017110f2493018", + "version-date": "2021-11-14", + "port-version": 0 + }, { "git-tree": "24cc99a6c6ead368c4711dc67e8e7a7ae4444f09", "version-date": "2018-07-14", From c50743e812eba8467f6e8201538642244961aae5 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Wed, 13 Jul 2022 02:07:23 +0800 Subject: [PATCH 096/791] [gtk] fix cross build (#25718) * [gtk] Fix package failure for cross-compiling. * update port version database Co-authored-by: Jamlys Lee --- ports/gtk/portfile.cmake | 4 ++-- ports/gtk/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/g-/gtk.json | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/gtk/portfile.cmake b/ports/gtk/portfile.cmake index 5c89135dd262f9..416aad27429d77 100644 --- a/ports/gtk/portfile.cmake +++ b/ports/gtk/portfile.cmake @@ -60,13 +60,13 @@ vcpkg_configure_meson( glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' - sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_HOST_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' - sassc='${CURRENT_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' + sassc='${CURRENT_HOST_INSTALLED_DIR}/tools/sassc/bin/sassc${VCPKG_HOST_EXECUTABLE_SUFFIX}' ) vcpkg_install_meson() diff --git a/ports/gtk/vcpkg.json b/ports/gtk/vcpkg.json index ebe52a36119cfd..214a524c60d712 100644 --- a/ports/gtk/vcpkg.json +++ b/ports/gtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtk", "version": "4.6.2", - "port-version": 1, + "port-version": 2, "description": "Portable library for creating graphical user interfaces.", "homepage": "https://www.gtk.org/", "license": "LGPL-2.0-only", @@ -40,7 +40,10 @@ "graphene", "libepoxy", "pango", - "sassc", + { + "name": "sassc", + "host": true + }, { "name": "vcpkg-tool-meson", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 26f3ea2c4ea2fe..4bcbe8f61b1a36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2718,7 +2718,7 @@ }, "gtk": { "baseline": "4.6.2", - "port-version": 1 + "port-version": 2 }, "gtkmm": { "baseline": "4.6.0", diff --git a/versions/g-/gtk.json b/versions/g-/gtk.json index a9c7976cc89f80..4a1434fefb4654 100644 --- a/versions/g-/gtk.json +++ b/versions/g-/gtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c2e407dc3ecdc258c2f9c0243467c2e87c3529f", + "version": "4.6.2", + "port-version": 2 + }, { "git-tree": "d2d59edf9986797558b8abafbff9c913bf4f02ca", "version": "4.6.2", From d9ac3c2e5016b125f905f0cf894fc7b5aadc29d0 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 13 Jul 2022 02:07:46 +0800 Subject: [PATCH 097/791] [WinReg] update to v6.0.0 (#25715) * [WinReg] update to v6.0.0 * update version --- ports/winreg/portfile.cmake | 6 ++++-- ports/winreg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/winreg.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index cc664546668258..1dfa1a21464018 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -1,8 +1,10 @@ +# WinReg - Header-only library + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF aaa7434663f1f8017284812501812ac3c74612c0 #v5.1.1 - SHA512 1c35513bb387a30452c9fcb1fb9cd32be68a8fa625cff1301490d6e89430e3b6f08e54f41ae0261540900923d2f39f3b2ed32bf54869d643aa5020ff1ca6c1c7 + REF 86d7ae5c5034aa88b40914fc0d209d8ceb214afe #v6.0.0 + SHA512 ca2daa61e89029641e189fe2a0177282900e30b8907702abd8010cc6c66cfe4cfaf15888c5860d7aec262209939fc7658da450e308be0f73b5b0423f4bb5bdf2 HEAD_REF master ) diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index a9de4e85c9e043..48fe1fe0cef84d 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "winreg", - "version": "5.1.1", + "version": "6.0.0", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4bcbe8f61b1a36..8fbc2b1aa21c05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7585,7 +7585,7 @@ "port-version": 0 }, "winreg": { - "baseline": "5.1.1", + "baseline": "6.0.0", "port-version": 0 }, "winsock2": { diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index 11f3b0e8cb9b45..8deef9bcf0734d 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6faf66fd8bb6b7d12b74e2084cbf15f8628b531", + "version": "6.0.0", + "port-version": 0 + }, { "git-tree": "ec4168b0b4ceaece6ee9d24b5bcc8c4ed8897db7", "version": "5.1.1", From 6d087e76ef3939a413f8a2ccb828b7d1f53c9445 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 13 Jul 2022 02:08:08 +0800 Subject: [PATCH 098/791] [unrar] update to 6.1.7 (#25714) * [unrar] update to 6.1.7 * update version --- ports/unrar/portfile.cmake | 4 ++-- ports/unrar/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/u-/unrar.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake index a7041a813b81fe..51d8f57b3bd3fe 100644 --- a/ports/unrar/portfile.cmake +++ b/ports/unrar/portfile.cmake @@ -1,5 +1,5 @@ -set(UNRAR_VERSION "5.8.1") -set(UNRAR_SHA512 31303df575e8a5ed9fc03e20d0482306536c3496894a39788052c5c9dfde61eb7f5ca29b8c48354581622a020aa446f108af956ab43024a48731a12233155612) +set(UNRAR_VERSION "6.1.7") +set(UNRAR_SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846) set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz) set(UNRAR_URL https://www.rarlab.com/rar/${UNRAR_FILENAME}) diff --git a/ports/unrar/vcpkg.json b/ports/unrar/vcpkg.json index 579dc62ea73862..64854fc52d5330 100644 --- a/ports/unrar/vcpkg.json +++ b/ports/unrar/vcpkg.json @@ -1,7 +1,6 @@ { "name": "unrar", - "version": "5.8.1", - "port-version": 3, + "version": "6.1.7", "description": "rarlab's unrar library", "homepage": "https://www.rarlab.com", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 8fbc2b1aa21c05..c4bbbb4f7be465 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7293,8 +7293,8 @@ "port-version": 0 }, "unrar": { - "baseline": "5.8.1", - "port-version": 3 + "baseline": "6.1.7", + "port-version": 0 }, "upb": { "baseline": "2021-10-19", diff --git a/versions/u-/unrar.json b/versions/u-/unrar.json index 0aa96d38a76da7..b617014a815f0e 100644 --- a/versions/u-/unrar.json +++ b/versions/u-/unrar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0181c013ed7f278c6e62725516dbb65b103fa7d7", + "version": "6.1.7", + "port-version": 0 + }, { "git-tree": "d2ade299ed837817b3d02522f990af3a64cb938b", "version": "5.8.1", From 4e7bcf7a997cf26e71795dc7129837d8017bcdf5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Jul 2022 20:08:50 +0200 Subject: [PATCH 099/791] [python3] Fix wrapper, mark mingw unsupported (#25699) * Fix python3 wrapper * python3 is unsupported on mingw * Update versions --- ports/python3/vcpkg-cmake-wrapper.cmake | 6 ++++++ ports/python3/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/python3/vcpkg-cmake-wrapper.cmake b/ports/python3/vcpkg-cmake-wrapper.cmake index 83c3fbd1cfec33..1e13659b287df7 100644 --- a/ports/python3/vcpkg-cmake-wrapper.cmake +++ b/ports/python3/vcpkg-cmake-wrapper.cmake @@ -89,6 +89,9 @@ if(_PythonFinder_WantLibs) find_dependency(Intl) if(TARGET @PythonFinder_PREFIX@::Python) get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Python INTERFACE_LINK_LIBRARIES) + if(NOT _PYTHON_INTERFACE_LIBS) + set(_PYTHON_INTERFACE_LIBS "") + endif() list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") list(APPEND _PYTHON_INTERFACE_LIBS Iconv::Iconv @@ -99,6 +102,9 @@ if(_PythonFinder_WantLibs) endif() if(TARGET @PythonFinder_PREFIX@::Module) get_target_property(_PYTHON_INTERFACE_LIBS @PythonFinder_PREFIX@::Module INTERFACE_LINK_LIBRARIES) + if(NOT _PYTHON_INTERFACE_LIBS) + set(_PYTHON_INTERFACE_LIBS "") + endif() list(REMOVE_ITEM _PYTHON_INTERFACE_LIBS "-liconv" "-lintl") list(APPEND _PYTHON_INTERFACE_LIBS Iconv::Iconv diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 61714a805f4476..8920a24fd93089 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,10 +1,11 @@ { "name": "python3", "version": "3.10.5", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", - "supports": "!uwp", + "supports": "!uwp & !mingw", "dependencies": [ { "name": "bzip2", diff --git a/versions/baseline.json b/versions/baseline.json index c4bbbb4f7be465..6650d4a46a5e43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5706,7 +5706,7 @@ }, "python3": { "baseline": "3.10.5", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 006ac77139aafe..6241a4eccb99e8 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c345c4a8ad91847522188517c68e8f83637f4440", + "version": "3.10.5", + "port-version": 1 + }, { "git-tree": "d7c43b7217707bb35a86859d9285496fc2bce8e2", "version": "3.10.5", From abb575484e0d26ff0f49401871b319d91ec6dd64 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 13 Jul 2022 02:09:23 +0800 Subject: [PATCH 100/791] [freerdp] update to 2.7 (#25688) * [freerdp] update to 2.7 * update evrsion --- ports/freerdp/fix-include-path.patch | 12 ++++++------ ports/freerdp/portfile.cmake | 4 ++-- ports/freerdp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/freerdp.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/freerdp/fix-include-path.patch b/ports/freerdp/fix-include-path.patch index dc65230806b4cc..f426813a02ae7c 100644 --- a/ports/freerdp/fix-include-path.patch +++ b/ports/freerdp/fix-include-path.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 97ba2f9..64a2f33 100644 +index 54df8cf..5232d46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -107,7 +107,7 @@ else() - endif() - message("FREERDP_VERSION=${FREERDP_VERSION_FULL}") +@@ -129,7 +129,7 @@ endif() + + message(STATUS "Git Revision ${GIT_REVISION}") -set(FREERDP_INCLUDE_DIR "include/freerdp${FREERDP_VERSION_MAJOR}/") +set(FREERDP_INCLUDE_DIR "include/") @@ -25,10 +25,10 @@ index a020dc5..0bc1157 100644 file(GLOB FREERDP_HEADERS "freerdp/*.h") install(FILES ${FREERDP_HEADERS} DESTINATION ${FREERDP_INSTALL_INCLUDE_DIR} COMPONENT headers) diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt -index a94090a..08b6b88 100644 +index d8a40da..73ffba4 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt -@@ -215,7 +215,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") +@@ -221,7 +221,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.10") SetFreeRDPCMakeInstallDir(WINPR_CMAKE_INSTALL_DIR "WinPR${WINPR_VERSION_MAJOR}") diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index f9ec5abfa0a138..ac36220adbae39 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP - REF 2.5.0 - SHA512 7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c + REF 40ee5d3bcc70343af6c0300d71968858c1f1948f #v2.7.0 + SHA512 b18fa4830a6b4367e28e92fe91b9ae925d5d4fd517b2f6f8655eae7306f181b98e9e611c0cde576f642987c12af6eb862952179f5d7b60019cd7b024fd2db142 HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index ef18342f946de9..1fd40a6f51b617 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "freerdp", - "version": "2.5.0", + "version": "2.7.0", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6650d4a46a5e43..32d203dd7d08ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2369,7 +2369,7 @@ "port-version": 5 }, "freerdp": { - "baseline": "2.5.0", + "baseline": "2.7.0", "port-version": 0 }, "freetds": { diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 9864e5a11e78f9..7df8ae33f0bc93 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "585cf904d3a8fe43723d72d8c20175a780e17a64", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "8f786583b737855616d84a5177491deaf7d367a0", "version": "2.5.0", From 204949bc59ab375c27c953c7a4354faebe9165b8 Mon Sep 17 00:00:00 2001 From: JoergAtGithub <64457745+JoergAtGithub@users.noreply.github.com> Date: Tue, 12 Jul 2022 20:12:55 +0200 Subject: [PATCH 101/791] [ableton] Fixed ASIO vs. ASIOSDK confusion (#25626) * Fixed ASIO vs. ASIOSDK confusion * Renamed variable in portfile, to enable build with Steinberg ASIO audio driver SDK --- ports/ableton/portfile.cmake | 13 +++++ ...ce_asiosdk_download_by_vcpkg_asiosdk.patch | 48 +++++++++++++++++++ ...e_local_asiostandalone_by_vcpkg_asio.patch | 18 ++++--- ports/ableton/vcpkg.json | 14 ++++-- versions/a-/ableton.json | 5 ++ versions/baseline.json | 2 +- 6 files changed, 84 insertions(+), 16 deletions(-) create mode 100644 ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch diff --git a/ports/ableton/portfile.cmake b/ports/ableton/portfile.cmake index fceab0f281794a..08f7292fa89789 100644 --- a/ports/ableton/portfile.cmake +++ b/ports/ableton/portfile.cmake @@ -9,8 +9,12 @@ vcpkg_from_github( HEAD_REF master PATCHES replace_local_asiostandalone_by_vcpkg_asio.patch + replace_asiosdk_download_by_vcpkg_asiosdk.patch replace_local_catch_by_vcpkg_catch2.patch ) +# Note that the dependencies ASIO and ASIOSDK are completely different things: +# -ASIO (ASyncronous IO) is a cross-platform C++ library for network and low-level I/O programming +# -ASIOSDK is the SDK for the Steinberg ASIO (Audio Stream Input/Output) driver, for profesional Windows audio applications vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -31,11 +35,20 @@ endif() if ("discoverytest" IN_LIST FEATURES) set(NEED_CATCH2 ON) endif() + +set(NEED_ASIOSDK OFF) +if ("hut" IN_LIST FEATURES) + if(WIN32) + # Need Steinberg ASIO audio driver SDK (only this low-latency audio driver makes the developer tool 'hut' useful on Windows) + set(NEED_ASIOSDK ON) + endif() +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNEED_CATCH2=${NEED_CATCH2} + -DLINK_BUILD_ASIO=${NEED_ASIOSDK} ) if ("coretest" IN_LIST FEATURES) diff --git a/ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch b/ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch new file mode 100644 index 00000000000000..c82b9f2e7b0601 --- /dev/null +++ b/ports/ableton/replace_asiosdk_download_by_vcpkg_asiosdk.patch @@ -0,0 +1,48 @@ +diff --git "a/examples/CMakeLists.txt" "b/examples/CMakeLists.txt" + +--- "a/examples/CMakeLists.txt" ++++ "b/examples/CMakeLists.txt" +@@ -9,28 +9,22 @@ project(LinkExamples) + # + + if(WIN32) +- function(configure_asio asio_sdk_path_OUT) +- # ASIO-related path/file variables +- set(asio_download_root "https:/download.steinberg.net/sdk_downloads") +- set(asio_file_name "asiosdk_2.3.3_2019-06-14.zip") +- set(asio_dir_name "asiosdk_2.3.3_2019-06-14") +- set(asio_working_dir "${CMAKE_BINARY_DIR}/modules") +- set(asio_output_path "${asio_working_dir}/${asio_file_name}") +- +- message(STATUS "Downloading ASIO SDK") +- file(DOWNLOAD "${asio_download_root}/${asio_file_name}" ${asio_output_path}) +- file(SHA1 ${asio_output_path} asio_zip_hash) +- message(" ASIO SDK SHA1: ${asio_zip_hash}") +- +- message(" Extracting ASIO SDK") +- execute_process(COMMAND ${CMAKE_COMMAND} -E tar "xf" ${asio_output_path} --format=zip +- WORKING_DIRECTORY ${asio_working_dir} +- INPUT_FILE ${asio_output_path} +- ) ++ if(LINK_BUILD_ASIO) ++ function(configure_asio asio_sdk_path_OUT) ++ # ASIO-related path/file variables ++ find_package(ASIOSDK) ++ if(NOT ASIOSDK_FOUND) ++ message(FATAL_ERROR "Steinberg ASIO audio driver SDK not found") ++ else() ++ message(STATUS "Steinberg ASIO audio driver SDK root dir: ${ASIOSDK_ROOT_DIR}") ++ endif() ++ set(asio_working_dir "${ASIOSDK_ROOT_DIR}") ++ set(asio_output_path "${CMAKE_BINARY_DIR}/modules/asiosdk") + +- # Set the ASIO SDK path for the caller +- set(${asio_sdk_path_OUT} "${asio_working_dir}/${asio_dir_name}" PARENT_SCOPE) +- endfunction() ++ # Set the ASIO SDK path for the caller ++ set(${asio_sdk_path_OUT} "${asio_working_dir}" PARENT_SCOPE) ++ endfunction() ++ endif() + endif() + + # _ _ _ diff --git a/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch b/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch index a6b437f8e05aa4..d9f1e0f48fadc8 100644 --- a/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch +++ b/ports/ableton/replace_local_asiostandalone_by_vcpkg_asio.patch @@ -2,20 +2,18 @@ diff a/cmake_include/AsioStandaloneConfig.cmake b/AsioStandaloneConfig.cmake --- a/cmake_include/AsioStandaloneConfig.cmake +++ b/cmake_include/AsioStandaloneConfig.cmake -@@ -1,6 +1,12 @@ +@@ -1,6 +1,10 @@ add_library(AsioStandalone::AsioStandalone IMPORTED INTERFACE) -+if (LINK_BUILD_ASIO MATCHES "ON") -set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY - INTERFACE_INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_LIST_DIR}/../modules/asio-standalone/asio/include -) -+ find_package(asio REQUIRED) -+ if(asio_FOUND) -+ message(STATUS "Dependency asio found in ${asio_DIR}") -+ set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY -+ INTERFACE_INCLUDE_DIRECTORIES -+ ${asio_DIR}/../../include -+ ) -+ endif() ++find_package(asio REQUIRED) ++if(asio_FOUND) ++ message(STATUS "Dependency asio found in ${asio_DIR}") ++ set_property(TARGET AsioStandalone::AsioStandalone APPEND PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES ++ ${asio_DIR}/../../include ++ ) +endif() diff --git a/ports/ableton/vcpkg.json b/ports/ableton/vcpkg.json index a6c9b008f37698..fb16d982818cf2 100644 --- a/ports/ableton/vcpkg.json +++ b/ports/ableton/vcpkg.json @@ -1,15 +1,13 @@ { "name": "ableton", "version": "3.0.5", + "port-version": 1, "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.", "homepage": "https://www.ableton.com/en/link/", "documentation": "http://ableton.github.io/link/", "license": "GPL-2.0-or-later", "dependencies": [ - { - "name": "asio", - "platform": "windows" - }, + "asio", { "name": "vcpkg-cmake", "host": true @@ -33,7 +31,13 @@ ] }, "hut": { - "description": "Build LinkHut command line tool" + "description": "Build LinkHut command line tool", + "dependencies": [ + { + "name": "asiosdk", + "platform": "windows" + } + ] }, "hutsilent": { "description": "Build LinkHutSilent command line tool" diff --git a/versions/a-/ableton.json b/versions/a-/ableton.json index bf104b16024fc5..1812776ca0e261 100644 --- a/versions/a-/ableton.json +++ b/versions/a-/ableton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70d81e7e966f983af654d779a02817d89eacea3b", + "version": "3.0.5", + "port-version": 1 + }, { "git-tree": "bac28c4912d6fd4e32ad716ec8bf4e197c9a4cb8", "version": "3.0.5", diff --git a/versions/baseline.json b/versions/baseline.json index 32d203dd7d08ae..ed54aa0213db2c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10,7 +10,7 @@ }, "ableton": { "baseline": "3.0.5", - "port-version": 0 + "port-version": 1 }, "abseil": { "baseline": "20211102.1", From 611804964272028b346369caac76dd35a5e084cb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 12 Jul 2022 23:07:02 +0200 Subject: [PATCH 102/791] [vcpkg baseline][opencensus-cpp] Set cxx standard to 14 for compatibility with abseil (#25735) * {vcpkg baseline] Set cxx standard to 14 for compatibility with abseil * Remove from CI baseline * version * license * version --- ports/opencensus-cpp/fix-install.patch | 13 +++++++++++++ ports/opencensus-cpp/portfile.cmake | 6 +++--- ports/opencensus-cpp/vcpkg.json | 6 ++---- scripts/ci.baseline.txt | 6 ------ versions/baseline.json | 2 +- versions/o-/opencensus-cpp.json | 5 +++++ 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ports/opencensus-cpp/fix-install.patch b/ports/opencensus-cpp/fix-install.patch index a8c76248a3baea..1a49c3be2e54c4 100644 --- a/ports/opencensus-cpp/fix-install.patch +++ b/ports/opencensus-cpp/fix-install.patch @@ -1,3 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ecec53..07162ed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,7 @@ project( + option(FUZZER "Either OFF or e.g. -fsanitize=fuzzer,address" OFF) + + if(NOT CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 11) ++ set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + endif() + diff --git a/cmake/OpenCensusHelpers.cmake b/cmake/OpenCensusHelpers.cmake index 8fdfe96..53bc877 100644 --- a/cmake/OpenCensusHelpers.cmake diff --git a/ports/opencensus-cpp/portfile.cmake b/ports/opencensus-cpp/portfile.cmake index c914bc38dc49be..8eb170f180d4b5 100644 --- a/ports/opencensus-cpp/portfile.cmake +++ b/ports/opencensus-cpp/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) @@ -21,6 +21,6 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencensus-cpp/vcpkg.json b/ports/opencensus-cpp/vcpkg.json index 4481e60fd801b3..c990ad46f3158d 100644 --- a/ports/opencensus-cpp/vcpkg.json +++ b/ports/opencensus-cpp/vcpkg.json @@ -1,18 +1,16 @@ { "name": "opencensus-cpp", "version-date": "2021-08-26", + "port-version": 1, "description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.", "homepage": "https://github.com/census-instrumentation/opencensus-cpp", + "license": "Apache-2.0", "supports": "!windows", "dependencies": [ "abseil", { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ], "features": { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0a3d4afe3ffddb..fd259f5666df63 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -758,12 +758,6 @@ opencc:arm64-windows=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. opencc:arm-uwp=fail opencc:x64-uwp=fail -opencensus-cpp:arm64-windows=fail -opencensus-cpp:x64-windows=fail -opencensus-cpp:x64-windows-static=fail -opencensus-cpp:x64-windows-static-md=fail -opencensus-cpp:x86-windows=fail -opencensus-cpp:x64-uwp=fail opencl:arm-uwp=fail opencl:x64-uwp=fail opencsg:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index ed54aa0213db2c..996472f6500f16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5130,7 +5130,7 @@ }, "opencensus-cpp": { "baseline": "2021-08-26", - "port-version": 0 + "port-version": 1 }, "opencl": { "baseline": "2.2", diff --git a/versions/o-/opencensus-cpp.json b/versions/o-/opencensus-cpp.json index 4b2735ff7d674a..a73bffd886f8a1 100644 --- a/versions/o-/opencensus-cpp.json +++ b/versions/o-/opencensus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "043d8a451b507daa585a8a716cf297421912d3d4", + "version-date": "2021-08-26", + "port-version": 1 + }, { "git-tree": "1e0e908de8a31c22d295c1ad069e87ab2eb964b7", "version-date": "2021-08-26", From c69f2b9098776a9afa67cc13d288dea51fc6e33e Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 13 Jul 2022 18:41:52 +0200 Subject: [PATCH 103/791] [vcpkg] Add `vcpkg_install_copyright()` portfile function (#25239) * [vcpkg tool] Add vcpkg_install_copyright * Make sure FILE_LIST is provided * relative to ${SOURCE_PATH} * Add documentation * Add to table of contents * Relative paths was a bad idea. * Tell users to use the correct way Co-authored-by: Billy O'Neal * Fix docs * Add parameter COMMENT * Rename to vcpkg_concat_copyright * Fix escape * Revert "Fix escape" This reverts commit 53f1636705396fe5e606bf67ef72e39edc35140f. * Revert "Rename to vcpkg_concat_copyright" This reverts commit 6ce9152a618b37e5a914248f6ca6c8b7b54ef3e3. * Fix escape * Add support for single copyright file * Update docs * Make comment less confusing * [ci skip] Billy CR * [ci skip] Format * Remove explicit checks for STREQUAL "" * Add error msg if file doesn't exist Co-authored-by: Billy O'Neal --- docs/maintainers/maintainer-guide.md | 14 +++++ docs/maintainers/portfile-functions.md | 1 + docs/maintainers/vcpkg_install_copyright.md | 69 +++++++++++++++++++++ scripts/cmake/vcpkg_install_copyright.cmake | 42 +++++++++++++ scripts/ports.cmake | 1 + scripts/templates/portfile.in.cmake | 5 +- 6 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 docs/maintainers/vcpkg_install_copyright.md create mode 100644 scripts/cmake/vcpkg_install_copyright.cmake diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index b2962ea2fb63bd..5aed050e24e6e9 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -109,6 +109,20 @@ This means that the user should see: Examples: * [`brotli`](https://github.com/microsoft/vcpkg/blob/4f0a640e4c5b74166b759a862d7527c930eff32e/ports/brotli/install.patch) creates the `unofficial-brotli` package, producing target `unofficial::brotli::brotli`. +### Install copyright file + +Each port has to provide a file named `copyright` in the folder `${CURRENT_PACKAGES_DIR}/share/${PORT}`. + +Many ports are using this code to install a copyright file: + +```cmake +file(INSTALL "${SOURCE_PATH}LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +``` + +This is discouraged in favour of [`vcpkg_install_copyright()`](vcpkg_install_copyright.md). New ports should use `vcpkg_install_copyright()` instead. However, it is still valid for existing ports to use something like the code above. You may replace this with `vcpkg_install_copyright` but you don't have to. + +`vcpkg_install_copyright` also includes the functionallity to handle multiple copyright files. See its [documentation](vcpkg_install_copyright.md) for more info. + ## Features ### Do not use features to implement alternatives diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 22e1d6d03e4431..ec6fb536c98a45 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -48,6 +48,7 @@ - [vcpkg\_host\_path\_list](vcpkg_host_path_list.md) - [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md)) - [vcpkg\_install\_gn](vcpkg_install_gn.md) (deprecated, use [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md)) +- [vcpkg\_install\_copyright](vcpkg_install_copyright.md) - [vcpkg\_install\_make](vcpkg_install_make.md) - [vcpkg\_install\_meson](vcpkg_install_meson.md) - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) diff --git a/docs/maintainers/vcpkg_install_copyright.md b/docs/maintainers/vcpkg_install_copyright.md new file mode 100644 index 00000000000000..a7679766c611c8 --- /dev/null +++ b/docs/maintainers/vcpkg_install_copyright.md @@ -0,0 +1,69 @@ +# vcpkg_install_copyright + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_copyright.md). + +Merges multiple copyright files into a single file and install it. +Installs a single copyright file. + +## Usage + +```cmake +vcpkg_install_copyright(FILE_LIST ... [COMMENT]) +``` + +## Parameters + +### FILE_LIST +Specifies a list of license files with absolute paths. You must provide at least one file. + +### COMMENT +This optional parameter adds a comment before at the top of the file. + +## Notes + +This function creates a file called `copyright` inside `${CURRENT_PACKAGES_DIR}/share/${PORT}` + +If more than one file is provided, this function concatenates the contents of multiple copyright files to a single file. + +The resulting `copyright` file looks similar to this: + +``` +LICENSE-LGPL2.txt: + +Lorem ipsum dolor... + +LICENSE-MIT.txt: + +Lorem ipsum dolor sit amet... +``` + +Or with `COMMENT`: + +``` +A meaningful comment + +LICENSE-LGPL2.txt: + +Lorem ipsum dolor... + +LICENSE-MIT.txt: + +Lorem ipsum dolor sit amet... +``` + +## Examples + +```cmake +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE/license.md" "${SOURCE_PATH}/LICENSE/license_gpl.md" COMMENT "This is a comment") +``` + +You can also collect the required files using a `GLOB` pattern: + +```cmake +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) +``` + +## Source + +[vcpkg_install_copyright.md](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_copyright.cmake) diff --git a/scripts/cmake/vcpkg_install_copyright.cmake b/scripts/cmake/vcpkg_install_copyright.cmake new file mode 100644 index 00000000000000..061eba567d06fd --- /dev/null +++ b/scripts/cmake/vcpkg_install_copyright.cmake @@ -0,0 +1,42 @@ +function(vcpkg_install_copyright) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "COMMENT" "FILE_LIST") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_FILE_LIST) + message(FATAL_ERROR "FILE_LIST must be specified") + endif() + + list(LENGTH arg_FILE_LIST FILE_LIST_LENGTH) + set(out_string "") + + if(FILE_LIST_LENGTH LESS_EQUAL 0) + message(FATAL_ERROR "FILE_LIST must contain at least one file") + elseif(FILE_LIST_LENGTH EQUAL 1) + if(arg_COMMENT) + file(READ "${arg_FILE_LIST}" out_string) + else() + file(INSTALL "${arg_FILE_LIST}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + return() + endif() + else() + foreach(file_item IN LISTS arg_FILE_LIST) + if(NOT EXISTS "${file_item}") + message(FATAL_ERROR "\n${CMAKE_CURRENT_FUNCTION} was passed a non-existing path: ${file_item}\n") + endif() + + get_filename_component(file_name "${file_item}" NAME) + file(READ "${file_item}" file_contents) + + string(APPEND out_string "${file_name}:\n\n${file_contents}\n\n") + endforeach() + endif() + + if(arg_COMMENT) + string(PREPEND out_string "${arg_COMMENT}\n\n") + endif() + + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${out_string}") +endfunction() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index e8592824fbf8fe..312b02ff09e979 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -45,6 +45,7 @@ include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake") include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake") include("${SCRIPTS}/cmake/vcpkg_host_path_list.cmake") include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_copyright.cmake") include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake") include("${SCRIPTS}/cmake/vcpkg_install_make.cmake") include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake") diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index a997cd22cc9ce6..c629792439f7df 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -80,5 +80,6 @@ vcpkg_cmake_install() #} # vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@) -# Uncomment the line below if necessary to install the license file for the port to share/${PORT}/copyright -# file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +# Uncomment the line below if necessary to install the license file for the port +# as a file named `copyright` to the directory `${CURRENT_PACKAGES_DIR}/share/${PORT}` +# vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") From 5f8189bc48aa7e4cfea90d74dccd242597381749 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Wed, 13 Jul 2022 12:12:19 -0500 Subject: [PATCH 104/791] [liblsquic] Add new port (#24310) * [liblsquic] Add new port. * version * use vcpkg_install_copyright() Co-authored-by: Victor Romero --- ports/liblsquic/disable-asan.patch | 23 +++++++++ ports/liblsquic/portfile.cmake | 76 ++++++++++++++++++++++++++++++ ports/liblsquic/vcpkg.json | 24 ++++++++++ versions/baseline.json | 4 ++ versions/l-/liblsquic.json | 9 ++++ 5 files changed, 136 insertions(+) create mode 100644 ports/liblsquic/disable-asan.patch create mode 100644 ports/liblsquic/portfile.cmake create mode 100644 ports/liblsquic/vcpkg.json create mode 100644 versions/l-/liblsquic.json diff --git a/ports/liblsquic/disable-asan.patch b/ports/liblsquic/disable-asan.patch new file mode 100644 index 00000000000000..2b05d0ee3a5dee --- /dev/null +++ b/ports/liblsquic/disable-asan.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 65c4776..5d4086a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,12 +60,12 @@ ENDIF() + + IF(CMAKE_BUILD_TYPE STREQUAL "Debug") + SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -O0 -g3") +- IF(CMAKE_C_COMPILER MATCHES "clang" AND +- NOT "$ENV{TRAVIS}" MATCHES "^true$" AND +- NOT "$ENV{EXTRA_CFLAGS}" MATCHES "-fsanitize") +- SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -fsanitize=address") +- SET(LIBS ${LIBS} -fsanitize=address) +- ENDIF() ++ # IF(CMAKE_C_COMPILER MATCHES "clang" AND ++ # NOT "$ENV{TRAVIS}" MATCHES "^true$" AND ++ # NOT "$ENV{EXTRA_CFLAGS}" MATCHES "-fsanitize") ++ # SET(MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -fsanitize=address") ++ # SET(LIBS ${LIBS} -fsanitize=address) ++ # ENDIF() + # Uncomment to enable cleartext protocol mode (no crypto): + #SET (MY_CMAKE_FLAGS "${MY_CMAKE_FLAGS} -DLSQUIC_ENABLE_HANDSHAKE_DISABLE=1") + ELSE() diff --git a/ports/liblsquic/portfile.cmake b/ports/liblsquic/portfile.cmake new file mode 100644 index 00000000000000..1d3276082bf7db --- /dev/null +++ b/ports/liblsquic/portfile.cmake @@ -0,0 +1,76 @@ +if(WIN32) + # The lib uses CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS, at least until + # https://github.com/litespeedtech/lsquic/pull/371 or similar is merged + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO litespeedtech/lsquic + REF v3.1.1 + SHA512 b4675be355703fea12f4b7d24812b93e739b2dbef04e3d8108b6fbe45dd16c129c9e04e58cdcfdf2a4448ee2edea68565dbd2445a76515bbdc8d9980f4210bee + HEAD_REF master + PATCHES disable-asan.patch) + +# Submodules +vcpkg_from_github(OUT_SOURCE_PATH LSQPACK_SOURCE_PATH + REPO litespeedtech/ls-qpack + REF v2.3.0 + HEAD_REF master + SHA512 7f5a9dd15bcd32c1bfafbecc5cea4da30f50a852c02d2bd140a2baaafd80ccb822c1701b0d20699af6367e9c712f4fe019741507c44156e9897d25162de0b8b4 +) +if(NOT EXISTS "${SOURCE_PATH}/src/ls-hpack/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/src/liblsquic/ls-qpack") + file(RENAME "${LSQPACK_SOURCE_PATH}" "${SOURCE_PATH}/src/liblsquic/ls-qpack") +endif() + +vcpkg_from_github(OUT_SOURCE_PATH LSHPACK_SOURCE_PATH + REPO litespeedtech/ls-hpack + REF v2.3.0 + HEAD_REF master + SHA512 45866b18042125cbbd008eed2935a938a42e1682030aa52ff4a324ddbad7bf9bd483161352cc8988bae668e132ee8b4b043ddc09d9e0316a66aaefd927ae2d76 +) +if(NOT EXISTS "${SOURCE_PATH}/src/lshpack/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/src/lshpack") + file(RENAME "${LSHPACK_SOURCE_PATH}" "${SOURCE_PATH}/src/lshpack") +endif() + +# Configuration +vcpkg_find_acquire_program(PERL) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LSQUIC_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPERL=${PERL}" + "-DPERL_EXECUTABLE=${PERL}" + "-DLSQUIC_SHARED_LIB=${LSQUIC_SHARED_LIB}" + "-DBORINGSSL_INCLUDE=${CURRENT_INSTALLED_DIR}/include" + -DLSQUIC_BIN=OFF + -DLSQUIC_TESTS=OFF + OPTIONS_RELEASE + "-DBORINGSSL_LIB=${CURRENT_INSTALLED_DIR}/lib" + OPTIONS_DEBUG + "-DBORINGSSL_LIB=${CURRENT_INSTALLED_DIR}/debug/lib" + -DLSQUIC_DEVEL=ON +) + +vcpkg_cmake_install() +if(VCPKG_TARGET_IS_WINDOWS) + # Upstream removed installation of this header after merging changes + file(INSTALL "${SOURCE_PATH}/wincompat/vc_compat.h" DESTINATION "${CURRENT_INSTALLED_DIR}/include/lsquic") +endif() + +vcpkg_cmake_config_fixup(PACKAGE_NAME lsquic) + +# Concatenate license files and install +vcpkg_install_copyright(FILE_LIST + "${SOURCE_PATH}/LICENSE" + "${SOURCE_PATH}/LICENSE.chrome" +) + +file(INSTALL "${CURRENT_BUILDTREES_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +# Remove duplicated include directory +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + diff --git a/ports/liblsquic/vcpkg.json b/ports/liblsquic/vcpkg.json new file mode 100644 index 00000000000000..481a3bf16ed28e --- /dev/null +++ b/ports/liblsquic/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "liblsquic", + "version": "3.1.1", + "description": "An implementation of the QUIC and HTTP/3 protocols.", + "homepage": "https://github.com/litespeedtech/lsquic", + "license": "MIT AND BSD-3-Clause", + "supports": "!x86", + "dependencies": [ + "boringssl", + { + "name": "getopt", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 996472f6500f16..0d63b37184554f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3780,6 +3780,10 @@ "baseline": "1.16.0", "port-version": 0 }, + "liblsquic": { + "baseline": "3.1.1", + "port-version": 0 + }, "liblzma": { "baseline": "5.2.5", "port-version": 6 diff --git a/versions/l-/liblsquic.json b/versions/l-/liblsquic.json new file mode 100644 index 00000000000000..e182c28c553f8d --- /dev/null +++ b/versions/l-/liblsquic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f6f4593aba81acc749f3223d0fd3987d5920b164", + "version": "3.1.1", + "port-version": 0 + } + ] +} From 72cdfe25ee67e86026286ed9d1acad51e956c048 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 14 Jul 2022 01:30:11 +0800 Subject: [PATCH 105/791] [vcpkg baseline][libharu] update to 2.4.0-rc1 (#25569) * update to 2.4.0-rc1 * update vtk vcpkg.json file * export targets * update patch * update patch * Fix FindLibHaru in vtk * update ports/vtk/FindLibHaru.patch * update patch * fix find libharu --- ports/libharu/add-boolean-typedef.patch | 12 ------- ports/libharu/export-targets.patch | 29 +++++++++++++++ ports/libharu/fix-build-fail.patch | 21 ----------- ports/libharu/fix-include-path.patch | 13 +++++++ ports/libharu/portfile.cmake | 47 +++++-------------------- ports/libharu/tiff.patch | 25 ------------- ports/libharu/vcpkg.json | 21 ++++------- ports/vtk/fix-find-libharu.patch | 36 +++++++++++++++++++ ports/vtk/portfile.cmake | 2 ++ ports/vtk/vcpkg.json | 9 ++--- versions/baseline.json | 6 ++-- versions/l-/libharu.json | 5 +++ versions/v-/vtk.json | 5 +++ 13 files changed, 111 insertions(+), 120 deletions(-) delete mode 100644 ports/libharu/add-boolean-typedef.patch create mode 100644 ports/libharu/export-targets.patch delete mode 100644 ports/libharu/fix-build-fail.patch create mode 100644 ports/libharu/fix-include-path.patch delete mode 100644 ports/libharu/tiff.patch create mode 100644 ports/vtk/fix-find-libharu.patch diff --git a/ports/libharu/add-boolean-typedef.patch b/ports/libharu/add-boolean-typedef.patch deleted file mode 100644 index 7768ed301bbf3e..00000000000000 --- a/ports/libharu/add-boolean-typedef.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/hpdf.h b/include/hpdf.h -index 1cf0dd9..cce9b59 100644 ---- a/include/hpdf.h -+++ b/include/hpdf.h -@@ -54,6 +54,7 @@ - #include "hpdf_types.h" - - typedef void *HPDF_HANDLE; -+typedef HPDF_HANDLE HPDF_Boolean; - typedef HPDF_HANDLE HPDF_Doc; - typedef HPDF_HANDLE HPDF_Page; - typedef HPDF_HANDLE HPDF_Pages; diff --git a/ports/libharu/export-targets.patch b/ports/libharu/export-targets.patch new file mode 100644 index 00000000000000..3e7b62c9686339 --- /dev/null +++ b/ports/libharu/export-targets.patch @@ -0,0 +1,29 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4ca0f14..02ad1ab 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -87,9 +87,23 @@ if(UNIX AND NOT APPLE) + target_link_libraries (haru ${M_LIB}) + endif() + ++if(LIBHPDF_SHARED) ++ if(WIN32 AND NOT CYGWIN) ++ set_target_properties(haru PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ endif(WIN32 AND NOT CYGWIN) ++endif(LIBHPDF_SHARED) ++ ++target_include_directories(haru PUBLIC $ $) ++ + install( +- TARGETS ++ TARGETS haru ++ EXPORT unofficial-libharu-config + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) ++ ++install(EXPORT unofficial-libharu-config ++ NAMESPACE unofficial::libharu:: ++ DESTINATION share/unofficial-libharu ++) diff --git a/ports/libharu/fix-build-fail.patch b/ports/libharu/fix-build-fail.patch deleted file mode 100644 index 2f7066575ed3bd..00000000000000 --- a/ports/libharu/fix-build-fail.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9d2a604..be8e964 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -79,11 +79,11 @@ if(LIBHPDF_STATIC) - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin - ) -- if(WIN32 AND NOT CYGWIN) -- foreach(addlib ${ADDITIONAL_LIBRARIES}) -- install(FILES ${addlib} DESTINATION lib) -- endforeach(addlib) -- endif(WIN32 AND NOT CYGWIN) -+ #if(WIN32 AND NOT CYGWIN) -+ #foreach(addlib ${ADDITIONAL_LIBRARIES}) -+ #install(FILES ${addlib} DESTINATION lib) -+ #endforeach(addlib) -+ #endif(WIN32 AND NOT CYGWIN) - endif(LIBHPDF_STATIC) - if(LIBHPDF_SHARED) - add_library(${LIBHPDF_NAME} SHARED ${LIBHPDF_SRCS}) diff --git a/ports/libharu/fix-include-path.patch b/ports/libharu/fix-include-path.patch new file mode 100644 index 00000000000000..83ef8f324f1b9b --- /dev/null +++ b/ports/libharu/fix-include-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14ed67d..57673c1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,7 +126,7 @@ set( + ) + + # install header files +-install(FILES ${haru_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++install(FILES ${haru_HDRS} DESTINATION include/) + + # install various files + install(FILES README.md CHANGES INSTALL DESTINATION .) diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 20c5952547b937..819bfff642568a 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -1,26 +1,12 @@ -if("notiffsymbols" IN_LIST FEATURES) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(DISABLETIFF tiff.patch) - endif() -endif() -vcpkg_download_distfile(SHADING_PR - URLS "https://github.com/libharu/libharu/pull/157.diff" - FILENAME "libharu-shading-pr-157.patch" - SHA512 f2ddb22b54b4eccc79400b6a4b2d245a221898f75456a5a559523eab7a523a87dfc5dfd0ec5fb17a771697e03c7ea6ed4c6095eff73e0a4302cd6eb24584c957 -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libharu/libharu - REF d84867ebf9f3de6afd661d2cdaff102457fbc371 - SHA512 789579dd52c1056ae90a4ce5360c26ba92cadae5341a3901c4159afe624129a1f628fa6412952a398e048b0e5040c93f7ed5b4e4bc620a22d897098298fe2a99 + REF 6997cf775b2345e3db82ac774fe2931faf348458 #2.4.0-rc1 + SHA512 758753b0f977c6b9f0b6309958e1edfba491851682c9b04cead6ebebc9af726fdec7265f36ca1b1e80f1849f9b4a43ad329a688b4844eb911c64d42a92cd7823 HEAD_REF master PATCHES - fix-build-fail.patch - add-boolean-typedef.patch - # This patch adds shading support which is required for VTK. If desired, this could be moved into an on-by-default feature. - ${SHADING_PR} - ${DISABLETIFF} + fix-include-path.patch + export-targets.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -40,34 +26,19 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib") - endif() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib") - endif() - else() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.a") - endif() - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a") - endif() - endif() -endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libharu) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/README" + "${CURRENT_PACKAGES_DIR}/debug/README.md" "${CURRENT_PACKAGES_DIR}/debug/CHANGES" "${CURRENT_PACKAGES_DIR}/debug/INSTALL" - "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/README.md" "${CURRENT_PACKAGES_DIR}/CHANGES" "${CURRENT_PACKAGES_DIR}/INSTALL" ) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(READ "${CURRENT_PACKAGES_DIR}/include/hpdf.h" _contents) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") string(REPLACE "#ifdef HPDF_DLL\n" "#if 1\n" _contents "${_contents}") @@ -85,4 +56,4 @@ endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/hpdf_types.h" "${_contents}") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libharu/tiff.patch b/ports/libharu/tiff.patch deleted file mode 100644 index 2aabbe32e7c711..00000000000000 --- a/ports/libharu/tiff.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/hpdf_image_ccitt.c b/src/hpdf_image_ccitt.c -index 2937fc90d..a1a35d0ed 100644 ---- a/src/hpdf_image_ccitt.c -+++ b/src/hpdf_image_ccitt.c -@@ -21,7 +21,6 @@ - #include - #include - --#define G3CODES - #include "t4.h" - - typedef unsigned int uint32; -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 354ca7526..ee301d9af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -99,6 +99,8 @@ if(PNG_FOUND) - set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${PNG_LIBRARIES}) - endif(PNG_FOUND) - -+find_package(TIFF REQUIRED) -+list(APPEND ADDITIONAL_LIBRARIES TIFF::TIFF) - - # ======================================================================= - # configure header files, add compiler flags diff --git a/ports/libharu/vcpkg.json b/ports/libharu/vcpkg.json index 76537e89f59694..442551d6e91711 100644 --- a/ports/libharu/vcpkg.json +++ b/ports/libharu/vcpkg.json @@ -1,26 +1,19 @@ { "name": "libharu", - "version-string": "2017-08-15", - "port-version": 10, + "version-semver": "2.4.0-rc1", "description": "libharu - free PDF library", "homepage": "https://github.com/libharu/libharu", + "license": "Zlib", "dependencies": [ "libpng", { "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" - ], - "default-features": [ - "notiffsymbols" - ], - "features": { - "notiffsymbols": { - "description": "disable symbols also defined by the tiff port", - "dependencies": [ - "tiff" - ] - } - } + ] } diff --git a/ports/vtk/fix-find-libharu.patch b/ports/vtk/fix-find-libharu.patch new file mode 100644 index 00000000000000..4f707c757f1618 --- /dev/null +++ b/ports/vtk/fix-find-libharu.patch @@ -0,0 +1,36 @@ +diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake +index c87bb9c..0c0133e 100644 +--- a/CMake/vtkInstallCMakePackage.cmake ++++ b/CMake/vtkInstallCMakePackage.cmake +@@ -62,7 +62,6 @@ set(vtk_cmake_module_files + FindGLEW.cmake + FindJOGL.cmake + FindJsonCpp.cmake +- FindLibHaru.cmake + FindLibPROJ.cmake + FindLibXml2.cmake + FindLZ4.cmake +diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt +index bac8dce..c0b98cd 100644 +--- a/ThirdParty/libharu/CMakeLists.txt ++++ b/ThirdParty/libharu/CMakeLists.txt +@@ -4,16 +4,15 @@ vtk_module_third_party( + VERSION "2.4.0" + STANDARD_INCLUDE_DIRS + EXTERNAL +- PACKAGE LibHaru ++ PACKAGE unofficial-libharu CONFIG_MODE + # Unreleased. Requires these PRs: + # https://github.com/libharu/libharu/pull/157 + # https://github.com/libharu/libharu/pull/187 +- VERSION 2.4.0 +- TARGETS LibHaru::LibHaru ++ TARGETS unofficial::libharu::haru + STANDARD_INCLUDE_DIRS) + + include(vtkDetectLibraryType) +-vtk_detect_library_shared(vtklibharu LibHaru::LibHaru) ++vtk_detect_library_shared(vtklibharu unofficial::libharu::haru) + + set(HPDF_DLL 0) + if (WIN32 AND vtklibharu_is_shared) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 64dd5901a025df..7be2566dd1c46d 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -30,6 +30,7 @@ vcpkg_from_github( fix-gdal.patch missing-limits.patch # This patch can be removed in next version. Since it has been merged to upstream via https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 UseProj5Api.patch # Allow Proj 8.0+ (commit b66e4a7, backported). Should be in soon after 9.0.3 + fix-find-libharu.patch ) # ============================================================================= @@ -143,6 +144,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "mpi" VTK_USE_MPI "all" VTK_BUILD_ALL_MODULES ) + # ============================================================================= # Configure & Install diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index fb5a115dc61b69..244fd06887b4a3 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 10, + "port-version": 11, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", @@ -16,12 +16,7 @@ "default-features": false }, "jsoncpp", - { - "name": "libharu", - "features": [ - "notiffsymbols" - ] - }, + "libharu", "libjpeg-turbo", "liblzma", "libogg", diff --git a/versions/baseline.json b/versions/baseline.json index 0d63b37184554f..f46d1f4c58d8f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3677,8 +3677,8 @@ "port-version": 1 }, "libharu": { - "baseline": "2017-08-15", - "port-version": 10 + "baseline": "2.4.0-rc1", + "port-version": 0 }, "libhdfs3": { "baseline": "2019-11-05", @@ -7502,7 +7502,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 10 + "port-version": 11 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/l-/libharu.json b/versions/l-/libharu.json index 176804b1366bfa..579f95262300fc 100644 --- a/versions/l-/libharu.json +++ b/versions/l-/libharu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7119cd9fe86c40e908ef4c65be267b35caf8d010", + "version-semver": "2.4.0-rc1", + "port-version": 0 + }, { "git-tree": "bfeaf0d13fce9156ac216daa37a2c945290fc0ed", "version-date": "2017-08-15", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index d7362563531e1c..f4afbd9dd95b71 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3193e1219e09f8f67d2762fa4fe823f4327a1c93", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 11 + }, { "git-tree": "6a7eea485be980aa5c9fae1e0a75084f98e5dc27", "version-semver": "9.0.3-pv5.9.1", From 91cb13a65943e88e5cdd2d293bdf5ca87c0e3d70 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 14 Jul 2022 01:31:37 +0800 Subject: [PATCH 106/791] [dlib] update to 19.24 (#25749) * [dlib] update to 19.24 * update version * Recovery patch form * update version --- ports/dlib/fix-sqlite3-fftw-linkage.patch | 9 ++++++--- ports/dlib/portfile.cmake | 4 ++-- ports/dlib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dlib.json | 5 +++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ports/dlib/fix-sqlite3-fftw-linkage.patch b/ports/dlib/fix-sqlite3-fftw-linkage.patch index 41ba700b420872..ddf86ced37ec13 100644 --- a/ports/dlib/fix-sqlite3-fftw-linkage.patch +++ b/ports/dlib/fix-sqlite3-fftw-linkage.patch @@ -1,7 +1,8 @@ diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +index 9f3001d..962cfc4 100644 --- a/dlib/CMakeLists.txt +++ b/dlib/CMakeLists.txt -@@ -747,32 +750,15 @@ +@@ -814,32 +814,15 @@ if (NOT TARGET dlib) if (DLIB_LINK_WITH_SQLITE3) @@ -38,10 +39,12 @@ diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt endif() +diff --git a/dlib/cmake_utils/dlibConfig.cmake.in b/dlib/cmake_utils/dlibConfig.cmake.in +index 2667a2e..cc7b4a2 100644 --- a/dlib/cmake_utils/dlibConfig.cmake.in +++ b/dlib/cmake_utils/dlibConfig.cmake.in -@@ -28,6 +28,14 @@ - include("${dlib_CMAKE_DIR}/dlib.cmake") +@@ -31,6 +31,14 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR) + unset(dlib_deps_threads_check) endif() +include(CMakeFindDependencyMacro) diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 8df6a8c2bf2080..bf78160381035f 100644 --- a/ports/dlib/portfile.cmake +++ b/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 074ab8bdbadbee1afb95653c3ce46867ed32dfa1 #v19.23 - SHA512 da7942cf006566bafdd7079cc31ac445cd66e300714e522c53dfcf6b1a811de4cf2188c9a75c978388b09554bccc4164d40afc907bf9e6f75a17f8ca10ee0355 + REF 6097093ab329fcd19aed03a8fe67949f6971a65d #v19.24 + SHA512 4bdcecdf0f986abc748245d21616bf2c304461e9a37572c66743f69141fc3f37eb846fdaedc6c910135d986534f7989cbcc52a884ae7a52464fbb2a07b16a327 HEAD_REF master PATCHES fix-sqlite3-fftw-linkage.patch diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json index fa7907dec0ca6d..f059790a9db73d 100644 --- a/ports/dlib/vcpkg.json +++ b/ports/dlib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dlib", - "version": "19.23", + "version": "19.24", "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", "homepage": "https://github.com/davisking/dlib", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index f46d1f4c58d8f3..8ea58ea1736470 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1941,7 +1941,7 @@ "port-version": 6 }, "dlib": { - "baseline": "19.23", + "baseline": "19.24", "port-version": 0 }, "dmlc": { diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index a1af91a2234c1a..d4dae9563bed7f 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69c4335588e3785a09f580a40c128bf4d1bc5339", + "version": "19.24", + "port-version": 0 + }, { "git-tree": "825d6117ba43320dd5969535320b8be3144ea9de", "version": "19.23", From 5f631cf95555320a10f87aec1a0444ae92a64454 Mon Sep 17 00:00:00 2001 From: tqcq <99722391+tqcq@users.noreply.github.com> Date: Thu, 14 Jul 2022 01:35:33 +0800 Subject: [PATCH 107/791] [rxcpp] upgrade version from v4.1.0 to v4.1.1 (#25557) * feature upgrade rxcpp version from v4.1.0 to v4.1.1 * feature x-add-version * fix rxcpp version hash diff * feature migrating new cmake function * feature upgrade vcpkg from v4.1.0 to v4.1.1 * fix format-manifest * feature use version instead of version-string * feature run x-add-version for rxcpp * feature add license to rxcpp * feature x-add-version for rxcpp * update vcpkg.json * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/rxcpp/portfile.cmake | 16 +++++-------- ports/rxcpp/support_find_package.patch | 32 -------------------------- ports/rxcpp/vcpkg.json | 16 ++++++++++--- versions/baseline.json | 4 ++-- versions/r-/rxcpp.json | 5 ++++ 5 files changed, 26 insertions(+), 47 deletions(-) delete mode 100644 ports/rxcpp/support_find_package.patch diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index b98701132e178f..deb7e294ca68f1 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -1,21 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ReactiveX/RxCpp - REF v4.1.0 - SHA512 a92e817ecbdf6f235cae724ada2615af9fa0c243249625d0f2c2f09ff5dd7f53fdabd03a0278fe2995fe27528c5511d71f87b7a6b3d54f73b49b65aef56e32fd + REF v4.1.1 + SHA512 387e1276151a19b62fd1d36b486ff5f3ed28f0f48ae8b00902bf13464d20603f492ecd63ab4444d04293fc3d92a8f7ce3e67a4c68836415c4655331fb6b54edb HEAD_REF master - PATCHES support_find_package.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_TESTS=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake/) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(COPY ${SOURCE_PATH}/license.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/rxcpp/support_find_package.patch b/ports/rxcpp/support_find_package.patch deleted file mode 100644 index bb1da2d2d77438..00000000000000 --- a/ports/rxcpp/support_find_package.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt -index 3d0744740..293f187c5 100644 ---- a/projects/CMake/CMakeLists.txt -+++ b/projects/CMake/CMakeLists.txt -@@ -146,3 +146,27 @@ set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY TRUE CACHE BOOL "Don't require all project - - install(DIRECTORY ${RXCPP_DIR}/Rx/v2/src/rxcpp/ DESTINATION include/rxcpp - FILES_MATCHING PATTERN "*.hpp") -+ -+# Here we are exporting TARGETS so that other projects can import rxcpp -+# just with find_package(rxcpp CONFIG) after rxcpp is installed into system by "make install". -+add_library(rxcpp INTERFACE) -+ -+target_include_directories(rxcpp INTERFACE -+ $ -+ $ -+) -+ -+install(TARGETS rxcpp EXPORT rxcppConfig) -+install(EXPORT rxcppConfig DESTINATION share/rxcpp/cmake) -+ -+# When find_package(rxcpp SOME_VERSION REQUIRED) will be used in third party project -+# where SOME_VERSION is any version incompatible with ${PROJECT_VERSION} then cmake will generate the error. -+# It means you don't need track versions manually. -+include(CMakePackageConfigHelpers) -+write_basic_package_version_file("${PROJECT_BINARY_DIR}/rxcppConfigVersion.cmake" -+ VERSION -+ ${PROJECT_VERSION} -+ COMPATIBILITY -+ AnyNewerVersion -+) -+install(FILES "${PROJECT_BINARY_DIR}/rxcppConfigVersion.cmake" DESTINATION share/rxcpp/cmake) diff --git a/ports/rxcpp/vcpkg.json b/ports/rxcpp/vcpkg.json index 013aa46a3e6222..44f51ec0eb1ea8 100644 --- a/ports/rxcpp/vcpkg.json +++ b/ports/rxcpp/vcpkg.json @@ -1,7 +1,17 @@ { "name": "rxcpp", - "version-string": "4.1.0", - "port-version": 2, + "version": "4.1.1", "description": "Reactive Extensions for C++", - "homepage": "https://github.com/Reactive-Extensions/RxCpp" + "homepage": "https://github.com/Reactive-Extensions/RxCpp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 8ea58ea1736470..818e9f4c85f5b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6361,8 +6361,8 @@ "port-version": 4 }, "rxcpp": { - "baseline": "4.1.0", - "port-version": 2 + "baseline": "4.1.1", + "port-version": 0 }, "rxqt": { "baseline": "bb2138c", diff --git a/versions/r-/rxcpp.json b/versions/r-/rxcpp.json index d545b8340d2466..53ed12b1e484d6 100644 --- a/versions/r-/rxcpp.json +++ b/versions/r-/rxcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92ae6c5ff3c5a9f81dda630c0b6cc4e69766ee61", + "version": "4.1.1", + "port-version": 0 + }, { "git-tree": "69044b3fc33b35dab3f62471daf96a2a2b27dc0a", "version-string": "4.1.0", From ac68609a5159703d0883ebac76cbebf5611c1bcf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 13 Jul 2022 22:17:56 +0200 Subject: [PATCH 108/791] [x265] Fix dependencies, modernize (#25747) * [x265] No unguarded NUMA dependency * [x265] Keep non-standard runtime libs in pc file * Rewrite assembly options * Modernize and cleanup * Update versions --- ports/x265/portfile.cmake | 95 ++++++++++++--------------------------- ports/x265/vcpkg.json | 13 ++++-- versions/baseline.json | 2 +- versions/x-/x265.json | 5 +++ 4 files changed, 45 insertions(+), 70 deletions(-) diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 8dd9dd1e348cd4..52a111ad753021 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -8,89 +8,52 @@ vcpkg_from_github( disable-install-pdb.patch ) -set(ENABLE_ASSEMBLY OFF) -if (VCPKG_TARGET_IS_WINDOWS) +set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=OFF") +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_find_acquire_program(NASM) - get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) - set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") - set(ENABLE_ASSEMBLY ON) -endif () + set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=ON" "-DNASM_EXECUTABLE=${NASM}") +endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/source - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/source" OPTIONS - -DENABLE_ASSEMBLY=${ENABLE_ASSEMBLY} + ${ASSEMBLY_OPTIONS} -DENABLE_SHARED=${ENABLE_SHARED} + -DENABLE_LIBNUMA=OFF OPTIONS_DEBUG -DENABLE_CLI=OFF + MAYBE_UNUSED_VARIABLES + ENABLE_LIBNUMA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -# remove duplicated include files -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_tools(TOOL_NAMES x265 AUTO_CLEAN) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -endif() - -if(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_TARGET_IS_MINGW)) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "-lx265" "-lx265-static") - endif() - endif() -endif() - -# maybe create vcpkg_regex_replace_string? - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(READ ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc _contents) - string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc "${_contents}") -endif() - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc _contents) - string(REGEX REPLACE "-l(std)?c\\+\\+" "" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc "${_contents}") -endif() - if(VCPKG_TARGET_IS_MINGW AND ENABLE_SHARED) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libx265.a) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libx265.a) - endif() + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libx265.a") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libx265.a") endif() -if(UNIX) - foreach(FILE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc") - if(EXISTS "${FILE}") - file(READ "${FILE}" _contents) - string(REPLACE " -lstdc++" "" _contents "${_contents}") - string(REPLACE " -lc++" "" _contents "${_contents}") - string(REPLACE " -lgcc_s" "" _contents "${_contents}") - string(REPLACE " -lgcc" "" _contents "${_contents}") - string(REPLACE " -lrt" "" _contents "${_contents}") - file(WRITE "${FILE}" "${_contents}") - endif() - endforeach() - vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES numa) -else() - vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() +vcpkg_list(SET pc_files "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x265.pc") +if(NOT VCPKG_BUILD_TYPE) + vcpkg_list(APPEND pc_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x265.pc") endif() +foreach(FILE IN LISTS pc_files) + file(READ "${FILE}" _contents) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + string(REPLACE "-lx265" "-lx265-static" _contents "${_contents}") + else() + string(REPLACE " -lgcc_s" "" _contents "${_contents}") + string(REPLACE " -lgcc" "" _contents "${_contents}") + endif() + file(WRITE "${FILE}" "${_contents}") +endforeach() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/x265/vcpkg.json b/ports/x265/vcpkg.json index cc19a6f2b9ab02..99242f2b52d625 100644 --- a/ports/x265/vcpkg.json +++ b/ports/x265/vcpkg.json @@ -1,8 +1,15 @@ { "name": "x265", - "version-string": "3.4", - "port-version": 5, + "version": "3.4", + "port-version": 6, "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", "homepage": "https://github.com/videolan/x265", - "supports": "!(uwp | arm)" + "license": "GPL-2.0", + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 818e9f4c85f5b4..778be2f1f6d84c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7666,7 +7666,7 @@ }, "x265": { "baseline": "3.4", - "port-version": 5 + "port-version": 6 }, "xalan-c": { "baseline": "1.12", diff --git a/versions/x-/x265.json b/versions/x-/x265.json index bd0e54ac10dd6b..cfa7e14a77da0c 100644 --- a/versions/x-/x265.json +++ b/versions/x-/x265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15ee257957dfa5a194cf602c160713369b7c313a", + "version": "3.4", + "port-version": 6 + }, { "git-tree": "3904d5293aad0e38ee7ca93b82182441bb1575ca", "version-string": "3.4", From 9402f6f765f31ba71922b7659b36073a5096fc1b Mon Sep 17 00:00:00 2001 From: xaedes Date: Wed, 13 Jul 2022 22:47:22 +0200 Subject: [PATCH 109/791] [imgui] Set C++ 11 standard in CMakeLists.txt (#25601) * [imgui] Enable C++ 11 standard as code requires it see vcpkg issue microsoft#25588 * [imgui] Enable C++ 11 standard using target_compile_features As lerppana suggested: It is better to use cxx_std_11 meta feature instead of locking the version number. This should indicate cmake to use at least 11 instead of exactly 11. see vcpkg issue microsoft#25588 * [imgui] update versions (vcpkg x-add-version imgui) Enable C++ 11 standard as code requires it see vcpkg issue microsoft#25588 --- ports/imgui/CMakeLists.txt | 2 ++ ports/imgui/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 41f03db1cd179e..85544830c03094 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -28,6 +28,8 @@ target_sources( ${CMAKE_CURRENT_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp ) +target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + if(IMGUI_BUILD_ALLEGRO5_BINDING) find_path(ALLEGRO5_INCLUDE_DIRS allegro5/allegro.h) target_include_directories(${PROJECT_NAME} PRIVATE ${ALLEGRO5_INCLUDE_DIRS}) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index c25d2ecf161bff..200fd5b06f1744 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.88", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 778be2f1f6d84c..a7eb59c6716b05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2966,7 +2966,7 @@ }, "imgui": { "baseline": "1.88", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.5", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 172e3db7c3ca80..e9ccb175b0289c 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a4c55df4b895535fba9e3934ed64cef92bf4a4d", + "version": "1.88", + "port-version": 1 + }, { "git-tree": "c28ebbdbe22a87ce01c3b2b6c15bed036721c6a0", "version": "1.88", From 343319653a6bbff8eafd6065b5f20b92218f7dac Mon Sep 17 00:00:00 2001 From: Cedric GNIEWEK Date: Wed, 13 Jul 2022 22:48:45 +0200 Subject: [PATCH 110/791] [libmicrodns] Add new port (#25660) * [libmicrodns] Add new port * [libmicrodns] Add version --- ports/libmicrodns/portfile.cmake | 16 ++++++++++++++++ ports/libmicrodns/vcpkg.json | 13 +++++++++++++ scripts/ci.baseline.txt | 3 +++ versions/baseline.json | 4 ++++ versions/l-/libmicrodns.json | 9 +++++++++ 5 files changed, 45 insertions(+) create mode 100644 ports/libmicrodns/portfile.cmake create mode 100644 ports/libmicrodns/vcpkg.json create mode 100644 versions/l-/libmicrodns.json diff --git a/ports/libmicrodns/portfile.cmake b/ports/libmicrodns/portfile.cmake new file mode 100644 index 00000000000000..87908a1f93c512 --- /dev/null +++ b/ports/libmicrodns/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO videolabs/libmicrodns + REF 0.2.0 + SHA512 6389ad9edaf1af7c831e8c05e4800964b13cf0eed2063fa3675e7b87c49428ae7b68ac4ed1e742ed5d46ea3ded190e3de076e73ebf167422505257d7b1a03e25 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_install_meson() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/libmicrodns/vcpkg.json b/ports/libmicrodns/vcpkg.json new file mode 100644 index 00000000000000..b522539d5ce9b9 --- /dev/null +++ b/ports/libmicrodns/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libmicrodns", + "version": "0.2.0", + "description": "Minimal mDNS resolver (and announcer) library", + "homepage": "https://github.com/videolabs/libmicrodns", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fd259f5666df63..1eee524f6844a2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -452,6 +452,9 @@ libmesh:x64-windows-static-md=skip libmesh:x86-windows=skip libmesh:x64-osx=skip libmesh:x64-linux=skip +# Build fails since PIC is not enabled and some configuration tests do not work properly on UWP +libmicrodns:arm-uwp=fail +libmicrodns:x64-uwp=fail libmikmod:x64-osx=fail libmodman:arm-uwp=fail libmodman:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index a7eb59c6716b05..1a741d96d1f846 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3812,6 +3812,10 @@ "baseline": "1.5.0", "port-version": 4 }, + "libmicrodns": { + "baseline": "0.2.0", + "port-version": 0 + }, "libmicrohttpd": { "baseline": "0.9.75", "port-version": 0 diff --git a/versions/l-/libmicrodns.json b/versions/l-/libmicrodns.json new file mode 100644 index 00000000000000..03ec5150c2a49e --- /dev/null +++ b/versions/l-/libmicrodns.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "479151454954c9fe2e5ddce7f1b358f3c8688ce8", + "version": "0.2.0", + "port-version": 0 + } + ] +} From 98b41de91e4dabe17850e53e453007548ce03e9f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 13 Jul 2022 22:51:19 +0200 Subject: [PATCH 111/791] [libsquish] Fix unexpected OpenMP dependency (#25746) * [libsquish] No unguarded OpenMP dependency * Update versions --- ports/libsquish/portfile.cmake | 4 +++- ports/libsquish/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsquish.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/libsquish/portfile.cmake b/ports/libsquish/portfile.cmake index e9cb26e3f5d021..4b482e492eaae9 100644 --- a/ports/libsquish/portfile.cmake +++ b/ports/libsquish/portfile.cmake @@ -17,7 +17,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_SQUISH_WITH_OPENMP=OFF ) vcpkg_cmake_install() diff --git a/ports/libsquish/vcpkg.json b/ports/libsquish/vcpkg.json index 3af7e3b130ba02..0ae034fa6ce98d 100644 --- a/ports/libsquish/vcpkg.json +++ b/ports/libsquish/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsquish", "version": "1.15", - "port-version": 10, + "port-version": 11, "description": "Open source DXT compression library.", "homepage": "https://sourceforge.net/projects/libsquish", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1a741d96d1f846..0e652efe8cb1ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4090,7 +4090,7 @@ }, "libsquish": { "baseline": "1.15", - "port-version": 10 + "port-version": 11 }, "libsrt": { "baseline": "1.4.4", diff --git a/versions/l-/libsquish.json b/versions/l-/libsquish.json index da008f533dc8cd..dd90ef4f34ce14 100644 --- a/versions/l-/libsquish.json +++ b/versions/l-/libsquish.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c259e069413fc51d82423f6c9842ad285e210e9", + "version": "1.15", + "port-version": 11 + }, { "git-tree": "9a7ae325bacc78d07dc92de654a877584cff0cca", "version": "1.15", From 9065505cd613aa09280b97c9d5756ebb0ef014a7 Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Wed, 13 Jul 2022 22:52:54 +0200 Subject: [PATCH 112/791] [rsig] Updates rsig to 0.1.1 (#25669) * [rsig] Updates rsig to 0.1.1 * Use the right usage file. * Update versions. --- ports/rsig/portfile.cmake | 7 ++++--- ports/rsig/usage | 4 ++++ ports/rsig/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rsig.json | 5 +++++ 5 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 ports/rsig/usage diff --git a/ports/rsig/portfile.cmake b/ports/rsig/portfile.cmake index cf1449860d5bc0..bee4230d43111c 100644 --- a/ports/rsig/portfile.cmake +++ b/ports/rsig/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rioki/rsig - REF v0.1.0 - SHA512 73de6dfe0b18f141a388c9307d8dff9a0709ceb758f58c474a7ddc5d9d77f2f8808fe4d78f3ad88466f81ca61b15ae3504255595d78387b23f87974de46d1d2b + REF v0.1.1 + SHA512 1b14a543d55086da5cb678b1654267b4e7c54c7b6ef1d3b65a19ee72c362b62ecdf456c2bea8f19aaec1bee8c30b32d5d79e7ed19725d7fe26204874d063175c ) file(INSTALL ${SOURCE_PATH}/rsig/rsig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/rsig) -configure_file(${SOURCE_PATH}/README.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/rsig/usage b/ports/rsig/usage new file mode 100644 index 00000000000000..918026fa140764 --- /dev/null +++ b/ports/rsig/usage @@ -0,0 +1,4 @@ +The package rsig is header only and can be used from CMake via: + + find_path(RSIG_INCLUDE_DIRS "rsig/rsig.h") + target_include_directories(main PRIVATE ${RSIG_INCLUDE_DIRS}) diff --git a/ports/rsig/vcpkg.json b/ports/rsig/vcpkg.json index 1a6f81257c90f0..6ad5ebb95c00f2 100644 --- a/ports/rsig/vcpkg.json +++ b/ports/rsig/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rsig", - "version-semver": "0.1.0", + "version-semver": "0.1.1", "description": "rioki's signal library", "homepage": "https://github.com/rioki/rsig", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 0e652efe8cb1ad..a0771ec7b3b109 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6325,7 +6325,7 @@ "port-version": 1 }, "rsig": { - "baseline": "0.1.0", + "baseline": "0.1.1", "port-version": 0 }, "rsm-binary-io": { diff --git a/versions/r-/rsig.json b/versions/r-/rsig.json index 3af215f274d6c1..53e6037760b013 100644 --- a/versions/r-/rsig.json +++ b/versions/r-/rsig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "525def3216ac409d83ec19c46ac670dc3f74bb8a", + "version-semver": "0.1.1", + "port-version": 0 + }, { "git-tree": "ead8c39f676072093b0b65df27d2f34414ef056a", "version-semver": "0.1.0", From 7e0fcb4ccfa2ce6482421aeae9d5147c694f7245 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 14 Jul 2022 04:53:41 +0800 Subject: [PATCH 113/791] [WavPack] update to 5.5.0 (#25742) * [WavPack] update to 5.5.0 * update version --- ports/wavpack/OpenSSL.patch | 13 ------------- ports/wavpack/fix-symbol-exports.patch | 22 ---------------------- ports/wavpack/portfile.cmake | 9 +++------ ports/wavpack/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wavpack.json | 5 +++++ 6 files changed, 11 insertions(+), 45 deletions(-) delete mode 100644 ports/wavpack/OpenSSL.patch delete mode 100644 ports/wavpack/fix-symbol-exports.patch diff --git a/ports/wavpack/OpenSSL.patch b/ports/wavpack/OpenSSL.patch deleted file mode 100644 index 6d8e956ade5a58..00000000000000 --- a/ports/wavpack/OpenSSL.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e1043f..d8cb8b10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -208,7 +208,7 @@ target_include_directories(wavpack - target_link_libraries(wavpack - PRIVATE - $<$:m> -- $<$:${OPENSSL_CRYPTO_LIBRARY}> -+ $<$:OpenSSL::Crypto> - ) - target_compile_definitions(wavpack - PRIVATE diff --git a/ports/wavpack/fix-symbol-exports.patch b/ports/wavpack/fix-symbol-exports.patch deleted file mode 100644 index 999a05417cfeb7..00000000000000 --- a/ports/wavpack/fix-symbol-exports.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 70e1043f..d8cb8b10 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -328,7 +328,7 @@ foreach(EXPORT_SYMBOL ${WAVPACK_EXPORT_SYMBOLS}) - list(APPEND FILE_CONTENTS "_${EXPORT_SYMBOL}\n") - endforeach() - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym ${FILE_CONTENTS}) -- target_link_libraries(wavpack PRIVATE "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") -+ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,'${CMAKE_CURRENT_BINARY_DIR}/libwavpack.sym'") - else() - set(CONFTTEST_CONTENTS "VERS_1 {\n global: sym\;\n\n};\n\nVERS_2 {\n global: sym;\n} VERS_1\;") - file(WRITE ${PROJECT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/conftest.map "${CONFTTEST_CONTENTS}") -@@ -340,7 +340,7 @@ list(APPEND FILE_CONTENTS "${EXPORT_SYMBOL}\;\n") - endforeach() - list(APPEND FILE_CONTENTS "local: *\; }\;") - file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map ${FILE_CONTENTS}) -- target_link_libraries(wavpack PRIVATE "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") -+ set_target_properties(wavpack PROPERTIES LINK_FLAGS "-Wl,--version-script='${CMAKE_CURRENT_BINARY_DIR}/libwavpack.map';-Wl,-no-undefined") - endif() - endif() - diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index 6b3d4a5c47a7c9..0b0f85a40c7fe6 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -1,16 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dbry/WavPack - REF 5.4.0 - SHA512 4DD6C484032FDFB1BC0E9A95881677FADE39A5E07CB98713A6B29DF0E9A570D6D27856FCAF412A714A5D7708C9CC2ADACE03A06970B06C4C5B2987E7EB2E643D + REF 89ef99e84333534d9d43093a5264a398b5f1e14a #5.5.0 + SHA512 6d8a46461ea1a9fab129d705dda6167332e98da27b24323cbfba1827339222956e288ca3947b9a1f513d7eb6f957548cfcef717aa5ba5c3d3e43d29f98de3879 HEAD_REF master - PATCHES - OpenSSL.patch - fix-symbol-exports.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWAVPACK_INSTALL_DOCS=OFF -DWAVPACK_BUILD_PROGRAMS=OFF diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json index dff83543e0e642..ad40d851e78a1e 100644 --- a/ports/wavpack/vcpkg.json +++ b/ports/wavpack/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wavpack", - "version": "5.4.0", - "port-version": 2, + "version": "5.5.0", "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index a0771ec7b3b109..4a4c13ba5758b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7549,8 +7549,8 @@ "port-version": 0 }, "wavpack": { - "baseline": "5.4.0", - "port-version": 2 + "baseline": "5.5.0", + "port-version": 0 }, "websocketpp": { "baseline": "0.8.2", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index 9a826a33033f6c..c61aee9d82d147 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36c8b50ac4693a68a3ecceea8e96bb1abe852089", + "version": "5.5.0", + "port-version": 0 + }, { "git-tree": "39c514f313b4bc2fc7af0f3a889425bb78aca9e3", "version": "5.4.0", From 6d66b8fbbb71e1af08d0941d525f36b98ad23c1f Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 14 Jul 2022 04:54:44 +0800 Subject: [PATCH 114/791] [libproxy] Add vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) (#25733) Co-authored-by: Cheney-Wang --- ports/libproxy/portfile.cmake | 2 ++ ports/libproxy/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libproxy.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 00c21c106fe281..fa778691587200 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libproxy/libproxy diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index 47bff43e7fa44d..c00654e0cfc0b2 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,11 +1,11 @@ { "name": "libproxy", "version": "0.4.17", - "port-version": 4, + "port-version": 5, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "license": "LGPL-2.1-only", - "supports": "!uwp & !static", + "supports": "!uwp & !staticcrt", "dependencies": [ "libmodman", { diff --git a/versions/baseline.json b/versions/baseline.json index 4a4c13ba5758b3..a759a699b896ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3970,7 +3970,7 @@ }, "libproxy": { "baseline": "0.4.17", - "port-version": 4 + "port-version": 5 }, "libqcow": { "baseline": "20210419", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 65b432ad95df05..59eb95945672d9 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "657915bf898e4e4ccf08b6274665b541efa15876", + "version": "0.4.17", + "port-version": 5 + }, { "git-tree": "7aa3e3fbb2539fe4adaaff6056effdc2a97ff14b", "version": "0.4.17", From 9241267aa1aca26c4e28ad8996bc710689165519 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 14 Jul 2022 04:55:14 +0800 Subject: [PATCH 115/791] [libmount] Update to 2.38 (#25727) * [libmount] Update to 2.38 * x-add-version Co-authored-by: Cheney-Wang --- ports/libmount/portfile.cmake | 7 +++---- ports/libmount/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libmount.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/libmount/portfile.cmake b/ports/libmount/portfile.cmake index 3feac3d30ce8c6..b5187033658e4a 100644 --- a/ports/libmount/portfile.cmake +++ b/ports/libmount/portfile.cmake @@ -1,12 +1,11 @@ set(VERSION_MAJOR 2) -set(VERSION_MINOR 37) -set(VERSION_PATCH 2) -set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) +set(VERSION_MINOR 38) +set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) vcpkg_download_distfile(ARCHIVE URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION_MAJOR}.${VERSION_MINOR}/util-linux-${VERSION}.tar.xz" FILENAME "util-linux-${VERSION}.tar.xz" - SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d + SHA512 d0f7888f457592067938e216695871ce6475a45d83a092cc3fd72b8cf8fca145ca5f3a99122f1744ef60b4f773055cf4e178dc6c59cd30837172aee0b5597e8c ) vcpkg_extract_source_archive_ex( diff --git a/ports/libmount/vcpkg.json b/ports/libmount/vcpkg.json index 7b5383c8958332..ab45e1ceacc8d0 100644 --- a/ports/libmount/vcpkg.json +++ b/ports/libmount/vcpkg.json @@ -1,7 +1,8 @@ { "name": "libmount", - "version": "2.37.2", + "version": "2.38", "description": "Block device identification library from util-linux", "homepage": "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/about/", + "license": "GPL-2.0-only", "supports": "linux" } diff --git a/versions/baseline.json b/versions/baseline.json index a759a699b896ab..eb94343d4e117f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3841,7 +3841,7 @@ "port-version": 0 }, "libmount": { - "baseline": "2.37.2", + "baseline": "2.38", "port-version": 0 }, "libmpeg2": { diff --git a/versions/l-/libmount.json b/versions/l-/libmount.json index 72797a339565fc..8f67a09419ba1f 100644 --- a/versions/l-/libmount.json +++ b/versions/l-/libmount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf368ca79f716bd0b287bf1eeedd87c3529831cf", + "version": "2.38", + "port-version": 0 + }, { "git-tree": "0f746b3d702445fd2de54c25c08491cdaae45810", "version": "2.37.2", From 26ba6f56c1e819b94361dbefa8eee3e0c7108bca Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 13 Jul 2022 23:55:44 +0300 Subject: [PATCH 116/791] [restinio] update to v.0.6.16 (#25724) * RESTinio updated to v.0.6.16. * RESTinio v.0.6.16 added to baseline. --- ports/restinio/portfile.cmake | 4 ++-- ports/restinio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/restinio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 56f8c8851aa47e..4c7ec25b7352fd 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/restinio - REF 3bbbc97f572efc62dcf8ebfe3baf919593c22d81 # v.0.6.15 - SHA512 3a89d72bad4383b83bcfe8bbe16e12f7c08367dc3dfb2feff5642334d2bd5df3c75e5b25c4402c54d4279c45d5ab5997992fba18c3099772b6145fa90af7c808 + REF 03e69fe720c91c65b8cfe93f463dc6063ab287bd # v.0.6.16 + SHA512 fc333181b4d9c25d8b759663af2e8e805a2a9eb81c0808e950d949e67c15b268e3c2a230fb34ffd4e4c4571004e1aa2136749f7d5ce92c43288089b171637390 ) vcpkg_cmake_configure( diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index 018ba32eb086be..93751f41017a9f 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "restinio", - "version": "0.6.15", + "version": "0.6.16", "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.", "homepage": "https://github.com/Stiffstream/restinio", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index eb94343d4e117f..25b9522e8b49f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6269,7 +6269,7 @@ "port-version": 0 }, "restinio": { - "baseline": "0.6.15", + "baseline": "0.6.16", "port-version": 0 }, "rexo": { diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json index cc92309e53fd39..191e9cca5028a2 100644 --- a/versions/r-/restinio.json +++ b/versions/r-/restinio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d203c65a6c07e890c752ab69d981546bc208763e", + "version": "0.6.16", + "port-version": 0 + }, { "git-tree": "07fadf731052fa7900593db32c0515cba8c45138", "version": "0.6.15", From 8b14e7e8729c532b7c2be9e603b7ee886b62db6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 14 Jul 2022 01:29:41 +0000 Subject: [PATCH 117/791] [hiredis] Fix the conflict of macro ssize_t (#25271) --- ports/hiredis/portfile.cmake | 15 ++++++++++++++- ports/hiredis/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/h-/hiredis.json | 5 +++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index 6e7e0937d3adac..0eb8f9b566f460 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -33,11 +33,24 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup() if("ssl" IN_LIST FEATURES) vcpkg_cmake_config_fixup(PACKAGE_NAME hiredis_ssl CONFIG_PATH share/hiredis_ssl) endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/hiredis.h" +[[typedef long long ssize_t; +#define _SSIZE_T_ /* for compatibility with libuv */]] +[[typedef intptr_t ssize_t;]] +) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/hiredis/sds.h" +[[typedef long long ssize_t; +#define SSIZE_MAX (LLONG_MAX >> 1)]] +[[typedef intptr_t ssize_t; +#define SSIZE_MAX INTPTR_MAX]] +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index 48379f488c24b6..b8cbfc8e4f97b6 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,9 +1,10 @@ { "name": "hiredis", "version": "1.0.2", - "port-version": 3, + "port-version": 4, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 25b9522e8b49f5..6ab0ac49dd0744 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2822,7 +2822,7 @@ }, "hiredis": { "baseline": "1.0.2", - "port-version": 3 + "port-version": 4 }, "hps": { "baseline": "2022-01-18", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index 36c7df6bef130f..2c59b0b7f0774c 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "448374fa990c04aa7964508d32817a6d7868600b", + "version": "1.0.2", + "port-version": 4 + }, { "git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a", "version": "1.0.2", From e658a5d7ee5f81053efa0fc066681849dd3c6104 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 15 Jul 2022 03:07:04 +0800 Subject: [PATCH 118/791] [WinReg] update to v6.1.0 (#25765) * [WinReg] update to v6.1.0 * update version --- ports/winreg/portfile.cmake | 4 ++-- ports/winreg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/winreg.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index 1dfa1a21464018..472417185ebf29 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF 86d7ae5c5034aa88b40914fc0d209d8ceb214afe #v6.0.0 - SHA512 ca2daa61e89029641e189fe2a0177282900e30b8907702abd8010cc6c66cfe4cfaf15888c5860d7aec262209939fc7658da450e308be0f73b5b0423f4bb5bdf2 + REF ba6b74972038778d0bf5ffa6de705ec6e2768735 #v6.1.0 + SHA512 1b7ac1ef4322c2e1c80be840d4117424263c4ad02050926f1ebdd3fbb4978a02d12f485ccb0aff46ca4acc4188f48f7522ac4d6d663517d7bad71147224accc7 HEAD_REF master ) diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index 48fe1fe0cef84d..82c63c07fd080e 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "winreg", - "version": "6.0.0", + "version": "6.1.0", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6ab0ac49dd0744..845b667e209dba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7593,7 +7593,7 @@ "port-version": 0 }, "winreg": { - "baseline": "6.0.0", + "baseline": "6.1.0", "port-version": 0 }, "winsock2": { diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index 8deef9bcf0734d..9886bf55d2e028 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2ca5ed4ead6f69d105bd677fc3acaeba4be8879", + "version": "6.1.0", + "port-version": 0 + }, { "git-tree": "d6faf66fd8bb6b7d12b74e2084cbf15f8628b531", "version": "6.0.0", From 17216485567edb29e6634f53fbafe262e2cb58a8 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 14 Jul 2022 21:09:56 +0200 Subject: [PATCH 119/791] [kf5] Merge copyright files to a single file (#25759) * [kf5] Remove copyright dir part 1 * part 2 * version * format * version * Diagram has only a single license file * version * Delete docs * version * Fix empty dirs * version * Only remove readme * version --- ports/kf5archive/portfile.cmake | 3 +- ports/kf5archive/vcpkg.json | 2 +- ports/kf5attica/portfile.cmake | 3 +- ports/kf5attica/vcpkg.json | 2 +- ports/kf5auth/portfile.cmake | 4 +- ports/kf5auth/vcpkg.json | 1 + ports/kf5bookmarks/portfile.cmake | 3 +- ports/kf5bookmarks/vcpkg.json | 1 + ports/kf5codecs/portfile.cmake | 3 +- ports/kf5codecs/vcpkg.json | 2 +- ports/kf5completion/portfile.cmake | 3 +- ports/kf5completion/vcpkg.json | 1 + ports/kf5config/portfile.cmake | 5 +- ports/kf5config/vcpkg.json | 1 + ports/kf5configwidgets/portfile.cmake | 3 +- ports/kf5configwidgets/vcpkg.json | 1 + ports/kf5coreaddons/portfile.cmake | 5 +- ports/kf5coreaddons/vcpkg.json | 1 + ports/kf5crash/portfile.cmake | 3 +- ports/kf5crash/vcpkg.json | 1 + ports/kf5dbusaddons/portfile.cmake | 3 +- ports/kf5dbusaddons/vcpkg.json | 1 + ports/kf5declarative/portfile.cmake | 10 ++- ports/kf5declarative/vcpkg.json | 1 + ports/kf5diagram/portfile.cmake | 3 +- ports/kf5diagram/vcpkg.json | 1 + ports/kf5globalaccel/portfile.cmake | 9 ++- ports/kf5globalaccel/vcpkg.json | 1 + ports/kf5guiaddons/portfile.cmake | 9 +-- ports/kf5guiaddons/vcpkg.json | 6 +- ports/kf5holidays/portfile.cmake | 3 +- ports/kf5holidays/vcpkg.json | 1 + ports/kf5i18n/portfile.cmake | 3 +- ports/kf5i18n/vcpkg.json | 1 + ports/kf5iconthemes/portfile.cmake | 17 +++-- ports/kf5iconthemes/vcpkg.json | 1 + ports/kf5itemmodels/portfile.cmake | 3 +- ports/kf5itemmodels/vcpkg.json | 1 + ports/kf5itemviews/portfile.cmake | 3 +- ports/kf5itemviews/vcpkg.json | 1 + ports/kf5jobwidgets/portfile.cmake | 3 +- ports/kf5jobwidgets/vcpkg.json | 1 + ports/kf5kcmutils/portfile.cmake | 3 +- ports/kf5kcmutils/vcpkg.json | 1 + ports/kf5kio/portfile.cmake | 3 +- ports/kf5kio/vcpkg.json | 1 + ports/kf5newstuff/portfile.cmake | 5 +- ports/kf5newstuff/vcpkg.json | 1 + ports/kf5notifications/portfile.cmake | 3 +- ports/kf5notifications/vcpkg.json | 1 + ports/kf5package/portfile.cmake | 3 +- ports/kf5package/vcpkg.json | 1 + ports/kf5plotting/portfile.cmake | 3 +- ports/kf5plotting/vcpkg.json | 1 + ports/kf5service/portfile.cmake | 4 +- ports/kf5service/vcpkg.json | 1 + ports/kf5solid/portfile.cmake | 7 ++- ports/kf5solid/vcpkg.json | 1 + ports/kf5sonnet/portfile.cmake | 3 +- ports/kf5sonnet/vcpkg.json | 1 + ports/kf5syntaxhighlighting/portfile.cmake | 3 +- ports/kf5syntaxhighlighting/vcpkg.json | 1 + ports/kf5textwidgets/portfile.cmake | 3 +- ports/kf5textwidgets/vcpkg.json | 1 + ports/kf5wallet/portfile.cmake | 3 +- ports/kf5wallet/vcpkg.json | 1 + ports/kf5widgetsaddons/portfile.cmake | 3 +- ports/kf5widgetsaddons/vcpkg.json | 1 + ports/kf5windowsystem/portfile.cmake | 3 +- ports/kf5windowsystem/vcpkg.json | 2 +- ports/kf5xmlgui/portfile.cmake | 4 +- ports/kf5xmlgui/vcpkg.json | 1 + versions/baseline.json | 72 +++++++++++----------- versions/k-/kf5archive.json | 5 ++ versions/k-/kf5attica.json | 5 ++ versions/k-/kf5auth.json | 5 ++ versions/k-/kf5bookmarks.json | 5 ++ versions/k-/kf5codecs.json | 5 ++ versions/k-/kf5completion.json | 5 ++ versions/k-/kf5config.json | 5 ++ versions/k-/kf5configwidgets.json | 5 ++ versions/k-/kf5coreaddons.json | 5 ++ versions/k-/kf5crash.json | 5 ++ versions/k-/kf5dbusaddons.json | 5 ++ versions/k-/kf5declarative.json | 5 ++ versions/k-/kf5diagram.json | 5 ++ versions/k-/kf5globalaccel.json | 5 ++ versions/k-/kf5guiaddons.json | 5 ++ versions/k-/kf5holidays.json | 5 ++ versions/k-/kf5i18n.json | 5 ++ versions/k-/kf5iconthemes.json | 5 ++ versions/k-/kf5itemmodels.json | 5 ++ versions/k-/kf5itemviews.json | 5 ++ versions/k-/kf5jobwidgets.json | 5 ++ versions/k-/kf5kcmutils.json | 5 ++ versions/k-/kf5kio.json | 5 ++ versions/k-/kf5newstuff.json | 5 ++ versions/k-/kf5notifications.json | 5 ++ versions/k-/kf5package.json | 5 ++ versions/k-/kf5plotting.json | 5 ++ versions/k-/kf5service.json | 5 ++ versions/k-/kf5solid.json | 5 ++ versions/k-/kf5sonnet.json | 5 ++ versions/k-/kf5syntaxhighlighting.json | 5 ++ versions/k-/kf5textwidgets.json | 5 ++ versions/k-/kf5wallet.json | 5 ++ versions/k-/kf5widgetsaddons.json | 5 ++ versions/k-/kf5windowsystem.json | 5 ++ versions/k-/kf5xmlgui.json | 5 ++ 109 files changed, 349 insertions(+), 102 deletions(-) diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index ec0c2dd9883eae..3b47cecbfbe177 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -37,4 +37,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/LGPL-2.0-or-later.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index a6a778d87563be..9818287d6cd2e2 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5archive", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "license": "LGPL-2.0-or-later", diff --git a/ports/kf5attica/portfile.cmake b/ports/kf5attica/portfile.cmake index ebb31c98c23f75..3d9f135d588fe5 100644 --- a/ports/kf5attica/portfile.cmake +++ b/ports/kf5attica/portfile.cmake @@ -28,4 +28,5 @@ endif() vcpkg_fixup_pkgconfig() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5attica/vcpkg.json b/ports/kf5attica/vcpkg.json index 2f38ba3eecd57b..718f71a0ed015b 100644 --- a/ports/kf5attica/vcpkg.json +++ b/ports/kf5attica/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5attica", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "A Qt library that implements the Open Collaboration Services API", "homepage": "https://api.kde.org/frameworks/attica/html/index.html", "dependencies": [ diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 2c75a4bfcbee35..ae3108fd063e63 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -27,4 +27,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index e821fee90fd084..84bf200cc9d829 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5auth", "version": "5.89.0", + "port-version": 1, "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index 159f79ffa67066..63412053f8896b 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index 5064aa9eebca3d..2d2183a44f28ca 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5bookmarks", "version": "5.89.0", + "port-version": 1, "description": "Bookmarks management library", "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 26713a368e4fe2..7e08427f9a2638 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -28,4 +28,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index 7ffe07cc435d5f..d49539c607da66 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5codecs", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index a66913e1ab4a49..e146854b748a9e 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index a5619c4b036310..a79c2de7fedfbf 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5completion", "version": "5.89.0", + "port-version": 1, "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 3abf465951cb2b..fe56daabed75d3 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -36,7 +36,7 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -45,4 +45,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 2e3c6fe3b6aa7c..62f993d997a194 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5config", "version": "5.89.0", + "port-version": 1, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake index e314320d7f04cb..c001ee19f080b9 100644 --- a/ports/kf5configwidgets/portfile.cmake +++ b/ports/kf5configwidgets/portfile.cmake @@ -36,4 +36,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json index a844fb52151121..8cdefd7f629507 100644 --- a/ports/kf5configwidgets/vcpkg.json +++ b/ports/kf5configwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5configwidgets", "version": "5.89.0", + "port-version": 1, "description": "Widgets for configuration dialogs", "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 36cb5cc9b14e88..99a9c6e3832cff 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -29,9 +29,12 @@ file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share" file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/data/kf5") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/data/kf5") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 7ea1f782b3cb3c..d637c07e62a1b6 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5coreaddons", "version": "5.89.0", + "port-version": 1, "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 8cf3567ad47047..32eb2960a9f545 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -26,4 +26,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index f4588397ed7648..512dca04d45330 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5crash", "version": "5.89.0", + "port-version": 1, "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index c3e125188e1a75..f2640ff4b8cb63 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -30,4 +30,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index 6249aa2e08a24c..e4e0856d697a46 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5dbusaddons", "version": "5.89.0", + "port-version": 1, "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5declarative/portfile.cmake b/ports/kf5declarative/portfile.cmake index 07b1b54e2e8418..33b4c840d63cad 100644 --- a/ports/kf5declarative/portfile.cmake +++ b/ports/kf5declarative/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - "opengl" CMAKE_DISABLE_FIND_PACKAGE_EPOXY + "opengl" CMAKE_DISABLE_FIND_PACKAGE_EPOXY ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -31,10 +31,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Declarative CONFIG_PATH lib/cmake/KF5Declarative) vcpkg_copy_pdbs() -vcpkg_copy_tools( - TOOL_NAMES kpackagelauncherqml - AUTO_CLEAN -) +vcpkg_copy_tools(TOOL_NAMES kpackagelauncherqml AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -43,4 +40,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5declarative/vcpkg.json b/ports/kf5declarative/vcpkg.json index 5407b3989f70a2..856bff78875c51 100644 --- a/ports/kf5declarative/vcpkg.json +++ b/ports/kf5declarative/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5declarative", "version": "5.89.0", + "port-version": 1, "description": "Integration of QML and KDE work spaces", "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html", "dependencies": [ diff --git a/ports/kf5diagram/portfile.cmake b/ports/kf5diagram/portfile.cmake index 06278643cfb4d4..23caaa58902470 100644 --- a/ports/kf5diagram/portfile.cmake +++ b/ports/kf5diagram/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE.GPL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.GPL.txt") diff --git a/ports/kf5diagram/vcpkg.json b/ports/kf5diagram/vcpkg.json index 0388001e540368..07677eeb01eac9 100644 --- a/ports/kf5diagram/vcpkg.json +++ b/ports/kf5diagram/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5diagram", "version": "2.8.0", + "port-version": 1, "description": "Powerful libraries (KChart, KGantt) for creating business diagrams", "homepage": "https://api.kde.org/kdiagram/index.html", "dependencies": [ diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake index 3b0b1d070dcc0e..8d60613e60cf89 100644 --- a/ports/kf5globalaccel/portfile.cmake +++ b/ports/kf5globalaccel/portfile.cmake @@ -19,10 +19,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel) vcpkg_copy_pdbs() -vcpkg_copy_tools( - TOOL_NAMES kglobalaccel5 - AUTO_CLEAN - ) +vcpkg_copy_tools(TOOL_NAMES kglobalaccel5 AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -30,4 +27,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json index dbc60bfaa6460e..225fb6cfe58e89 100644 --- a/ports/kf5globalaccel/vcpkg.json +++ b/ports/kf5globalaccel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5globalaccel", "version": "5.89.0", + "port-version": 1, "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index 07048be6d09779..d7b5dc225226c0 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -10,13 +10,9 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - wayland WITH_WAYLAND + wayland WITH_WAYLAND ) -if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) - message(FATAL_ERROR "Feature wayland is only supported on Linux.") -endif() - # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") @@ -41,4 +37,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index ca00997c9017a2..a497295322e8ff 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5guiaddons", "version": "5.89.0", + "port-version": 1, "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ @@ -42,7 +43,10 @@ "wayland": { "description": "Linux-only. Build with support for KeySequenceEditor inhibiting shortcuts on Wayland", "dependencies": [ - "qt5-wayland" + { + "name": "qt5-wayland", + "platform": "linux" + } ] } } diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index df9d162c8ce21d..b5a38a216a7b99 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 5055e2a83a030e..67ba469d7ec0ad 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5holidays", "version": "5.89.0", + "port-version": 1, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 078c5a5adce54f..8ccdc010c70f16 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -35,4 +35,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 6aeeada8055c83..6734fac4e5f819 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.89.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake index 9486d26fb45522..d6f86c38d199ba 100644 --- a/ports/kf5iconthemes/portfile.cmake +++ b/ports/kf5iconthemes/portfile.cmake @@ -7,10 +7,10 @@ vcpkg_from_github( ) vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - designerplugin BUILD_DESIGNERPLUGIN - ) + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN +) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") @@ -34,10 +34,7 @@ vcpkg_copy_tools( ) if(VCPKG_TARGET_IS_OSX) - vcpkg_copy_tools( - TOOL_NAMES ksvg2icns - AUTO_CLEAN - ) + vcpkg_copy_tools(TOOL_NAMES ksvg2icns AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -46,4 +43,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json index a7e496cd052e92..5fcb2aebd0be73 100644 --- a/ports/kf5iconthemes/vcpkg.json +++ b/ports/kf5iconthemes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5iconthemes", "version": "5.89.0", + "port-version": 1, "description": "Icon GUI utilities", "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 04c74eda41912d..83c9771c5d21bf 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index f289009c755b88..3e3f3c942800d8 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemmodels", "version": "5.89.0", + "port-version": 1, "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index f1efb9e1c8047c..317afdfd24b328 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index 444aa1f79ae6f7..4ba26c11ae2d48 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemviews", "version": "5.89.0", + "port-version": 1, "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5jobwidgets/portfile.cmake b/ports/kf5jobwidgets/portfile.cmake index e34c97193e8df0..15dfd7db2850c9 100644 --- a/ports/kf5jobwidgets/portfile.cmake +++ b/ports/kf5jobwidgets/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json index 8a616421286493..08b88645bff088 100644 --- a/ports/kf5jobwidgets/vcpkg.json +++ b/ports/kf5jobwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5jobwidgets", "version": "5.89.0", + "port-version": 1, "description": "Widgets for showing progress of asynchronous jobs", "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5kcmutils/portfile.cmake b/ports/kf5kcmutils/portfile.cmake index da0a49637c96f9..cf4e90f91bb015 100644 --- a/ports/kf5kcmutils/portfile.cmake +++ b/ports/kf5kcmutils/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5kcmutils/vcpkg.json b/ports/kf5kcmutils/vcpkg.json index 85309cd383b92a..2ebfa63ac74b76 100644 --- a/ports/kf5kcmutils/vcpkg.json +++ b/ports/kf5kcmutils/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5kcmutils", "version": "5.89.0", + "port-version": 1, "description": "Utilities for KDE System Settings modules", "homepage": "https://api.kde.org/frameworks/kcmutils/html/index.html", "dependencies": [ diff --git a/ports/kf5kio/portfile.cmake b/ports/kf5kio/portfile.cmake index 12fdb59163db1e..50ef6e4ab229d9 100644 --- a/ports/kf5kio/portfile.cmake +++ b/ports/kf5kio/portfile.cmake @@ -62,4 +62,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5kio/vcpkg.json b/ports/kf5kio/vcpkg.json index 3f06846fc6d12f..bf45064c2e1c45 100644 --- a/ports/kf5kio/vcpkg.json +++ b/ports/kf5kio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5kio", "version": "5.89.0", + "port-version": 1, "description": "Network transparent access to files and data", "homepage": "https://api.kde.org/frameworks/kio/html/index.html", "dependencies": [ diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index ddb0527c2ec06f..02d07443afab77 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -30,9 +30,12 @@ vcpkg_copy_tools( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/data/kf5/kmoretools/presets-kmoretools/_README.md") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/data/kf5/kmoretools/presets-kmoretools/_README.md") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json index a435e8b05215de..3d7590e9a37ca6 100644 --- a/ports/kf5newstuff/vcpkg.json +++ b/ports/kf5newstuff/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5newstuff", "version": "5.89.0", + "port-version": 1, "description": "Framework for downloading and sharing additional application data", "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", "dependencies": [ diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index e44c59b76485b5..85ac8866a0e556 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index 1299e13af8ded6..250c5fd07ad35f 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5notifications", "version": "5.89.0", + "port-version": 1, "description": "Desktop notifications", "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", "dependencies": [ diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index f58344ed04013c..8fed3f40894f3a 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -29,4 +29,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index 30d6ea179bd4fb..05fdc67b2aeb77 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5package", "version": "5.89.0", + "port-version": 1, "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index cd05b7ff557d72..548bcf6baf24a8 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -23,4 +23,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 6a085aacc18510..314db70e4e9a69 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.89.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index afaebd0eb39cbd..609da25525d75e 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -56,4 +56,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index a7f375e6125f4a..8d155fbea06fe8 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5service", "version": "5.89.0", + "port-version": 1, "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index cc4f0358ab3a94..f0c78a06839033 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -38,7 +38,7 @@ file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: fa vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - "libmount" CMAKE_DISABLE_FIND_PACKAGE_LibMount + "libmount" CMAKE_DISABLE_FIND_PACKAGE_LibMount ) vcpkg_cmake_configure( @@ -55,7 +55,7 @@ vcpkg_copy_pdbs() vcpkg_copy_tools( TOOL_NAMES solid-hardware5 AUTO_CLEAN - ) +) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -64,4 +64,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index ec477c5b450ef1..c7b4735d0d5bd1 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5solid", "version": "5.89.0", + "port-version": 1, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index f981c077c191a7..1bfb51f5854e1d 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -44,4 +44,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json index 194bb46b22abef..1d2330e70939f8 100644 --- a/ports/kf5sonnet/vcpkg.json +++ b/ports/kf5sonnet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5sonnet", "version": "5.89.0", + "port-version": 1, "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 9cb527951225d1..6d5003ae71d9c4 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -36,4 +36,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index 51784515b5e9dc..a29d3617eb8c0d 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5syntaxhighlighting", "version": "5.89.0", + "port-version": 1, "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/ports/kf5textwidgets/portfile.cmake b/ports/kf5textwidgets/portfile.cmake index bf3e1ad9033bba..c8f4dc07d1a286 100644 --- a/ports/kf5textwidgets/portfile.cmake +++ b/ports/kf5textwidgets/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json index 82b0da989e6f9e..9393a42b771c5e 100644 --- a/ports/kf5textwidgets/vcpkg.json +++ b/ports/kf5textwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5textwidgets", "version": "5.89.0", + "port-version": 1, "description": "Text editing widgets", "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5wallet/portfile.cmake b/ports/kf5wallet/portfile.cmake index 61db39fa173fa0..2849f9d8cafddd 100644 --- a/ports/kf5wallet/portfile.cmake +++ b/ports/kf5wallet/portfile.cmake @@ -28,4 +28,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json index eaf4d12538135e..fdc33a3ee2b22d 100644 --- a/ports/kf5wallet/vcpkg.json +++ b/ports/kf5wallet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5wallet", "version": "5.89.0", + "port-version": 1, "description": "Safe desktop-wide storage for passwords", "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index dacd9aab55007f..4d6e88866b6657 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -27,4 +27,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index 7dd41877e72a4c..8b850b13c1addd 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5widgetsaddons", "version": "5.89.0", + "port-version": 1, "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 999383d7e731eb..c2c441a60655c9 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -32,4 +32,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/KF5/KWindowSystem/config-kwindowsystem.h" "${CURRENT_PACKAGES_DIR}/" "") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index d16a10e55a4008..341e25cb2dec47 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5windowsystem", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/ports/kf5xmlgui/portfile.cmake b/ports/kf5xmlgui/portfile.cmake index d3a9143db63724..df3614de9e5848 100644 --- a/ports/kf5xmlgui/portfile.cmake +++ b/ports/kf5xmlgui/portfile.cmake @@ -41,4 +41,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/kf5xmlgui/vcpkg.json b/ports/kf5xmlgui/vcpkg.json index 72fe1dcd737ee2..67bf4cec635832 100644 --- a/ports/kf5xmlgui/vcpkg.json +++ b/ports/kf5xmlgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5xmlgui", "version": "5.89.0", + "port-version": 1, "description": "Framework for managing menu and toolbar actions", "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 845b667e209dba..4cf3e22faae3a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3170,147 +3170,147 @@ }, "kf5archive": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5attica": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5auth": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5bookmarks": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5codecs": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5completion": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5config": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5configwidgets": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5coreaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5crash": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5dbusaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5declarative": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5diagram": { "baseline": "2.8.0", - "port-version": 0 + "port-version": 1 }, "kf5globalaccel": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5guiaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5holidays": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5i18n": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5iconthemes": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5itemmodels": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5itemviews": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5jobwidgets": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5kcmutils": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5kio": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5newstuff": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5notifications": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5package": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5plotting": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5service": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5solid": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5sonnet": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5syntaxhighlighting": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5textwidgets": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5wallet": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5widgetsaddons": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kf5windowsystem": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5xmlgui": { "baseline": "5.89.0", - "port-version": 0 + "port-version": 1 }, "kfr": { "baseline": "4.2.1", diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index ab9038bb760e84..5674d6c4304791 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "200f5a032c9615fb66ad30f53671cb39b776c270", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "2eafcdc8cb04d2ec80f9beb89254ca4f74616a07", "version": "5.89.0", diff --git a/versions/k-/kf5attica.json b/versions/k-/kf5attica.json index 65f356aeeb4281..a8c52afa751faf 100644 --- a/versions/k-/kf5attica.json +++ b/versions/k-/kf5attica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b57c9ffcaa73c2b461946b692ec5b73cb6c4be9", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "1ef9b989e525f13878a113dcd3ac801efe6d3b7b", "version": "5.89.0", diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index e965941bd32082..6cdabd5d95bea9 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b48f53d5ccd018dedbc8489fecb94272c00a693", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "e2f603c61a444935527c7c0a3e6f3871dc8de3df", "version": "5.89.0", diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json index 35c965c0a88ba4..ae015025b693fa 100644 --- a/versions/k-/kf5bookmarks.json +++ b/versions/k-/kf5bookmarks.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cd5cb169adf05127a9593b836443a7cf0caf7b9", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "4d1a01a9c81b7126f63ac11f2729498f93d56903", "version": "5.89.0", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index b4d9a4b4deaa35..0b6981061800e6 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6719ea6680496a4d022d37b8508a82929efa269", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "3f089e2bf752a07b60871e0cbc1bcdf085b3e7fd", "version": "5.89.0", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index c7674970547040..9c5aa246d16013 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0056d39621f6e5c5835fb0c43f341c4c7814cb3c", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "883845542162455b20188292bdf1cbcad36615ef", "version": "5.89.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 7f60f58102afb3..b0dc665ef52139 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "889c81ade9cc8884e33b26cf2a53a4438f36ac73", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "b8cf3131bfc3810be865d269b9873e08b36ed0ca", "version": "5.89.0", diff --git a/versions/k-/kf5configwidgets.json b/versions/k-/kf5configwidgets.json index 9a78dc93180b4f..6e284a33e2dcb8 100644 --- a/versions/k-/kf5configwidgets.json +++ b/versions/k-/kf5configwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49a14e655f74489ffbb31381c530f5cfbae085f5", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "321b0a6c4261d5a3bcf760d5010e388b6297e3d5", "version": "5.89.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index f89e710d9efa48..fbf60a8dbede35 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "871ce017f9d68b32eae29502a4e235d4b56ffa5c", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "6431d962993955c520f26f0c6d28f4cdaf5cfdea", "version": "5.89.0", diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index 6c4dc8cc924f0c..911c6046fb3101 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e580a5e3144b93a7d4b28aeb00ee6f3c4853158", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "09f21ea5657354bd2e6a725f7c6b9e8e6b47af68", "version": "5.89.0", diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json index 236a730e656bce..6b5682ea378ee6 100644 --- a/versions/k-/kf5dbusaddons.json +++ b/versions/k-/kf5dbusaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa7c4e3746bad3e33f18004fbc3e27f174565d5b", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "86fe61a2bf5e56705d1c90e61f355a08328d2886", "version": "5.89.0", diff --git a/versions/k-/kf5declarative.json b/versions/k-/kf5declarative.json index 6892e7ecf58d49..bd8a5abc49ca72 100644 --- a/versions/k-/kf5declarative.json +++ b/versions/k-/kf5declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efd6146040b9f86326574988e82191cbf8a23590", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "0e7f25daab01ec329e68aafcb705359e9c341bee", "version": "5.89.0", diff --git a/versions/k-/kf5diagram.json b/versions/k-/kf5diagram.json index 1dbe7533665a35..349194e2f96ada 100644 --- a/versions/k-/kf5diagram.json +++ b/versions/k-/kf5diagram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50871666a977c4954a0bd35a068c7dcfb83a4fba", + "version": "2.8.0", + "port-version": 1 + }, { "git-tree": "934ea388abb43f4946b4473a2b74cba0bf6b1e5c", "version": "2.8.0", diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json index 96495715516251..6c11cdcf714aed 100644 --- a/versions/k-/kf5globalaccel.json +++ b/versions/k-/kf5globalaccel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a4dc9bc81874eec1192fa77b8a04ab67fb75239", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "186e5eaf6182ee6c12a1543aad61a2d317dbe90b", "version": "5.89.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 5b8edfdee9e210..fcc18e4892fdad 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37f004eb6d5e6377d161abf76991be133c2ad2f1", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "1d532e40b86e82f54d1cec8ea0752168dac149b0", "version": "5.89.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 82a72f220e5c53..224435004ddfc2 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1e843d6b36f5866cb578d7151ace6f4c42f67fb", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "91ecdfa6bebbaf14e316af8763d3a355eb2d5108", "version": "5.89.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 81f997bcd2d9c7..6268bd8d391a2f 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f5d368735b3d217ffc3353be0a8d85d5eaa8e85", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "714138715b9030eceab63caba6085c4c9cd2e6d5", "version": "5.89.0", diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json index bc60ee1346e6b5..ab99bdfaaa22f2 100644 --- a/versions/k-/kf5iconthemes.json +++ b/versions/k-/kf5iconthemes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f24fa167b4438332ec95d1202d0bafa55e0047f6", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "6ff2f989294b0c0487ff5049498efb10571334eb", "version": "5.89.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index e55f871fd10a95..8eafd5e045a2fe 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "705a7782c204e337e6d9e1a8b6012d9666fa5f1c", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "a97d6d3556bddd30d108f13e831789b8cc9c1de9", "version": "5.89.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 22853ab6c9a7fd..ed43c48d7cb12d 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b8749cec5799435ad29e1a21bd957f4b212789b", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "8cdccbe27ce997559f69d74f6267c3cbfd294e1e", "version": "5.89.0", diff --git a/versions/k-/kf5jobwidgets.json b/versions/k-/kf5jobwidgets.json index 18cf0763e166ce..ced280ce1c5569 100644 --- a/versions/k-/kf5jobwidgets.json +++ b/versions/k-/kf5jobwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5eaddef9be54d6df981f7068082a2de2c03f50e", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "f608e47e7f8135de9e7c172bc168e8a444801e66", "version": "5.89.0", diff --git a/versions/k-/kf5kcmutils.json b/versions/k-/kf5kcmutils.json index 9671fe9550966f..90b4bc7fbdb43c 100644 --- a/versions/k-/kf5kcmutils.json +++ b/versions/k-/kf5kcmutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "750360181cf0718e672e8fce8f47f252a6282c2b", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "e57e3f3eda8ac0230b4f7e7bb31abd02c766398c", "version": "5.89.0", diff --git a/versions/k-/kf5kio.json b/versions/k-/kf5kio.json index b868ba249f49d5..2b11e95752368c 100644 --- a/versions/k-/kf5kio.json +++ b/versions/k-/kf5kio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ac545c09ad339684b43c2a6eb74b034f4ee1f25", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "644d4ef87d5683404a3b034195c07a982fc45979", "version": "5.89.0", diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json index 368f1e2bc6411d..2499cc5d119698 100644 --- a/versions/k-/kf5newstuff.json +++ b/versions/k-/kf5newstuff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3bc9c597ba5d97881249280f95c0e47256f11fec", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "7295ad1e62fd07e6aa74fb1d4fe0562e4f6b5ecb", "version": "5.89.0", diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index 4916ba0c550a74..25c2984d31906b 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d1cf6886532e33f979d0ea01db8f00f855ffd85", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "86baef519df4a14115be8d39ddac5b3c9df751cb", "version": "5.89.0", diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 1dbec4e0b1cd5a..c5dbf5d6d1bdfe 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a2ffee582428d57ac7ffcbc9b84b175fd4f7dd6", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "0c7ba772f4a36a4bec3f1a573c124cc812cce788", "version": "5.89.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index a5fd11df74079b..e9add2480e80d4 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a310fc3ab59198518b01efdd979941b8d23866d5", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "18344c8d460769664a1644a9c0bbca283766b2aa", "version": "5.89.0", diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index bf52e5fb23b83a..a62f7edb479939 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b907d7007202c4bc425b82c4fde84702dae9dd8a", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "8c834b6365035b2fcdd1996f3105456474f1b8a7", "version": "5.89.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index 5fe748f913ba5b..04b14d587c2718 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd69d4aaf53197f9f93af1378d98a01ee68c5ec1", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "769197391a9b8b1f614405d61e05361915dffdc2", "version": "5.89.0", diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json index 1e8eb71d052d81..6d9fcc51c014ef 100644 --- a/versions/k-/kf5sonnet.json +++ b/versions/k-/kf5sonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53b534ea7faff1d7803c333319a76fbd3c4245e3", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "4befb84624256110ee9b61eef7b2a38bed809274", "version": "5.89.0", diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index 2354bb6ee09d32..eae97dd5586c49 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1a612321aa345449388a6479bd9ec591c74fcfe", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "604681b0df59a2cc8cf1d69d8a355a9eecf59328", "version": "5.89.0", diff --git a/versions/k-/kf5textwidgets.json b/versions/k-/kf5textwidgets.json index fb59ad5cd49d81..1d0aec34bab40d 100644 --- a/versions/k-/kf5textwidgets.json +++ b/versions/k-/kf5textwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "386be7174ae0c7933126a345673f7627d23338ad", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "5010e707b462a2d020694963f2e6d9affdea6db2", "version": "5.89.0", diff --git a/versions/k-/kf5wallet.json b/versions/k-/kf5wallet.json index 879900175b59b2..438c1b05bdf5df 100644 --- a/versions/k-/kf5wallet.json +++ b/versions/k-/kf5wallet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c999c1fac42e446c163683aff3b737a34ab86369", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "7cdf30cbdbee449144de7e7f145e7e91ebd3aecb", "version": "5.89.0", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index d274e7fe555c10..2d111959fc257b 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cd66a59a38a228b3344621b1c7e5077d0e189f8", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "82e07e830a46ae869835ac36c61a1c4ea05542d3", "version": "5.89.0", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index cb45d7f7505fce..3c6ac1851b2e8d 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce5cc90a2d071246c1fbdb3240be60ae240d1566", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "a15cfdf8b903d0aca25ec242187172a32f15d210", "version": "5.89.0", diff --git a/versions/k-/kf5xmlgui.json b/versions/k-/kf5xmlgui.json index 358cc452a86461..80bb0b04c31286 100644 --- a/versions/k-/kf5xmlgui.json +++ b/versions/k-/kf5xmlgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3805659c0182f6360c9a25ba03623268f48dbfe", + "version": "5.89.0", + "port-version": 1 + }, { "git-tree": "ef8256a376b36bf9971b1788e88f4332146a1558", "version": "5.89.0", From c2594d242a9a8e639c88701955264fc52546a687 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 14 Jul 2022 21:12:47 +0200 Subject: [PATCH 120/791] [openal-soft] Add ALSA dependency on Linux (#25754) * [openal-soft] Add ALSA dependency on Linux * [openal-soft] Remove "host" from ALSA dependency. * [openal-soft] Update git tree value. --- ports/openal-soft/vcpkg.json | 5 +++++ versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 2b72ce14707ce5..a1b8adc56723e9 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,11 +1,16 @@ { "name": "openal-soft", "version-semver": "1.22.2", + "port-version": 1, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "license": "GPL-2.0-or-later", "supports": "!uwp", "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 4cf3e22faae3a0..8204a8bd20d0d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5122,7 +5122,7 @@ }, "openal-soft": { "baseline": "1.22.2", - "port-version": 0 + "port-version": 1 }, "openblas": { "baseline": "0.3.20", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 1268d7cc7bd29a..9a03c3b9290e6e 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a5b37e3c3d9cd16ebbcdaddcce6cb7249aa21ec", + "version-semver": "1.22.2", + "port-version": 1 + }, { "git-tree": "49395645807a6b8d7948d03474fbfa6c467be314", "version-semver": "1.22.2", From fd117d229d413dec5a3d0179ce2a46467145ae9d Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 14 Jul 2022 12:15:41 -0700 Subject: [PATCH 121/791] [azure-core-tracing-opentelemetry-cpp | azure-core-cpp] Add new port and publish azure-core-cpp version to 1.0.0-beta.2 (#25507) * [azure-core-tracing-opentelemetry-cpp] Update to 1.0.0-beta.2 ## 1.0.0-beta.2 (2022-06-30) ### Breaking Changes - The `Azure::Core::Tracing::OpenTelemetry::OpenTelemetryProvider` type can only be instantiated via a factory method: `OpenTelemetryProvider::Create()`. ### Other Changes - Removed `_internal` APIs from the public API surface. Also removed most of the `_internal` APIs from the public `opentelemetry.hpp` headers. * [azure-core-cpp] Update to 1.7.0 ## 1.7.0 (2022-06-30) ### Features Added - Added prototypes and initial service support for Distributed Tracing. --- ports/azure-core-cpp/portfile.cmake | 4 +-- ports/azure-core-cpp/vcpkg.json | 5 ++-- .../portfile.cmake | 18 +++++++++++ .../vcpkg.json | 30 +++++++++++++++++++ versions/a-/azure-core-cpp.json | 5 ++++ .../azure-core-tracing-opentelemetry-cpp.json | 9 ++++++ versions/baseline.json | 6 +++- 7 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake create mode 100644 ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json create mode 100644 versions/a-/azure-core-tracing-opentelemetry-cpp.json diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index a7d0a06d2a24ec..50fa05d0abddbb 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.6.0 - SHA512 13374ddf74488c080ef19d78569961dc859cd95cb64f359e0d3a0d763a314f005a6ba51b8f8fe900a7acb3eb4b783f4570962569855f6e4839b02de4db0d026e + REF azure-core_1.7.0 + SHA512 dca77d9b64b9ad3a91b63226f3650a531c024adb0a1d313356b78eb9c76d54f092c7c5d6e353058ad4b3c7ce7fd6d62ea95ab69a116e43f53025b379720f7cca ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index c94da535b31311..58122b059b7447 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.6.0", + "version-semver": "1.7.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,8 +10,7 @@ "dependencies": [ { "name": "openssl", - "platform": "!windows & !uwp", - "version>=": "1.1.1n" + "platform": "!windows & !uwp" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake new file mode 100644 index 00000000000000..a906a376879a30 --- /dev/null +++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-core-tracing-opentelemetry_1.0.0-beta.2 + SHA512 a0697ed440a08f3814013adf476c2a1333b462a2eb96bac18c47939c54686396639935568e229dad6bbbae06f54c324da82544634c6384a2c1498f9959836b6d +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json new file mode 100644 index 00000000000000..137ef7272fec05 --- /dev/null +++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "azure-core-tracing-opentelemetry-cpp", + "version-semver": "1.0.0-beta.2", + "description": [ + "Microsoft Azure Core Tracing OpenTelemetry SDK for C++", + "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core-tracing-opentelemetry", + "license": "MIT", + "supports": "!(windows & !static)", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.7.0-beta.1" + }, + { + "name": "opentelemetry-cpp", + "version>=": "1.3.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 8dbdcb38edeced..b9b8d8b88595b0 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "677fc287c3ba4d9a3582498071e1d14d5632e48f", + "version-semver": "1.7.0", + "port-version": 0 + }, { "git-tree": "5b920c224b5fa4daa427701a123bdf213dac8c43", "version-semver": "1.6.0", diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json new file mode 100644 index 00000000000000..09861ff933cda4 --- /dev/null +++ b/versions/a-/azure-core-tracing-opentelemetry-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4113db6be129830ea748465ca56fcb75e6ef4a31", + "version-semver": "1.0.0-beta.2", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8204a8bd20d0d5..98b0274e9a48a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -325,7 +325,11 @@ "port-version": 3 }, "azure-core-cpp": { - "baseline": "1.6.0", + "baseline": "1.7.0", + "port-version": 0 + }, + "azure-core-tracing-opentelemetry-cpp": { + "baseline": "1.0.0-beta.2", "port-version": 0 }, "azure-identity-cpp": { From 6b5e717e1dc8f248b18a70695e2d8793fe1b1a31 Mon Sep 17 00:00:00 2001 From: Ilya Glushchenko Date: Thu, 14 Jul 2022 22:19:03 +0300 Subject: [PATCH 122/791] [geos] Bump version to 3.11.0. (#25750) --- ports/geos/disable-warning-4996.patch | 4 ++-- ports/geos/fix-exported-config.patch | 12 ++++++------ ports/geos/portfile.cmake | 4 ++-- ports/geos/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/geos.json | 5 +++++ 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/geos/disable-warning-4996.patch b/ports/geos/disable-warning-4996.patch index af39e2ed6a6320..d10e8df8ab6e17 100644 --- a/ports/geos/disable-warning-4996.patch +++ b/ports/geos/disable-warning-4996.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index accc1a2..34d2055 100644 +index e758b5dc8..074986f38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -174,7 +174,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) +@@ -187,7 +187,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) target_compile_options(geos_cxx_flags INTERFACE "$<$,$>:-ffp-contract=off>" "$<$:-ffp-contract=off>" diff --git a/ports/geos/fix-exported-config.patch b/ports/geos/fix-exported-config.patch index 40aa835e0c397f..46af90efd18b16 100644 --- a/ports/geos/fix-exported-config.patch +++ b/ports/geos/fix-exported-config.patch @@ -1,10 +1,10 @@ diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index bc0e774..e3ca0bd 100644 +index a8c034fb2..a5cd14c13 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt -@@ -45,11 +45,18 @@ function(configure_install_geos_pc) - set(includedir "$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") - set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}") +@@ -61,11 +61,18 @@ function(configure_install_geos_pc) + set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}") + endif() set(VERSION ${GEOS_VERSION}) - set(EXTRA_LIBS "-lstdc++") + if(APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^c\\+\\+") @@ -22,7 +22,7 @@ index bc0e774..e3ca0bd 100644 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/geos.pc.in -@@ -61,9 +68,9 @@ function(configure_install_geos_pc) +@@ -77,9 +84,9 @@ function(configure_install_geos_pc) DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) endfunction() @@ -34,7 +34,7 @@ index bc0e774..e3ca0bd 100644 option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" OFF) diff --git a/tools/geos-config.in b/tools/geos-config.in -index 6eff1eb..8827f6a 100644 +index 6eff1eb14..8827f6ac6 100644 --- a/tools/geos-config.in +++ b/tools/geos-config.in @@ -1,9 +1,11 @@ diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 6118fcf6263551..9a27eaa1498665 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -1,9 +1,9 @@ -set(GEOS_VERSION 3.10.2) +set(GEOS_VERSION 3.11.0) vcpkg_download_distfile(ARCHIVE URLS "https://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2" FILENAME "geos-${GEOS_VERSION}.tar.bz2" - SHA512 390381711ccf56b862c2736cf6329200822f121de1c49df52b8b85cabea8c7787b199df2196acacc2e5c677ff3ebe042d93d70e89deadbc19d754499edb65126 + SHA512 40c7553bbb93673c231ddd0131b73bf43b3f50524bc5bd9e6934c068d2c09632f388b7429254ae15d9641da2d15e3a626b430438854e98d9e7419ad04e535189 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index 826736d01b5b4c..f5978b301fc1e9 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geos", - "version": "3.10.2", + "version": "3.11.0", "description": "Geometry Engine Open Source", "homepage": "https://libgeos.org/", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 98b0274e9a48a7..6e570de2b7d172 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2505,7 +2505,7 @@ "port-version": 0 }, "geos": { - "baseline": "3.10.2", + "baseline": "3.11.0", "port-version": 0 }, "geotrans": { diff --git a/versions/g-/geos.json b/versions/g-/geos.json index 0d975027a8672a..879038adfa20e5 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65d05922979febad3d20696832347333c24f1c16", + "version": "3.11.0", + "port-version": 0 + }, { "git-tree": "aa45b04832db59c6f6c4e92cf0f67b21afe41a48", "version": "3.10.2", From a480fb0fa30120a3ea5faa18b2d798ec135310c8 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 14 Jul 2022 13:17:49 -0700 Subject: [PATCH 123/791] [azure-security-attestation-cpp] Update to 1.0.0 (#25629) ## 1.0.0 (2022-07-07) ### Breaking Changes - Renamed `Version` field to `ApiVersion` and removed the `ServiceVersion` enumeration. Co-authored-by: Victor Romero --- ports/azure-security-attestation-cpp/portfile.cmake | 4 ++-- ports/azure-security-attestation-cpp/vcpkg.json | 4 ++-- versions/a-/azure-security-attestation-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/azure-security-attestation-cpp/portfile.cmake b/ports/azure-security-attestation-cpp/portfile.cmake index 77750e714269f5..fbe4e8ce3fcb19 100644 --- a/ports/azure-security-attestation-cpp/portfile.cmake +++ b/ports/azure-security-attestation-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-attestation_1.0.0-beta.3 - SHA512 8809bc3e44dc6e9f7a5ca98fdf23ef0058f5ba2321c34494931197e7d002dffab10161279bb5b7cf453593779db038f86abf377cb7788174ddbce9fc5199fe91 + REF azure-security-attestation_1.0.0 + SHA512 75b616ea152a88b2cd3be261df134523f1743343542f005e85f1dc9d438584038d0d92879c3caabfd3bd60c6c37c658ad327b2fb62693d99c170e64182f6831f ) vcpkg_cmake_configure( diff --git a/ports/azure-security-attestation-cpp/vcpkg.json b/ports/azure-security-attestation-cpp/vcpkg.json index b51db56069192c..3a0da2011d418b 100644 --- a/ports/azure-security-attestation-cpp/vcpkg.json +++ b/ports/azure-security-attestation-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-attestation-cpp", - "version-semver": "1.0.0-beta.3", + "version-semver": "1.0.0", "description": [ "Microsoft Azure Attestation Service SDK for C++", "This library provides API access to the Microsoft Azure Attestation service." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.5.0" + "version>=": "1.7.0-beta.1" }, "openssl", { diff --git a/versions/a-/azure-security-attestation-cpp.json b/versions/a-/azure-security-attestation-cpp.json index c55d02e0517624..3f36992b5c7b39 100644 --- a/versions/a-/azure-security-attestation-cpp.json +++ b/versions/a-/azure-security-attestation-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8293ab6b738d343991db9a759a62cac032f84d20", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "e0a46382e8a741a311e07f21ffd28ebb654c32ea", "version-semver": "1.0.0-beta.3", diff --git a/versions/baseline.json b/versions/baseline.json index 6e570de2b7d172..0bf48c1cd722e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -349,7 +349,7 @@ "port-version": 0 }, "azure-security-attestation-cpp": { - "baseline": "1.0.0-beta.3", + "baseline": "1.0.0", "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { From 0cb819175b2dcc0d0824dedc0404f535daa8431f Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 14 Jul 2022 23:08:28 +0200 Subject: [PATCH 124/791] [grpc] Update to 1.46.3 (#25071) * Update gRPC to 1.46.3 and upb to 2022-06-01 * fix(upb): Ensure that protoc-gen-upb has been build before running protobuf_generate. Also add license to vcpkg.json * fix(upb): Let abseil propagate cxx_std_11. Build upb codegen tools in host triplet * Revert abseil's cxx_std propagation * fix(upb): Attempt to fix missing -std=c++11 flag when compiling x64-osx * Downgrade upb to the version used by gRPC. No longer installed generated descriptor.upb.h files just to use them when compiling target triplet * Remove absl-sync patch from gRPC since it is always enabled by default now * Use vcpkg's upb library in gRPC instead of embedded one. Also fix gRPC's pkgconfig patch * grpc: Remove the upb::all_libs target * grpc: Adjust versions json * upb: Adjust versions json * Set feature absl-sync as deprecated * version Co-authored-by: JackBoosY --- ports/grpc/00005-fix-uwp-error.patch | 23 +++- ports/grpc/00006-fix-uwp-error.patch | 13 -- ports/grpc/00009-use-system-upb.patch | 32 ++--- ports/grpc/00010-add-feature-absl-sync.patch | 33 ----- ports/grpc/00013-build-upbdefs.patch | 28 ---- ports/grpc/00014-pkgconfig-upbdefs.patch | 2 +- ports/grpc/portfile.cmake | 13 +- ports/grpc/vcpkg.json | 5 +- ports/upb/0001-make-cmakelists-py.patch | 137 +++++++++++++++++++ ports/upb/0002-fix-uwp.patch | 13 ++ ports/upb/add-all-libs-target.patch | 25 ---- ports/upb/add-cmake-install.patch | 41 ------ ports/upb/fix-cmakelists.patch | 33 ----- ports/upb/fix-uwp.patch | 28 ---- ports/upb/portfile.cmake | 49 +++++-- ports/upb/upb-config-vcpkg-tools.cmake | 10 ++ ports/upb/vcpkg.json | 21 ++- versions/baseline.json | 6 +- versions/g-/grpc.json | 5 + versions/u-/upb.json | 5 + 20 files changed, 271 insertions(+), 251 deletions(-) delete mode 100644 ports/grpc/00006-fix-uwp-error.patch delete mode 100644 ports/grpc/00010-add-feature-absl-sync.patch delete mode 100644 ports/grpc/00013-build-upbdefs.patch create mode 100644 ports/upb/0001-make-cmakelists-py.patch create mode 100644 ports/upb/0002-fix-uwp.patch delete mode 100644 ports/upb/add-all-libs-target.patch delete mode 100644 ports/upb/add-cmake-install.patch delete mode 100644 ports/upb/fix-cmakelists.patch delete mode 100644 ports/upb/fix-uwp.patch create mode 100644 ports/upb/upb-config-vcpkg-tools.cmake diff --git a/ports/grpc/00005-fix-uwp-error.patch b/ports/grpc/00005-fix-uwp-error.patch index ff86f68febe3fa..fb49684295abb0 100644 --- a/ports/grpc/00005-fix-uwp-error.patch +++ b/ports/grpc/00005-fix-uwp-error.patch @@ -1,8 +1,21 @@ +diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +index cb17759bba..a3c3598430 100644 +--- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc ++++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc +@@ -1032,7 +1032,7 @@ class HPackParser::Parser { + + private: + void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { +- const char* type; ++ const char* type = nullptr; + switch (log_info_.type) { + case LogInfo::kHeaders: + type = "HDR"; diff --git a/src/core/lib/slice/slice.cc b/src/core/lib/slice/slice.cc -index 0dacbfef3e..0743a1b003 100644 +index 2e78b4de9e..77e88cab70 100644 --- a/src/core/lib/slice/slice.cc +++ b/src/core/lib/slice/slice.cc -@@ -234,6 +234,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, +@@ -181,6 +181,7 @@ grpc_slice grpc_slice_from_moved_buffer(grpc_core::UniquePtr p, size_t len) { uint8_t* ptr = reinterpret_cast(p.get()); grpc_slice slice; @@ -10,7 +23,7 @@ index 0dacbfef3e..0743a1b003 100644 if (len <= sizeof(slice.data.inlined.bytes)) { slice.refcount = nullptr; slice.data.inlined.length = len; -@@ -253,7 +254,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { +@@ -199,7 +200,7 @@ grpc_slice grpc_slice_from_moved_string(grpc_core::UniquePtr p) { } grpc_slice grpc_slice_from_cpp_string(std::string str) { @@ -20,10 +33,10 @@ index 0dacbfef3e..0743a1b003 100644 slice.refcount = nullptr; slice.data.inlined.length = str.size(); diff --git a/src/core/lib/surface/server.cc b/src/core/lib/surface/server.cc -index c94551545d..3fd9797316 100644 +index 4c0220837e..bb5a367107 100644 --- a/src/core/lib/surface/server.cc +++ b/src/core/lib/surface/server.cc -@@ -878,7 +878,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { +@@ -902,7 +902,7 @@ grpc_call_error Server::QueueRequestedCall(size_t cq_idx, RequestedCall* rc) { GRPC_ERROR_CREATE_FROM_STATIC_STRING("Server Shutdown")); return GRPC_CALL_OK; } diff --git a/ports/grpc/00006-fix-uwp-error.patch b/ports/grpc/00006-fix-uwp-error.patch deleted file mode 100644 index 871e170c4c4c28..00000000000000 --- a/ports/grpc/00006-fix-uwp-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/ext/transport/chttp2/transport/hpack_parser.cc b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -index 18abbda..9789983 100644 ---- a/src/core/ext/transport/chttp2/transport/hpack_parser.cc -+++ b/src/core/ext/transport/chttp2/transport/hpack_parser.cc -@@ -1052,7 +1052,7 @@ class HPackParser::Parser { - - private: - void GPR_ATTRIBUTE_NOINLINE LogHeader(const HPackTable::Memento& memento) { -- const char* type; -+ const char* type = nullptr; - switch (log_info_.type) { - case LogInfo::kHeaders: - type = "HDR"; diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch index e40b27dbbfbf8f..0d23ab3cf13a9e 100644 --- a/ports/grpc/00009-use-system-upb.patch +++ b/ports/grpc/00009-use-system-upb.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c3146b..ae06ea3 100644 +index a7e591f083..e16e70a224 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") +@@ -85,6 +85,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") set(gRPC_PROTOBUF_PROVIDER "module" CACHE STRING "Provider of protobuf library") set_property(CACHE gRPC_PROTOBUF_PROVIDER PROPERTY STRINGS "module" "package") @@ -12,33 +12,34 @@ index 1c3146b..ae06ea3 100644 set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package") set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") -@@ -1504,7 +1507,6 @@ target_link_libraries(gpr +@@ -1369,7 +1372,7 @@ target_link_libraries(gpr absl::synchronization absl::time absl::optional - upb ++ ${_gRPC_UPB_LIBRARIES} ) if(_gRPC_PLATFORM_ANDROID) target_link_libraries(gpr -@@ -3927,6 +3929,7 @@ endif() +@@ -3957,6 +3960,7 @@ endif() endif() +if (gRPC_UPB_PROVIDER STREQUAL "module") add_library(upb - third_party/upb/upb/decode_fast.c - third_party/upb/upb/decode.c -@@ -3984,7 +3987,7 @@ if(gRPC_INSTALL) + third_party/upb/third_party/utf8_range/naive.c + third_party/upb/third_party/utf8_range/range2-neon.c +@@ -4018,7 +4022,7 @@ if(gRPC_INSTALL) + ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() - - +endif() - add_executable(check_epollexclusive - test/build/check_epollexclusive.c + + add_executable(gen_hpack_tables diff --git a/cmake/gRPCConfig.cmake.in b/cmake/gRPCConfig.cmake.in -index 3623f4a..df6ced5 100644 +index 3623f4aa5e..df6ced560e 100644 --- a/cmake/gRPCConfig.cmake.in +++ b/cmake/gRPCConfig.cmake.in @@ -8,6 +8,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/modules) @@ -50,10 +51,10 @@ index 3623f4a..df6ced5 100644 # Targets include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index f2a0e50..ac6d397 100644 +index f2a0e508c3..09751f5ef0 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake -@@ -12,9 +12,21 @@ +@@ -12,9 +12,19 @@ # See the License for the specific language governing permissions and # limitations under the License. @@ -67,12 +68,9 @@ index f2a0e50..ac6d397 100644 set(_gRPC_UPB_LIBRARIES upb) + -+ +elseif(gRPC_UPB_PROVIDER STREQUAL "package") + find_package(upb CONFIG REQUIRED) -+ set(_gRPC_UPB_LIBRARIES upb::upb) ++ set(_gRPC_UPB_LIBRARIES upb::fastdecode upb::json upb::upb upb::utf8_range upb::textformat upb::reflection upb::descriptor_upb_proto) + set(_gRPC_UPB_INCLUDE_DIR) -+ set(upb ${_gRPC_UPB_LIBRARIES}) + set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()") +endif() -\ No newline at end of file diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch deleted file mode 100644 index 75d986d616ed88..00000000000000 --- a/ports/grpc/00010-add-feature-absl-sync.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 497470c..9c07732 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2196,6 +2196,8 @@ target_link_libraries(grpc - ${_gRPC_UPB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - absl::flat_hash_map -+ absl::time -+ absl::synchronization - absl::inlined_vector - absl::bind_front - absl::hash -@@ -2753,6 +2755,8 @@ target_link_libraries(grpc_unsecure - ${_gRPC_UPB_LIBRARIES} - ${_gRPC_ALLTARGETS_LIBRARIES} - absl::flat_hash_map -+ absl::time -+ absl::synchronization - absl::inlined_vector - absl::bind_front - absl::statusor -diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index c89ba26..81212b9 100644 ---- a/cmake/abseil-cpp.cmake -+++ b/cmake/abseil-cpp.cmake -@@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") - find_package(absl REQUIRED CONFIG) - endif() - set(_gRPC_FIND_ABSL "if(NOT TARGET absl::strings)\n find_package(absl CONFIG)\nendif()") -+ if (gRPC_ABSL_SYNC_ENABLE) -+ add_definitions(-DGPR_ABSEIL_SYNC=1) -+ endif() diff --git a/ports/grpc/00013-build-upbdefs.patch b/ports/grpc/00013-build-upbdefs.patch deleted file mode 100644 index 9a601ec5aea7fc..00000000000000 --- a/ports/grpc/00013-build-upbdefs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index 59d6813..1ce8bce 100644 ---- a/cmake/upb.cmake -+++ b/cmake/upb.cmake -@@ -24,8 +24,21 @@ set(_gRPC_UPB_LIBRARIES upb) - - elseif(gRPC_UPB_PROVIDER STREQUAL "package") - find_package(upb CONFIG REQUIRED) -- set(_gRPC_UPB_LIBRARIES upb::upb) -+ set(_gRPC_UPB_LIBRARIES upb) - set(_gRPC_UPB_INCLUDE_DIR) -- set(upb ${_gRPC_UPB_LIBRARIES}) -+ add_library(upb STATIC -+ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated/google/protobuf/descriptor.upbdefs.c -+ ${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated/google/protobuf/descriptor.upb.c -+ ) -+ set_target_properties(upb PROPERTIES OUTPUT_NAME grpc_upbdefs) -+ target_include_directories(upb PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upb-generated" "${CMAKE_CURRENT_SOURCE_DIR}/src/core/ext/upbdefs-generated") -+ target_link_libraries(upb PUBLIC upb::all_libs) -+ if(gRPC_INSTALL) -+ install(TARGETS upb EXPORT gRPCTargets -+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ) -+ endif() - set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()") - endif() diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index 01e064e3bf7ce7..99425b779d4968 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -7,7 +7,7 @@ index 54b4b23..83fab3b 100644 "${gRPC_CORE_VERSION}" "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" -+ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz" ++ "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz" "" "grpc.pc") diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 4c68ff11208a84..9f485ff1913094 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF 591d56e1300b6d11948e1b821efac785a295989c # v1.44.0 - SHA512 b24f82768eed95b017a499ffb539af1f59d6916ab2da5ffb1de344ea7b0b7df536d1bb29a9bcb273bd84bc1f11b62383dc6c7df62e50d57621228f5aeeca6d5d + REF v1.46.3 + SHA512 e80322b65c6f8d64dc91bce9f612119191e8d329cac2fbc5da6dad9a2a7ccaa7a501470ed483e555c3ba596e8aff796fbda2747f09e9c4329aed3de4d9b6b666 HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -14,13 +14,10 @@ vcpkg_from_github( 00003-undef-base64-macro.patch 00004-link-gdi32-on-windows.patch 00005-fix-uwp-error.patch - 00006-fix-uwp-error.patch 00009-use-system-upb.patch - 00010-add-feature-absl-sync.patch 00011-fix-csharp_plugin.patch snprintf.patch 00012-fix-use-cxx17.patch - 00013-build-upbdefs.patch 00014-pkgconfig-upbdefs.patch ) @@ -40,7 +37,6 @@ endif() vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - absl-sync gRPC_ABSL_SYNC_ENABLE codegen gRPC_BUILD_CODEGEN ) @@ -90,11 +86,8 @@ else() configure_file("${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake" @ONLY) endif() -# Ignore the C# extension DLL in bin/ -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 4b6c322df983f8..a1c7a0d7a907fa 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "grpc", - "version-semver": "1.44.0", - "port-version": 1, + "version-semver": "1.46.3", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", @@ -38,7 +37,7 @@ ], "features": { "absl-sync": { - "description": "Use abseil synchronization module" + "description": "Deprecated." }, "codegen": { "description": "Build code generator machinery" diff --git a/ports/upb/0001-make-cmakelists-py.patch b/ports/upb/0001-make-cmakelists-py.patch new file mode 100644 index 00000000000000..f0b73a50150d4a --- /dev/null +++ b/ports/upb/0001-make-cmakelists-py.patch @@ -0,0 +1,137 @@ +diff --git a/cmake/make_cmakelists.py b/cmake/make_cmakelists.py +index d64c14f..12226cf 100755 +--- a/cmake/make_cmakelists.py ++++ b/cmake/make_cmakelists.py +@@ -316,10 +316,132 @@ class Converter(object): + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") + endif() + ++ if (MSVC) ++ add_compile_options(/wd4146 /wd4703 -D_CRT_SECURE_NO_WARNINGS) ++ endif() ++ + enable_testing() + ++ set(CMAKE_CXX_STANDARD 11) ++ ++ if (VCPKG_UPB_BUILD_CODEGEN) ++ find_package(absl CONFIG REQUIRED) ++ find_package(protobuf CONFIG REQUIRED) ++ ++ if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++ endif() ++ endif() ++ ++ add_library(descriptor_upb_proto) ++ ++ add_library(utf8_range ++ ../third_party/utf8_range/naive.c ++ ../third_party/utf8_range/range2-neon.c ++ ../third_party/utf8_range/range2-sse.c ++ ../third_party/utf8_range/utf8_range.h ++ ) ++ + %(toplevel)s + ++ set(UPB_DESCRIPTOR_PROTO "${VCPKG_UPB_HOST_INCLUDE_DIR}/google/protobuf/descriptor.proto") ++ if (VCPKG_UPB_BUILD_CODEGEN) ++ set(UPB_CODEGEN_TARGETS protoc-gen-upb protoc-gen-upbdefs) ++ ++ add_executable(protoc-gen-upbdefs ++ ../upbc/common.h ++ ../upbc/common.cc ++ ../upbc/protoc-gen-upbdefs.cc ++ ) ++ target_link_libraries(protoc-gen-upbdefs PRIVATE ++ absl::flat_hash_map ++ absl::strings ++ protobuf::libprotobuf ++ protobuf::libprotoc ++ ) ++ ++ add_executable(protoc-gen-upb ++ ../upbc/common.h ++ ../upbc/common.cc ++ ../upbc/protoc-gen-upb.cc ++ ) ++ target_link_libraries(protoc-gen-upb PRIVATE ++ mini_table ++ port ++ upb ++ absl::flat_hash_map ++ absl::flat_hash_set ++ absl::strings ++ protobuf::libprotobuf ++ protobuf::libprotoc ++ ) ++ ++ set(PROTOC_PROGRAM "\$") ++ set(PROTOC_GEN_UPB_PROGRAM "\$") ++ set(PROTOC_GEN_UPBDEFS_PROGRAM "\$") ++ else() ++ find_program(PROTOC_PROGRAM protoc) ++ find_program(PROTOC_GEN_UPB_PROGRAM protoc-gen-upb) ++ find_program(PROTOC_GEN_UPBDEFS_PROGRAM protoc-gen-upbdefs) ++ endif() ++ ++ set(UPB_DESCRIPTOR_SOURCES ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.h" ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upb.c" ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.h" ++ "${CMAKE_CURRENT_BINARY_DIR}/google/protobuf/descriptor.upbdefs.c" ++ ) ++ ++ add_custom_command( ++ OUTPUT ${UPB_DESCRIPTOR_SOURCES} ++ DEPENDS "${UPB_DESCRIPTOR_PROTO}" ++ COMMAND ++ "${PROTOC_PROGRAM}" ++ "-I${VCPKG_UPB_HOST_INCLUDE_DIR}" ++ "--plugin=protoc-gen-upb=${PROTOC_GEN_UPB_PROGRAM}" ++ "--plugin=protoc-gen-upbdefs=${PROTOC_GEN_UPBDEFS_PROGRAM}" ++ "--upb_out=${CMAKE_CURRENT_BINARY_DIR}" ++ "--upbdefs_out=${CMAKE_CURRENT_BINARY_DIR}" ++ "${UPB_DESCRIPTOR_PROTO}" ++ ) ++ ++ target_sources(descriptor_upb_proto PRIVATE ${UPB_DESCRIPTOR_SOURCES}) ++ ++ set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) ++ set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) ++ set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) ++ set_target_properties(json PROPERTIES OUTPUT_NAME upb_json) ++ set_target_properties(utf8_range PROPERTIES OUTPUT_NAME upb_utf8_range) ++ set_target_properties(mini_table PROPERTIES OUTPUT_NAME upb_mini_table) ++ ++ install( ++ DIRECTORY ../upb ++ DESTINATION include ++ FILES_MATCHING ++ PATTERN "*.h" ++ PATTERN "*.hpp" ++ PATTERN "*.inc" ++ PATTERN "*.int.h" ++ ) ++ target_include_directories(upb PUBLIC $) ++ install(TARGETS ++ upb ++ utf8_range ++ fastdecode ++ json ++ port ++ table ++ descriptor_upb_proto ++ reflection ++ textformat ++ mini_table_internal ++ mini_table ++ ${UPB_CODEGEN_TARGETS} ++ EXPORT upb-config ++ ) ++ install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb) ++ + """) + + data = {} diff --git a/ports/upb/0002-fix-uwp.patch b/ports/upb/0002-fix-uwp.patch new file mode 100644 index 00000000000000..0b0b712dd1de96 --- /dev/null +++ b/ports/upb/0002-fix-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/upb/json_decode.c b/upb/json_decode.c +index c4698f0..20226f5 100644 +--- a/upb/json_decode.c ++++ b/upb/json_decode.c +@@ -1217,7 +1217,7 @@ static void jsondec_struct(jsondec* d, upb_Message* msg, + static void jsondec_wellknownvalue(jsondec* d, upb_Message* msg, + const upb_MessageDef* m) { + upb_MessageValue val; +- const upb_FieldDef* f; ++ const upb_FieldDef* f = 0; + upb_Message* submsg; + + switch (jsondec_peek(d)) { diff --git a/ports/upb/add-all-libs-target.patch b/ports/upb/add-all-libs-target.patch deleted file mode 100644 index 9a6a6d24272ccf..00000000000000 --- a/ports/upb/add-all-libs-target.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index b4f43f9..c90968f 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -137,4 +137,20 @@ add_library(table INTERFACE) - target_link_libraries(table INTERFACE - port) - -+add_library(all_libs INTERFACE) -+target_link_libraries(all_libs -+ INTERFACE -+ upb -+ fastdecode -+ utf8_range -+ json -+ port -+ table -+ descriptor_upb_proto -+ reflection -+ textformat -+) -+set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) -+set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) -+set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) - diff --git a/ports/upb/add-cmake-install.patch b/ports/upb/add-cmake-install.patch deleted file mode 100644 index 51e740d0350ea7..00000000000000 --- a/ports/upb/add-cmake-install.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index c90968f..50637ec 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -8,7 +8,7 @@ else() - cmake_policy(VERSION 3.12) - endif() - --cmake_minimum_required (VERSION 3.0) -+cmake_minimum_required (VERSION 3.14) - cmake_policy(SET CMP0048 NEW) - - project(upb) -@@ -154,3 +154,27 @@ set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) - set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) - set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) - -+install( -+ DIRECTORY ../upb -+ DESTINATION include -+ FILES_MATCHING -+ PATTERN "*.h" -+ PATTERN "*.hpp" -+ PATTERN "*.inc" -+ PATTERN "*.int.h" -+) -+target_include_directories(upb PUBLIC $) -+install(TARGETS -+ upb -+ utf8_range -+ fastdecode -+ json -+ port -+ table -+ descriptor_upb_proto -+ reflection -+ textformat -+ all_libs -+ EXPORT upb-config -+) -+install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb) diff --git a/ports/upb/fix-cmakelists.patch b/ports/upb/fix-cmakelists.patch deleted file mode 100644 index 2a01d62cc52d50..00000000000000 --- a/ports/upb/fix-cmakelists.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 6b4c50d..b4f43f9 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -66,6 +66,10 @@ endif() - enable_testing() - - add_library(port INTERFACE) -+add_library(descriptor_upb_proto INTERFACE) -+add_library(utf8_range -+ ../third_party/utf8_range/utf8_range.c -+ ../third_party/utf8_range/utf8_range.h) - add_library(upb - ../upb/decode.c - ../upb/decode_internal.h -@@ -84,7 +88,7 @@ add_library(upb - target_link_libraries(upb - fastdecode - port -- /third_party/utf8_range) -+ utf8_range) - add_library(fastdecode - ../upb/decode.h - ../upb/decode_internal.h -@@ -96,7 +100,7 @@ add_library(fastdecode - target_link_libraries(fastdecode - port - table -- /third_party/utf8_range) -+ utf8_range) - add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE) - target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE - table diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch deleted file mode 100644 index c681fa336a7a88..00000000000000 --- a/ports/upb/fix-uwp.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index a6b432f..003615e 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -59,6 +59,10 @@ elseif(UNIX) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") - endif() - -+if (MSVC) -+ add_compile_options(/wd4146 /wd4703 -D_CRT_SECURE_NO_WARNINGS) -+endif() -+ - enable_testing() - - add_library(port INTERFACE) -diff --git a/upb/json_decode.c b/upb/json_decode.c -index bb33744..1fadd26 100644 ---- a/upb/json_decode.c -+++ b/upb/json_decode.c -@@ -1160,7 +1160,7 @@ static void jsondec_struct(jsondec *d, upb_msg *msg, const upb_msgdef *m) { - static void jsondec_wellknownvalue(jsondec *d, upb_msg *msg, - const upb_msgdef *m) { - upb_msgval val; -- const upb_fielddef *f; -+ const upb_fielddef *f = NULL; - upb_msg *submsg; - - switch (jsondec_peek(d)) { diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake index d7cdef2451cc50..93bcbc1a5d3353 100644 --- a/ports/upb/portfile.cmake +++ b/ports/upb/portfile.cmake @@ -3,24 +3,55 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/upb - REF 160625a9728b4031a21ad1e1c0146ea2c3a851eb # 2021-10-19 - SHA512 13b205dd4278600e6ec05c829dc6c7e449747cccb118a3b83abc0ab5ef0ab180feb364ac84da8075471697fbba798ed3d9d763934d7fe9a64ac0560f5f9d3e83 + REF bef53686ec702607971bd3ea4d4fefd80c6cc6e8 # 2022-04-04 + SHA512 3801625827a5511ab28e047d7111e6f43d522872eef929b61d7a64fdb9fff7a058af45fd55bd409610c07c735f50a2f6f45ad611bb5e4ee86cd656b89f0a8278 HEAD_REF master PATCHES - fix-uwp.patch - fix-cmakelists.patch - add-all-libs-target.patch - add-cmake-install.patch + 0001-make-cmakelists-py.patch + 0002-fix-uwp.patch ) +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_execute_required_process( + COMMAND "${PYTHON3}" "${SOURCE_PATH}/cmake/make_cmakelists.py" "cmake/CMakeLists.txt" + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME make_cmakelists) + +vcpkg_replace_string("${SOURCE_PATH}/cmake/CMakeLists.txt" "/third_party/utf8_range)" "utf8_range)") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + codegen VCPKG_UPB_BUILD_CODEGEN +) + +if(NOT VCPKG_UPB_BUILD_CODEGEN) + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf" "${CURRENT_HOST_INSTALLED_DIR}/tools/upb") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}/cmake" + OPTIONS ${FEATURE_OPTIONS} + "-DVCPKG_UPB_HOST_INCLUDE_DIR=${CURRENT_HOST_INSTALLED_DIR}/include" ) -vcpkg_cmake_install() +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_cmake_config_fixup() -vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") +if (VCPKG_UPB_BUILD_CODEGEN) + vcpkg_copy_tools( + AUTO_CLEAN + TOOL_NAMES + protoc-gen-upbdefs + protoc-gen-upb + ) +else() + configure_file("${CMAKE_CURRENT_LIST_DIR}/upb-config-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/upb/upb-config-vcpkg-tools.cmake" @ONLY) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/upb/fuzz" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/upb/upb-config-vcpkg-tools.cmake b/ports/upb/upb-config-vcpkg-tools.cmake new file mode 100644 index 00000000000000..cd5f21ff614ba2 --- /dev/null +++ b/ports/upb/upb-config-vcpkg-tools.cmake @@ -0,0 +1,10 @@ +file(GLOB UPB_PLUGINS "${_IMPORT_PREFIX}/../@HOST_TRIPLET@/tools/upb/protoc-gen-upb*") + +foreach(PLUGIN ${UPB_PLUGINS}) + get_filename_component(PLUGIN_NAME "${PLUGIN}" NAME_WE) + add_executable(upb::${PLUGIN_NAME} IMPORTED) + set_property(TARGET upb::${PLUGIN_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(upb::${PLUGIN_NAME} PROPERTIES + IMPORTED_LOCATION_RELEASE "${PLUGIN}" + ) +endforeach() diff --git a/ports/upb/vcpkg.json b/ports/upb/vcpkg.json index 2f9c034125e43b..24a64398bfb8c4 100644 --- a/ports/upb/vcpkg.json +++ b/ports/upb/vcpkg.json @@ -1,9 +1,17 @@ { "name": "upb", - "version-date": "2021-10-19", + "version-date": "2022-04-04", "description": "μpb (often written 'upb') is a small protobuf implementation written in C.", "homepage": "https://github.com/protocolbuffers/upb/", + "license": "BSD-2-Clause", "dependencies": [ + { + "name": "upb", + "host": true, + "features": [ + "codegen" + ] + }, { "name": "vcpkg-cmake", "host": true @@ -12,5 +20,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "codegen": { + "description": "Build code generator machinery", + "dependencies": [ + "abseil", + "protobuf" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 0bf48c1cd722e4..745ca1295116ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2689,8 +2689,8 @@ "port-version": 0 }, "grpc": { - "baseline": "1.44.0", - "port-version": 1 + "baseline": "1.46.3", + "port-version": 0 }, "grppi": { "baseline": "0.4.0", @@ -7309,7 +7309,7 @@ "port-version": 0 }, "upb": { - "baseline": "2021-10-19", + "baseline": "2022-04-04", "port-version": 0 }, "urdfdom": { diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 9d3262ff4b7e52..a3968ca625c68f 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dabbbee8a5b79662990efb664c6975e2ea548599", + "version-semver": "1.46.3", + "port-version": 0 + }, { "git-tree": "6b15dbb6b2a6f81d7ae885b5b8f273b729b8d0ba", "version-semver": "1.44.0", diff --git a/versions/u-/upb.json b/versions/u-/upb.json index 50641b629ed261..755b43a83265a4 100644 --- a/versions/u-/upb.json +++ b/versions/u-/upb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de1d8718e4ea42428b87f4275352c4f3bbb6ac11", + "version-date": "2022-04-04", + "port-version": 0 + }, { "git-tree": "7c61b435b6136ae6539c3991b9f6b81bfd6811dc", "version-date": "2021-10-19", From ce9dc455efeb0ac0739b75cfdf0e54bab0e9dc64 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 14 Jul 2022 14:12:01 -0700 Subject: [PATCH 125/791] [google-cloud-cpp] update to latest release (v2.0.0) (#25608) * [google-cloud-cpp] update to latest release (v2.0.0) * Disable `channel` and `asset` features on Windows Protobuf <= 3.19 does not know about the `TRUE` and `DOMAIN` macros on Windows, so it cannot hide said macros when used as enum values in a proto file. vcpkg uses protobuf==3.19.4 * Fix formatting * Fix versions --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- .../google-cloud-cpp/support_absl_cxx17.patch | 20 +++++++++---------- ports/google-cloud-cpp/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index f3d0c59fd4d939..34d936afeecc1d 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.42.0 - SHA512 a4220aa4388bc3a1f3e24268c65193b6b01632fe661e952e8eaf898933e2bdc6e4f2254c5d1cc23b0853d8fbeb6de0510aa14f63b39d70d28b6430432430e468 + REF v2.0.0 + SHA512 9843c6b739c556be27e5e355b915ffdfa946a9e0a139da8b3a03a8c0abe6beb9088cfc0ba5c6fce1e32acbbce8384ffe59a752213c4bcec4c65a5b3ca8a9baf1 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/support_absl_cxx17.patch b/ports/google-cloud-cpp/support_absl_cxx17.patch index 5697fd3a99a9ee..61de927ba56516 100644 --- a/ports/google-cloud-cpp/support_absl_cxx17.patch +++ b/ports/google-cloud-cpp/support_absl_cxx17.patch @@ -1,9 +1,9 @@ -diff --git a//CMakeLists.txt b/CMakeLists.txt -index 4d03fee..42bb13c 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a0d07d1..18320b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,14 @@ if (APPLE AND NOT DEFINED CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 14) endif () +find_package(absl CONFIG REQUIRED) @@ -15,18 +15,18 @@ index 4d03fee..42bb13c 100644 +endif () + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3) message( diff --git a/google/cloud/internal/port_platform.h b/google/cloud/internal/port_platform.h -index f02cb7a..0ea8c9c 100644 +index b61eb48..327278f 100644 --- a/google/cloud/internal/port_platform.h +++ b/google/cloud/internal/port_platform.h @@ -49,6 +49,8 @@ - // Abort compilation if the compiler does not support C++11. - #if GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L - # error "C++11 or newer is required" + // Abort compilation if the compiler does not support C++14. + #if GOOGLE_CLOUD_CPP_CPP_VERSION < 201402L + # error "C++14 or newer is required" +#elif defined(ABSL_USE_CXX17) && GOOGLE_CLOUD_CPP_CPP_VERSION < 201703L +# error "Compiled to use Abseil with C++17 support, but using with C++ < C++17" - #endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201103L + #endif // GOOGLE_CLOUD_CPP_CPP_VERSION < 201402L - // Abort the build if the version of the compiler is too old. With CMake we + // Abort the build if the version of the compiler is too old. This simplifies diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 73b8c184f3703a..73364ce702e3e4 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.42.0", + "version": "2.0.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -99,6 +99,7 @@ }, "asset": { "description": "Cloud Asset API C++ Client Library", + "supports": "!windows", "dependencies": [ { "name": "google-cloud-cpp", @@ -183,6 +184,7 @@ }, "channel": { "description": "Cloud Channel API C++ Client Library", + "supports": "!windows", "dependencies": [ { "name": "google-cloud-cpp", diff --git a/versions/baseline.json b/versions/baseline.json index 745ca1295116ba..681883755512f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2633,7 +2633,7 @@ "port-version": 0 }, "google-cloud-cpp": { - "baseline": "1.42.0", + "baseline": "2.0.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 9a0c26e1dd9d67..93391e88896b26 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71a72e78da707ee567b96bc835cf25cd8e8eb975", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "95315156a8c6fefdde56b6c4718062975ff7e0ce", "version": "1.42.0", From c05e96fe7e444f9c95dca74bd9a4459c4b7b6ccb Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Fri, 15 Jul 2022 05:27:57 +0800 Subject: [PATCH 126/791] [gdk-pixbuf] fix bug for cross build (#25689) * Fix build failure for cross-compiling * update port version database * Fix build failure for windows. * update port version * update port version database * Adjust logic to remove gdk-pixbuf-thumbnailer. * update port version database * [gtk] Fix build failure for windows * update port version database * ci's down, just force it to rerun. * Revert "ci's down, just force it to rerun." This reverts commit 6d1040207f93869598019aef7cba4e49a1168efd. * Update gdk-pixbuf.json * overwrite port version * update port version database * Update gdk-pixbuf.json Co-authored-by: Jamlys Lee Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> --- ports/gdk-pixbuf/portfile.cmake | 10 +++++++++- ports/gdk-pixbuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdk-pixbuf.json | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 64d541833ca020..f084b6d976d117 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -59,7 +59,15 @@ vcpkg_fixup_pkgconfig() set(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer) -if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_TARGET_IS_WINDOWS) +# gdk-pixbuf-thumbnailer is not compiled for cross-compiling +set(IS_NEED_REMOVE_THUMBNAILER ${VCPKG_CROSSCOMPILING}) +# This adjusting logic might be place in vcpkg_common_definitions.cmake. +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64") + set(IS_NEED_REMOVE_THUMBNAILER false) + endif() +endif() +if(IS_NEED_REMOVE_THUMBNAILER) list(REMOVE_ITEM TOOL_NAMES gdk-pixbuf-thumbnailer) endif() diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index 8151baa5ffe686..7d28530fdb8c52 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdk-pixbuf", "version": "2.42.8", - "port-version": 2, + "port-version": 3, "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 681883755512f1..5b84849dbcc1ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2486,7 +2486,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.8", - "port-version": 2 + "port-version": 3 }, "gemmlowp": { "baseline": "2021-09-28", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 38fea4b466be6f..5acd6f7b1d7371 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6662972ebf092397b1d94122ecfc754f0b81eeee", + "version": "2.42.8", + "port-version": 3 + }, { "git-tree": "2e82cf35eb436a674fdbdfa12cce69e629c83bf4", "version": "2.42.8", From 3a6ad4bc7ae8bfaf517d15370491818ca5020966 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 15 Jul 2022 05:56:20 +0800 Subject: [PATCH 127/791] [evpp] Add static/shared handling and export unofficial config and target file (#25641) * [evpp] Export unofficial config and target file * x-add-version * Update patch * x-add-version evpp --overwrite-version * update patch * x-add-version * Add CONFIG in find_dependency() * Modify patch * separate patch * Update path Co-authored-by: Cheney-Wang --- ports/evpp/Add-static-shared-handling.patch | 98 ++++++++++++ ports/evpp/Export-unofficial-target.patch | 168 ++++++++++++++++++++ ports/evpp/portfile.cmake | 18 ++- ports/evpp/vcpkg.json | 20 ++- versions/baseline.json | 2 +- versions/e-/evpp.json | 5 + 6 files changed, 295 insertions(+), 16 deletions(-) create mode 100644 ports/evpp/Add-static-shared-handling.patch create mode 100644 ports/evpp/Export-unofficial-target.patch diff --git a/ports/evpp/Add-static-shared-handling.patch b/ports/evpp/Add-static-shared-handling.patch new file mode 100644 index 00000000000000..f597bfe70b1e60 --- /dev/null +++ b/ports/evpp/Add-static-shared-handling.patch @@ -0,0 +1,98 @@ +diff --git a/apps/evmc/CMakeLists.txt b/apps/evmc/CMakeLists.txt +index 9918919..f8cffa7 100644 +--- a/apps/evmc/CMakeLists.txt ++++ b/apps/evmc/CMakeLists.txt +@@ -9,6 +9,7 @@ add_library(evmc_static STATIC ${evmc_SRCS}) + target_link_libraries(evmc_static ${LIBRARIES}) + + if (UNIX) ++ if(BUILD_SHARED_LIBS) + add_library(evmc SHARED ${evmc_SRCS}) + target_link_libraries(evmc ${LIBRARIES}) + +@@ -25,6 +26,7 @@ if (UNIX) + TARGETS evmc + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) ++ endif() + endif (UNIX) + + install ( +diff --git a/apps/evnsq/CMakeLists.txt b/apps/evnsq/CMakeLists.txt +index c510814..65f15cd 100644 +--- a/apps/evnsq/CMakeLists.txt ++++ b/apps/evnsq/CMakeLists.txt +@@ -5,6 +5,7 @@ add_library(evnsq_static STATIC ${evnsq_SRCS}) + target_link_libraries(evnsq_static ${LIBRARIES}) + + if (UNIX) ++ if(BUILD_SHARED_LIBS) + add_library(evnsq SHARED ${evnsq_SRCS}) + target_link_libraries(evnsq ${LIBRARIES}) + +@@ -21,6 +22,7 @@ if (UNIX) + TARGETS evnsq + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) ++ endif() + endif (UNIX) + + install ( +diff --git a/evpp/CMakeLists.txt b/evpp/CMakeLists.txt +index 031659f..c16d708 100644 +--- a/evpp/CMakeLists.txt ++++ b/evpp/CMakeLists.txt +@@ -22,24 +22,19 @@ target_link_libraries(evpp_lite_static ${DEPENDENT_LIBRARIES}) + target_compile_features(evpp_lite_static PRIVATE cxx_std_11) + + if (UNIX) ++ if(BUILD_SHARED_LIBS) + add_library(evpp SHARED ${evpp_SRCS}) + target_link_libraries(evpp ${DEPENDENT_LIBRARIES}) + + # boost lockfree queue + add_library(evpp_boost SHARED ${evpp_SRCS}) +- add_library(evpp_boost_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_boost PRIVATE -DH_HAVE_BOOST=1) +- target_compile_definitions(evpp_boost_static PRIVATE -DH_HAVE_BOOST=1) + target_link_libraries(evpp_boost ${DEPENDENT_LIBRARIES}) +- target_link_libraries(evpp_boost_static ${DEPENDENT_LIBRARIES}) + + # https://github.com/cameron314/concurrentqueue + add_library(evpp_concurrentqueue SHARED ${evpp_SRCS}) +- add_library(evpp_concurrentqueue_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_concurrentqueue PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) +- target_compile_definitions(evpp_concurrentqueue_static PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) + target_link_libraries(evpp_concurrentqueue ${DEPENDENT_LIBRARIES}) +- target_link_libraries(evpp_concurrentqueue_static ${DEPENDENT_LIBRARIES}) + + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) +@@ -51,11 +46,26 @@ if (UNIX) + ) + + install ( +- TARGETS evpp evpp_static evpp_lite_static evpp_boost evpp_boost_static evpp_concurrentqueue evpp_concurrentqueue_static ++ TARGETS evpp evpp_boost evpp_concurrentqueue + EXPORT ${PACKAGE_NAME} + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) ++ else() ++ add_library(evpp_boost_static STATIC ${evpp_SRCS}) ++ target_compile_definitions(evpp_boost_static PRIVATE -DH_HAVE_BOOST=1) ++ target_link_libraries(evpp_boost_static ${DEPENDENT_LIBRARIES}) ++ ++ add_library(evpp_concurrentqueue_static STATIC ${evpp_SRCS}) ++ target_compile_definitions(evpp_concurrentqueue_static PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) ++ target_link_libraries(evpp_concurrentqueue_static ${DEPENDENT_LIBRARIES}) ++ ++ install ( ++ TARGETS evpp_static evpp_lite_static evpp_boost_static evpp_concurrentqueue_static ++ EXPORT ${PACKAGE_NAME} ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ endif() + + else (UNIX) + install ( diff --git a/ports/evpp/Export-unofficial-target.patch b/ports/evpp/Export-unofficial-target.patch new file mode 100644 index 00000000000000..dfe7c82bbc9b3a --- /dev/null +++ b/ports/evpp/Export-unofficial-target.patch @@ -0,0 +1,168 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d325df7..772da36 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,3 +88,17 @@ include (packages) + + include (CPack) + include (CTest) ++ ++install(EXPORT unofficial-evpp-target ++ FILE unofficial-evpp-target.cmake ++ NAMESPACE unofficial::evpp:: ++ DESTINATION share/unofficial-evpp ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-evpp-config.cmake" ++[[include(CMakeFindDependencyMacro) ++find_dependency(glog CONFIG) ++find_dependency(Libevent CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-evpp-target.cmake") ++]]) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-evpp-config.cmake DESTINATION "share/unofficial-evpp") +\ No newline at end of file +diff --git a/apps/evmc/CMakeLists.txt b/apps/evmc/CMakeLists.txt +index f8cffa7..91663d6 100644 +--- a/apps/evmc/CMakeLists.txt ++++ b/apps/evmc/CMakeLists.txt +@@ -7,12 +7,13 @@ file(GLOB evmc_PUBLIC_HEADERS *.h) + + add_library(evmc_static STATIC ${evmc_SRCS}) + target_link_libraries(evmc_static ${LIBRARIES}) ++target_include_directories(evmc_static INTERFACE $) + + if (UNIX) + if(BUILD_SHARED_LIBS) + add_library(evmc SHARED ${evmc_SRCS}) + target_link_libraries(evmc ${LIBRARIES}) +- ++ target_include_directories(evmc INTERFACE $) + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) + include (packages) +@@ -24,6 +25,8 @@ if (UNIX) + + install ( + TARGETS evmc ++ EXPORT unofficial-evpp-target ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + endif() +@@ -31,6 +34,7 @@ endif (UNIX) + + install ( + TARGETS evmc_static ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + install (FILES ${evmc_PUBLIC_HEADERS} DESTINATION "include/evmc") +diff --git a/apps/evnsq/CMakeLists.txt b/apps/evnsq/CMakeLists.txt +index 65f15cd..7c9fbf5 100644 +--- a/apps/evnsq/CMakeLists.txt ++++ b/apps/evnsq/CMakeLists.txt +@@ -3,12 +3,13 @@ file(GLOB evnsq_PUBLIC_HEADERS *.h) + + add_library(evnsq_static STATIC ${evnsq_SRCS}) + target_link_libraries(evnsq_static ${LIBRARIES}) ++target_include_directories(evnsq_static INTERFACE $) + + if (UNIX) + if(BUILD_SHARED_LIBS) + add_library(evnsq SHARED ${evnsq_SRCS}) + target_link_libraries(evnsq ${LIBRARIES}) +- ++ target_include_directories(evnsq INTERFACE $) + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) + include (packages) +@@ -20,6 +21,8 @@ if (UNIX) + + install ( + TARGETS evnsq ++ EXPORT unofficial-evpp-target ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + endif() +@@ -27,6 +30,7 @@ endif (UNIX) + + install ( + TARGETS evnsq_static ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + install (FILES ${evnsq_PUBLIC_HEADERS} DESTINATION "include/evnsq") +diff --git a/evpp/CMakeLists.txt b/evpp/CMakeLists.txt +index c16d708..1c17f04 100644 +--- a/evpp/CMakeLists.txt ++++ b/evpp/CMakeLists.txt +@@ -16,26 +16,28 @@ include_directories(${PROJECT_SOURCE_DIR}) + add_library(evpp_static STATIC ${evpp_SRCS}) + target_link_libraries(evpp_static ${DEPENDENT_LIBRARIES}) + target_compile_features(evpp_static PRIVATE cxx_std_11) ++target_include_directories(evpp_static INTERFACE $) + + add_library(evpp_lite_static STATIC ${evpp_lite_SRCS}) + target_link_libraries(evpp_lite_static ${DEPENDENT_LIBRARIES}) + target_compile_features(evpp_lite_static PRIVATE cxx_std_11) ++target_include_directories(evpp_lite_static INTERFACE $) + + if (UNIX) + if(BUILD_SHARED_LIBS) + add_library(evpp SHARED ${evpp_SRCS}) + target_link_libraries(evpp ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp INTERFACE $) + # boost lockfree queue + add_library(evpp_boost SHARED ${evpp_SRCS}) + target_compile_definitions(evpp_boost PRIVATE -DH_HAVE_BOOST=1) + target_link_libraries(evpp_boost ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_boost INTERFACE $) + # https://github.com/cameron314/concurrentqueue + add_library(evpp_concurrentqueue SHARED ${evpp_SRCS}) + target_compile_definitions(evpp_concurrentqueue PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) + target_link_libraries(evpp_concurrentqueue ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_concurrentqueue INTERFACE $) + set (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + include (utils) + include (packages) +@@ -47,7 +49,7 @@ if (UNIX) + + install ( + TARGETS evpp evpp_boost evpp_concurrentqueue +- EXPORT ${PACKAGE_NAME} ++ EXPORT unofficial-evpp-target + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +@@ -55,14 +57,14 @@ if (UNIX) + add_library(evpp_boost_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_boost_static PRIVATE -DH_HAVE_BOOST=1) + target_link_libraries(evpp_boost_static ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_boost_static INTERFACE $) + add_library(evpp_concurrentqueue_static STATIC ${evpp_SRCS}) + target_compile_definitions(evpp_concurrentqueue_static PRIVATE -DH_HAVE_CAMERON314_CONCURRENTQUEUE=1) + target_link_libraries(evpp_concurrentqueue_static ${DEPENDENT_LIBRARIES}) +- ++ target_include_directories(evpp_concurrentqueue_static INTERFACE $) + install ( + TARGETS evpp_static evpp_lite_static evpp_boost_static evpp_concurrentqueue_static +- EXPORT ${PACKAGE_NAME} ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + endif() +@@ -70,8 +72,7 @@ if (UNIX) + else (UNIX) + install ( + TARGETS evpp_static evpp_lite_static +- EXPORT ${PACKAGE_NAME} +- RUNTIME DESTINATION bin ++ EXPORT unofficial-evpp-target + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + diff --git a/ports/evpp/portfile.cmake b/ports/evpp/portfile.cmake index cad762aad22f8d..0a930d18c32d5e 100644 --- a/ports/evpp/portfile.cmake +++ b/ports/evpp/portfile.cmake @@ -11,20 +11,24 @@ vcpkg_from_github( fix-linux-build.patch fix-osx-build.patch compile-features.patch + Add-static-shared-handling.patch + Export-unofficial-target.patch ) -file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/rapidjson ${SOURCE_PATH}/3rdparty/concurrentqueue) +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/rapidjson" "${SOURCE_PATH}/3rdparty/concurrentqueue") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DEVPP_VCPKG_BUILD=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-evpp) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/evpp/vcpkg.json b/ports/evpp/vcpkg.json index 9f5770986807c1..f3837e7283fc86 100644 --- a/ports/evpp/vcpkg.json +++ b/ports/evpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "evpp", "version": "0.7.0", - "port-version": 6, + "port-version": 7, "description": "A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols.", "homepage": "https://github.com/Qihoo360/evpp", + "license": "BSD-3-Clause", "dependencies": [ { "name": "boost-lockfree", @@ -14,17 +15,20 @@ "platform": "!windows" }, "glog", - { - "name": "libevent", - "platform": "windows" - }, { "name": "libevent", "features": [ "openssl" - ], - "platform": "!windows" + ] }, - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5b84849dbcc1ba..23cb3d7b746a50 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2134,7 +2134,7 @@ }, "evpp": { "baseline": "0.7.0", - "port-version": 6 + "port-version": 7 }, "exiv2": { "baseline": "0.27.5", diff --git a/versions/e-/evpp.json b/versions/e-/evpp.json index 435d70e2a2502a..5b08574dae1d7a 100644 --- a/versions/e-/evpp.json +++ b/versions/e-/evpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "419e928841663bb077cd215aa89bd022d850640c", + "version": "0.7.0", + "port-version": 7 + }, { "git-tree": "7bcbd80099c9f1551101e9abc91ba7ad4849dd05", "version": "0.7.0", From 8b62d95a81afcb9efe74bebeb62f04c1e0e2a003 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 15 Jul 2022 05:59:34 +0800 Subject: [PATCH 128/791] [Folly] add vcpkg_cmake_wrapper.cmake (#24471) * add vcpkg-cmake-wrapper.cmake * update version * overwrite version * Include all custom cmake module files * update version * update version * overwrite version --- ports/folly/portfile.cmake | 2 ++ ports/folly/vcpkg-cmake-wrapper.cmake | 6 ++++++ ports/folly/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/folly.json | 5 +++++ 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 ports/folly/vcpkg-cmake-wrapper.cmake diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index ad20b5d132ecfc..4f7fdfb31270de 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -67,6 +67,8 @@ vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + vcpkg_cmake_config_fixup() # Release folly-targets.cmake does not link to the right libraries in debug mode. diff --git a/ports/folly/vcpkg-cmake-wrapper.cmake b/ports/folly/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..cce45a2e43e66e --- /dev/null +++ b/ports/folly/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,6 @@ +set(FOLLY_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${FOLLY_PREV_MODULE_PATH}) \ No newline at end of file diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 2c8531cb247392..1b56059cf373b5 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,7 @@ { "name": "folly", "version-string": "2022.03.21.00", - "port-version": 1, + "port-version": 2, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 23cb3d7b746a50..20ae6e11419122 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2322,7 +2322,7 @@ }, "folly": { "baseline": "2022.03.21.00", - "port-version": 1 + "port-version": 2 }, "font-chef": { "baseline": "1.1.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index e432cfa5879603..d3d80f15d88ec4 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d2f0850a514d305b6b3b56833185aaf7f6154e1", + "version-string": "2022.03.21.00", + "port-version": 2 + }, { "git-tree": "c1b11303819bf16b4cde18fdc8e6511b7bb34ed7", "version-string": "2022.03.21.00", From 1782b7edf28f4eb5a3f5d18ef996f778c57a536d Mon Sep 17 00:00:00 2001 From: ROLL Software Brasil Date: Fri, 15 Jul 2022 16:08:22 -0300 Subject: [PATCH 129/791] [secp256k1] Update secp256k1 from 2017 to 2022 (#25398) * Update secp256k1 from 2017 to 2022, that added Schnorr Signature on last year. - Edit CMakeList.txt to target precomputed library. - Edit libsecp256k1-config.h to undef and define VARS compilation. - Edit portfile.cmake to download new sources from repository, commit reference 44c2452fd387f7ca604ab42d73746e7d3a44d8a2 (bitcoin-core/secp256k1) - Edit vcpkg.json to new version portfile * Update secp256k1 from 2017 to 2022, that added Schnorr Signature on last year >> vcpkg x-add-version secp256k1 - Update secp256k1.json version - Update baseline.json version * Update ports/secp256k1/portfile.cmake Added JonLiu1993 suggestion. Put PREFER_NINJA to secp256k1/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/secp256k1/vcpkg.json Added JonLiu1993 suggestion. Put dependencies to secp256k1/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update port-version, REQUIRED to "x-add-version" >> vcpkg x-add-version secp256k1 * Update port file to secp256k1 identation * Update vcpkg.json identation >> vcpkg format-manifest ports/secp256k1/vcpkg.json * Update x-add-version command vcpkg x-add-version secp256k1 * [secp256k1 ]Update secp256k1 from 2017 to 2022 * update version * Add license * update version * Update, add features * version * fix * version * clean port version * version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: JackBoosY --- ports/secp256k1/CMakeLists.txt | 64 +++++++++++++++++++++++--- ports/secp256k1/libsecp256k1-config.h | 29 ------------ ports/secp256k1/portfile.cmake | 47 +++++++++++++------ ports/secp256k1/secp256k1-config.cmake | 1 - ports/secp256k1/vcpkg.json | 24 ++++++++-- versions/baseline.json | 4 +- versions/s-/secp256k1.json | 5 ++ 7 files changed, 119 insertions(+), 55 deletions(-) delete mode 100644 ports/secp256k1/libsecp256k1-config.h delete mode 100644 ports/secp256k1/secp256k1-config.cmake diff --git a/ports/secp256k1/CMakeLists.txt b/ports/secp256k1/CMakeLists.txt index a3af313b6e7109..0f86ca49529be2 100644 --- a/ports/secp256k1/CMakeLists.txt +++ b/ports/secp256k1/CMakeLists.txt @@ -2,34 +2,84 @@ cmake_minimum_required(VERSION 3.8) project(secp256k1 C) option(INSTALL_HEADERS "Install header files" ON) +option(BUILD_TOOLS "Build tools" OFF) +option(BUILD_EXAMPLES "Build examples" OFF) add_definitions( -DENABLE_MODULE_ECDH -DENABLE_MODULE_RECOVERY - -DHAVE_CONFIG_H + -DENABLE_MODULE_EXTRAKEYS + -DENABLE_MODULE_SCHNORRSIG ) file(GLOB SOURCES src/secp256k1.c) add_library(secp256k1 ${SOURCES}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(secp256k1 PUBLIC $ $) -target_include_directories(secp256k1 PUBLIC $ $) +file(GLOB SOURCES_PRECOMP src/precomputed_ecmult.c src/precomputed_ecmult_gen.c) +add_library(secp256k1_precomputed ${SOURCES_PRECOMP}) + +target_include_directories(secp256k1_precomputed PUBLIC $ $) + +if (BUILD_TOOLS) + add_executable(bench src/bench.c) + target_link_libraries(bench PRIVATE secp256k1 secp256k1_precomputed) + + add_executable(bench_internal src/bench_internal.c) + target_link_libraries(bench_internal PRIVATE secp256k1_precomputed) + + add_executable(bench_ecmult src/bench_ecmult.c) + target_link_libraries(bench_ecmult PRIVATE secp256k1_precomputed) + + install(TARGETS bench bench_internal bench_ecmult RUNTIME DESTINATION bin) +endif() + +if (BUILD_EXAMPLES) + add_executable(ecdsa_example examples/ecdsa.c) + target_include_directories(ecdsa_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_link_libraries(ecdsa_example PRIVATE secp256k1 secp256k1_precomputed) + if (WIN32) + target_link_libraries(ecdsa_example PRIVATE Bcrypt) + endif() + + add_executable(ecdh_example examples/ecdh.c) + target_include_directories(ecdh_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_link_libraries(ecdh_example PRIVATE secp256k1 secp256k1_precomputed) + if (WIN32) + target_link_libraries(ecdh_example PRIVATE Bcrypt) + endif() + + add_executable(schnorr_example examples/schnorr.c) + target_include_directories(schnorr_example PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_link_libraries(schnorr_example PRIVATE secp256k1 secp256k1_precomputed) + if (WIN32) + target_link_libraries(schnorr_example PRIVATE Bcrypt) + endif() + + install(TARGETS ecdsa_example ecdh_example schnorr_example RUNTIME DESTINATION bin) +endif() if(INSTALL_HEADERS) file(GLOB HEADERS include/*.h) install(FILES ${HEADERS} DESTINATION include) endif() -install(TARGETS secp256k1 EXPORT unofficial-secp256k1-targets +install(TARGETS secp256k1 EXPORT unofficial-secp256k1-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(TARGETS secp256k1_precomputed EXPORT unofficial-secp256k1-config RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( - EXPORT unofficial-secp256k1-targets - FILE unofficial-secp256k1-targets.cmake + EXPORT unofficial-secp256k1-config + FILE unofficial-secp256k1-config.cmake NAMESPACE unofficial:: DESTINATION share/unofficial-secp256k1 -) \ No newline at end of file +) diff --git a/ports/secp256k1/libsecp256k1-config.h b/ports/secp256k1/libsecp256k1-config.h deleted file mode 100644 index 693d3ed25b015f..00000000000000 --- a/ports/secp256k1/libsecp256k1-config.h +++ /dev/null @@ -1,29 +0,0 @@ -/********************************************************************** - * Copyright (c) 2013, 2014 Pieter Wuille * - * Distributed under the MIT software license, see the accompanying * - * file COPYING or http://www.opensource.org/licenses/mit-license.php.* - **********************************************************************/ - -#ifndef SECP256K1_BASIC_CONFIG_H -#define SECP256K1_BASIC_CONFIG_H - -#undef USE_ASM_X86_64 -#undef USE_ENDOMORPHISM -#undef USE_FIELD_10X26 -#undef USE_FIELD_5X52 -#undef USE_FIELD_INV_BUILTIN -#undef USE_FIELD_INV_NUM -#undef USE_NUM_GMP -#undef USE_NUM_NONE -#undef USE_SCALAR_4X64 -#undef USE_SCALAR_8X32 -#undef USE_SCALAR_INV_BUILTIN -#undef USE_SCALAR_INV_NUM - -#define USE_NUM_NONE 1 -#define USE_FIELD_INV_BUILTIN 1 -#define USE_SCALAR_INV_BUILTIN 1 -#define USE_FIELD_10X26 1 -#define USE_SCALAR_8X32 1 - -#endif /* SECP256K1_BASIC_CONFIG_H */ diff --git a/ports/secp256k1/portfile.cmake b/ports/secp256k1/portfile.cmake index 3bf158816ae426..4c63bebed88b23 100644 --- a/ports/secp256k1/portfile.cmake +++ b/ports/secp256k1/portfile.cmake @@ -2,24 +2,45 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO "bitcoin-core/secp256k1" - REF "0b7024185045a49a1a6a4c5615bf31c94f63d9c4" - SHA512 54e0c446ae63105800dfaf23dc934734f196c91f275db0455e58a36926c29ecc51a13d9b1eb2e45bc86199120c3c472ec7b39086787a49ce388a4df462a870bc + REPO bitcoin-core/secp256k1 + REF 3efeb9da21368c02cad58435b2ccdf6eb4b359c3 + SHA512 6d792943f9277a1b4c36dad62389cb38e0b93efb570b6af6c41afdb936d10ca30d4c2e4e743fc0f113d1f9785891d1e9d1fe224d7b8abd4197a9f5febf0febd6 ) -file(COPY ${CURRENT_PORT_DIR}/libsecp256k1-config.h DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS + examples BUILD_EXAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH "share/unofficial-${PORT}" PACKAGE_NAME unofficial-${PORT}) + +if (BUILD_TOOLS OR BUILD_EXAMPLES) + set(SECP256K1_TOOLS "") + if (BUILD_TOOLS) + list(APPEND SECP256K1_TOOLS bench bench_internal bench_ecmult) + endif() + + if (BUILD_EXAMPLES) + list(APPEND SECP256K1_TOOLS ecdsa_example ecdh_example schnorr_example) + endif() + + vcpkg_copy_tools(TOOL_NAMES ${SECP256K1_TOOLS} AUTO_CLEAN) +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${CMAKE_CURRENT_LIST_DIR}/secp256k1-config.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-secp256k1-config.cmake @ONLY) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/secp256k1/secp256k1-config.cmake b/ports/secp256k1/secp256k1-config.cmake deleted file mode 100644 index 5cc40fe829a9ae..00000000000000 --- a/ports/secp256k1/secp256k1-config.cmake +++ /dev/null @@ -1 +0,0 @@ -include("${CMAKE_CURRENT_LIST_DIR}/unofficial-secp256k1-targets.cmake") diff --git a/ports/secp256k1/vcpkg.json b/ports/secp256k1/vcpkg.json index 43a10ad02447bc..f5c05ffeec8107 100644 --- a/ports/secp256k1/vcpkg.json +++ b/ports/secp256k1/vcpkg.json @@ -1,7 +1,25 @@ { "name": "secp256k1", - "version-string": "2017-19-10", - "port-version": 4, + "version-date": "2022-07-11", "description": "Optimized C library for EC operations on curve", - "homepage": "https://github.com/bitcoin-core/secp256k1" + "homepage": "https://github.com/bitcoin-core/secp256k1", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "examples": { + "description": "Build examples" + }, + "tools": { + "description": "Build tools" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 20ae6e11419122..68e14a5fbf054a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6505,8 +6505,8 @@ "port-version": 3 }, "secp256k1": { - "baseline": "2017-19-10", - "port-version": 4 + "baseline": "2022-07-11", + "port-version": 0 }, "selene": { "baseline": "0.3.1", diff --git a/versions/s-/secp256k1.json b/versions/s-/secp256k1.json index f6b28c37d4afa0..ec3131b275b1bf 100644 --- a/versions/s-/secp256k1.json +++ b/versions/s-/secp256k1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31de2b5d2286595ff7771a30dee3c68d04e78082", + "version-date": "2022-07-11", + "port-version": 0 + }, { "git-tree": "a0ba39af9284d60d41166c4f546975e9f2b2d9df", "version-string": "2017-19-10", From 62763f276b9f72fce653aaa93c50a5610e1c3351 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 15 Jul 2022 12:10:56 -0700 Subject: [PATCH 130/791] [libgd] update to 2.3.3 (#25748) * [libgd] update to 2.3.3 * x-add-version * add license * x-add-version Co-authored-by: LilyWangLL --- ports/libgd/0001-fix-cmake.patch | 38 ++++++++++++------------ ports/libgd/fix_msvc_build.patch | 42 +++------------------------ ports/libgd/intrin.patch | 13 --------- ports/libgd/no-write-source-dir.patch | 14 --------- ports/libgd/portfile.cmake | 19 ++++-------- ports/libgd/vcpkg.json | 4 +-- versions/baseline.json | 4 +-- versions/l-/libgd.json | 5 ++++ 8 files changed, 39 insertions(+), 100 deletions(-) delete mode 100644 ports/libgd/intrin.patch delete mode 100644 ports/libgd/no-write-source-dir.patch diff --git a/ports/libgd/0001-fix-cmake.patch b/ports/libgd/0001-fix-cmake.patch index 4446eb60dd87d4..eec9d982fcd12e 100644 --- a/ports/libgd/0001-fix-cmake.patch +++ b/ports/libgd/0001-fix-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57cd95d..50d5b9a 100644 +index 6b3e5b3..cf80322 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -280,8 +280,10 @@ else (USE_EXT_GD) +@@ -298,8 +298,10 @@ else (USE_EXT_GD) add_subdirectory(src) endif (USE_EXT_GD) @@ -12,10 +12,10 @@ index 57cd95d..50d5b9a 100644 + add_subdirectory(tests) + add_subdirectory(examples) +endif() + add_subdirectory(docs) add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh) - -@@ -298,7 +300,7 @@ else(WIN32) +@@ -317,7 +319,7 @@ else(WIN32) set(CPACK_GENERATOR TGZ) endif(WIN32) @@ -24,7 +24,7 @@ index 57cd95d..50d5b9a 100644 INSTALL(FILES docs/INSTALL DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES docs/README.JPN DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES docs/README.CMAKE DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) -@@ -320,7 +322,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_ +@@ -339,7 +341,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_ INSTALL(FILES examples/tgaread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES examples/tiffread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES examples/windows.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) @@ -34,34 +34,36 @@ index 57cd95d..50d5b9a 100644 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 509c422..97a2976 100644 +index 3839bc7..f7dabf7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -96,7 +96,6 @@ if (BUILD_STATIC_LIBS) +@@ -76,7 +76,7 @@ if (BUILD_STATIC_LIBS) if (UNIX) set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) endif() -endif() ++ if (NOT "${GD_PROGRAMS_LIB_SRC_FILES}" STREQUAL "") add_library(gd_programs_lib STATIC ${GD_PROGRAMS_LIB_SRC_FILES}) -@@ -117,6 +116,7 @@ if (MINGW OR MSYS) - set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) - endif() - endif (MINGW OR MSYS) -+endif() +@@ -90,6 +90,7 @@ if (WIN32 AND NOT MINGW AND NOT MSYS) + endif() - INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src") + ENDIF(WIN32 AND NOT MINGW AND NOT MSYS) ++endif() -@@ -148,6 +148,7 @@ SET(LIBS_PRIVATES + if (MINGW OR MSYS) + ADD_DEFINITIONS("-mms-bitfields") +@@ -127,7 +128,7 @@ SET(LIBS_PRIVATES + ${LIQ_LIBRARIES} ${WEBP_LIBRARIES} ) - +- +if(BUILD_PROGRAMS) set(GD_PROGRAMS gdcmpgif) if (PNG_FOUND) -@@ -177,6 +178,9 @@ foreach(program ${GD_PROGRAMS}) +@@ -168,6 +169,9 @@ foreach(program ${GD_PROGRAMS}) endif() endforeach(program) @@ -71,12 +73,12 @@ index 509c422..97a2976 100644 set(GD_INSTALL_TARGETS ${GD_PROGRAMS}) if (BUILD_SHARED_LIBS) set(GD_INSTALL_TARGETS ${GD_INSTALL_TARGETS} ${GD_LIB}) -@@ -189,7 +193,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} +@@ -180,7 +184,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(PROGRAMS bdftogd DESTINATION bin) + install(FILES - entities.h gd.h + gd_color_map.h diff --git a/ports/libgd/fix_msvc_build.patch b/ports/libgd/fix_msvc_build.patch index e46a81f8965966..d9ad10965a62e5 100644 --- a/ports/libgd/fix_msvc_build.patch +++ b/ports/libgd/fix_msvc_build.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 17ddf6b..7fe1e6b 100644 +index 6b3e5b3..966ddb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,7 @@ else (USE_EXT_GD) +@@ -134,7 +134,7 @@ else (USE_EXT_GD) endif (ENABLE_ICONV) IF (ENABLE_WEBP) @@ -12,10 +12,10 @@ index 17ddf6b..7fe1e6b 100644 IF (ENABLE_HEIF) diff --git a/src/config.h.cmake b/src/config.h.cmake -index 2b46a17..af98d23 100644 +index 0542942..e9cfde1 100644 --- a/src/config.h.cmake +++ b/src/config.h.cmake -@@ -139,3 +139,8 @@ +@@ -142,3 +142,8 @@ /* Version number of package */ #cmakedefine VERSION @@ -25,37 +25,3 @@ index 2b46a17..af98d23 100644 + #define SSIZE_MAX MAXSSIZE_T +#endif \ No newline at end of file -diff --git a/src/gd_intern.h b/src/gd_intern.h -index f8f3b5d..380f4db 100644 ---- a/src/gd_intern.h -+++ b/src/gd_intern.h -@@ -29,6 +29,14 @@ - # endif - #endif - -+#ifdef _MSC_VER -+#define ssize_t SSIZE_T -+#define MAXSIZE_T ((SIZE_T)~ ((SIZE_T)0)) -+#define MAXSSIZE_T ((SSIZE_T) (MAXSIZE_T >> 1)) -+#define MINSSIZE_T ((SSIZE_T)~MAXSSIZE_T) -+#define SSIZE_MAX MAXSSIZE_T -+#endif -+ - #include "gd.h" - - #define MIN(a,b) ((a)<(b)?(a):(b)) -diff --git a/src/getopt.c b/src/getopt.c -index 8651b87..00bccde 100644 ---- a/src/getopt.c -+++ b/src/getopt.c -@@ -33,7 +33,10 @@ - #include - #include - #include -+ -+#ifndef _WIN32 - #include -+#endif - - int opterr = 1, /* if error message should be printed */ - optind = 1, /* index into parent argv vector */ diff --git a/ports/libgd/intrin.patch b/ports/libgd/intrin.patch deleted file mode 100644 index b228773f0b0a3d..00000000000000 --- a/ports/libgd/intrin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c -index ce27220..8895072 100644 ---- a/src/gd_interpolation.c -+++ b/src/gd_interpolation.c -@@ -75,7 +75,7 @@ TODO: - - #ifdef _MSC_VER - # pragma optimize("t", on) --# include -+# include - #endif - - static gdImagePtr gdImageScaleBilinear(gdImagePtr im, diff --git a/ports/libgd/no-write-source-dir.patch b/ports/libgd/no-write-source-dir.patch deleted file mode 100644 index 4cc17dbef092ad..00000000000000 --- a/ports/libgd/no-write-source-dir.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 50d5b9a..17ddf6b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -248,7 +248,8 @@ else (USE_EXT_GD) - CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) - CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) - -- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES) -+ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES) -+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) - - option(BUILD_SHARED_LIBS "Build shared libs" ON) - option(BUILD_STATIC_LIBS "Build static libs" OFF) diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index 4477e791cab7ef..7b7283d71c8e76 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgd/libgd - REF 2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e # gd-2.3.2 - SHA512 c3f2db40f774b44e3fd3fbc743efe70916a71ecd948bf8cb4aeb8a9b9fefd9f17e02d82a9481bac6fcc3624f057b5a308925b4196fb612b65bb7304747d33ffa + REF b5319a41286107b53daa0e08e402aa1819764bdc # gd-2.3.3 + SHA512 b4c6ca1d9575048de35a38b0db69e7380e160293133c1f72ae570f83ce614d4f2fd2615d217f7a0023e2265652c1089561b906beabca56c15e6ec0250e4394b2 HEAD_REF master PATCHES 0001-fix-cmake.patch - no-write-source-dir.patch - intrin.patch fix_msvc_build.patch ) @@ -30,20 +28,15 @@ vcpkg_check_features( fontconfig ENABLE_FONTCONFIG ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(LIBGD_SHARED_LIBS ON) - set(LIBGD_STATIC_LIBS OFF) -else() - set(LIBGD_SHARED_LIBS OFF) - set(LIBGD_STATIC_LIBS ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DLIBGD_SHARED_LIBS=${LIBGD_SHARED_LIBS} - -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS} + -DLIBGD_SHARED_LIBS=${BUILD_SHARED} + -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DBUILD_TEST=OFF ) diff --git a/ports/libgd/vcpkg.json b/ports/libgd/vcpkg.json index 34ae61fac38ec0..c07809ef73fdba 100644 --- a/ports/libgd/vcpkg.json +++ b/ports/libgd/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libgd", - "version-semver": "2.3.2", - "port-version": 1, + "version-semver": "2.3.3", "description": "Open source code library for the dynamic creation of images by programmers.", "homepage": "https://github.com/libgd/libgd", + "license": "GD", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 68e14a5fbf054a..2969020215f264 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3633,8 +3633,8 @@ "port-version": 0 }, "libgd": { - "baseline": "2.3.2", - "port-version": 1 + "baseline": "2.3.3", + "port-version": 0 }, "libgeotiff": { "baseline": "1.7.1", diff --git a/versions/l-/libgd.json b/versions/l-/libgd.json index 9b02569ba0327b..39ae3464fb0e48 100644 --- a/versions/l-/libgd.json +++ b/versions/l-/libgd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2de4ed776a149cb13e64876f1f8d7e241e3291db", + "version-semver": "2.3.3", + "port-version": 0 + }, { "git-tree": "998c59c287a0d8a172944f46fbfce71c8967394f", "version-semver": "2.3.2", From fd69fb296475fb8c5ef5e3daec57258e5c7ba06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Fr=C3=B6hlich?= Date: Fri, 15 Jul 2022 21:16:00 +0200 Subject: [PATCH 131/791] [gul14] Add new port (#25755) * [gul14] Add new port * [gul14] Mark UWP builds as expected to fail * Remove baseline Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/gul14/portfile.cmake | 24 ++++++++++++++++++++++++ ports/gul14/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gul14.json | 9 +++++++++ 4 files changed, 56 insertions(+) create mode 100644 ports/gul14/portfile.cmake create mode 100644 ports/gul14/vcpkg.json create mode 100644 versions/g-/gul14.json diff --git a/ports/gul14/portfile.cmake b/ports/gul14/portfile.cmake new file mode 100644 index 00000000000000..5cc03c7c0728f3 --- /dev/null +++ b/ports/gul14/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gul-cpp/gul14 + REF a6d5612f8074f7defd08de1245fb81ca9866223b # v2.6 as first moved to GitHub + SHA512 4b384252bf5c2fe317d4173bacc59ddc85ebe2fe104909aaf43f537a68879a69f1a271e84b9eed5c79fb1b1c351f744268e542c60c5cb5dace5cd8d1cd663408 + HEAD_REF main +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_install_meson() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_pdbs() + +# Install copyright file +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/license.txt") diff --git a/ports/gul14/vcpkg.json b/ports/gul14/vcpkg.json new file mode 100644 index 00000000000000..7bf6ac3ae37014 --- /dev/null +++ b/ports/gul14/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "gul14", + "version": "2.6", + "description": [ + "General Utility Library for C++14.", + "GUL14 contains often-used utility functions and types that form the foundation for other libraries and programs.", + "It provides basic functionality that is not available in the C++14 standard library, including some backports from later versions of the standard." + ], + "homepage": "https://github.desy.de/gul-cpp/gul14.git", + "documentation": "https://winweb.desy.de/mcs/docs/gul/index.html", + "license": "LGPL-2.1-or-later", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2969020215f264..762c130b769ce5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2744,6 +2744,10 @@ "baseline": "2022-05-05", "port-version": 0 }, + "gul14": { + "baseline": "2.6", + "port-version": 0 + }, "gumbo": { "baseline": "0.10.1", "port-version": 5 diff --git a/versions/g-/gul14.json b/versions/g-/gul14.json new file mode 100644 index 00000000000000..d7c4b807ef2f5e --- /dev/null +++ b/versions/g-/gul14.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7985ecf5f6874b9cf594d43d403820294529d0d3", + "version": "2.6", + "port-version": 0 + } + ] +} From 8bb8b579ac5d48200d6d09083b9225cdd187c4b0 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 16 Jul 2022 03:16:41 +0800 Subject: [PATCH 132/791] [folly] update to v2022.07.11.00 (#25769) * [folly] update to v2022.07.11.00 * update version * [proxygen] update to v2022.07.11.00 * update version * Add License * update version * update version --- ports/folly/fix-abort.patch | 38 ----------------------------------- ports/folly/portfile.cmake | 5 ++--- ports/folly/vcpkg.json | 3 +-- ports/proxygen/portfile.cmake | 4 ++-- ports/proxygen/vcpkg.json | 4 ++-- versions/baseline.json | 8 ++++---- versions/f-/folly.json | 5 +++++ versions/p-/proxygen.json | 5 +++++ 8 files changed, 21 insertions(+), 51 deletions(-) delete mode 100644 ports/folly/fix-abort.patch diff --git a/ports/folly/fix-abort.patch b/ports/folly/fix-abort.patch deleted file mode 100644 index ac2aceb8906834..00000000000000 --- a/ports/folly/fix-abort.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/folly/init/Init.cpp b/folly/init/Init.cpp -index 66ca5cc..2302f10 100644 ---- a/folly/init/Init.cpp -+++ b/folly/init/Init.cpp -@@ -47,6 +47,24 @@ void init(int* argc, char*** argv, bool removeFlags) { - init(argc, argv, options); - } - -+#if FOLLY_USE_SYMBOLIZER -+// Newer versions of glog require the function passed to InstallFailureFunction -+// to be noreturn. But glog spells that in multiple possible ways, depending on -+// platform. But glog's choice of spelling does not match how the -+// noreturn-ability of std::abort is spelled. Some compilers consider this a -+// type mismatch on the function-ptr type. To fix the type mismatch, we wrap -+// std::abort and mimic the condition and the spellings from glog here. -+#if defined(__GNUC__) -+__attribute__((noreturn)) -+#else -+[[noreturn]] -+#endif -+static void -+wrapped_abort() { -+ abort(); -+} -+#endif -+ - void init(int* argc, char*** argv, InitOptions options) { - #if !defined(_WIN32) && !defined(__XROS__) - // Install the handler now, to trap errors received during startup. -@@ -76,7 +94,7 @@ void init(int* argc, char*** argv, InitOptions options) { - - #if FOLLY_USE_SYMBOLIZER - // Don't use glog's DumpStackTraceAndExit; rely on our signal handler. -- google::InstallFailureFunction(abort); -+ google::InstallFailureFunction(wrapped_abort); - - // Actually install the callbacks into the handler. - folly::symbolizer::installFatalSignalCallbacks(); diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 4f7fdfb31270de..6b2585573d66bb 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -8,15 +8,14 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF v2022.03.21.00 - SHA512 4e0fda55f007179883af30024fe1d389642159b1b4c915f7ef1a3c1003c8c52e2370f53ffa79d5fa75533d33becfb946d2bcbb2abdc62b9a297f977403d13dd7 + REF 4ba3bfed38ad14d0951d82b154c44235d380f59b #v2022.07.11.00 + SHA512 d2dd31a42475e564d01a0e7d99b59382f0afd56d89beb189e580b654650d2f9316cbeb459a038f9534881f22efd1571494926c1ea88b827de6ac56317d3c135b HEAD_REF main PATCHES reorder-glog-gflags.patch disable-non-underscore-posix-names.patch boost-1.70.patch fix-windows-minmax.patch - fix-abort.patch ) file(COPY diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 1b56059cf373b5..32f5afda363151 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,6 @@ { "name": "folly", - "version-string": "2022.03.21.00", - "port-version": 2, + "version-string": "2022.07.11.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index d9767e7515b5b5..f8abe645d9e29e 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF v2022.03.21.00 - SHA512 66dfd40e45b884d64be9c06b110caaa9333116c402312ee8eb0c21f0ab569ea31b9e4fb676c68b96730abbff0b74d139f5e39e702cd958c24ce0fe76f353fbe9 + REF 0c932f6c57095838494520ec4ce7243a7f0c1234 #v2022.07.11.00 + SHA512 496189c37be8f42821cb5357e501b02f013858f1917854000777ac5c0403d078837e89dc3eef5f66f30f83c7506e40316d730725d7f97070090ac6549e766093 HEAD_REF master PATCHES remove-register.patch diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json index 223c1775b04009..25080b933846cf 100644 --- a/ports/proxygen/vcpkg.json +++ b/ports/proxygen/vcpkg.json @@ -1,9 +1,9 @@ { "name": "proxygen", - "version-string": "2022.03.21.00", - "port-version": 2, + "version-string": "2022.07.11.00", "description": "It comprises the core C++ HTTP abstractions used at Facebook.", "homepage": "https://github.com/facebook/proxygen", + "license": "BSD-3-Clause", "supports": "!windows", "dependencies": [ "boost-context", diff --git a/versions/baseline.json b/versions/baseline.json index 762c130b769ce5..de45fcc734ae7d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2321,8 +2321,8 @@ "port-version": 2 }, "folly": { - "baseline": "2022.03.21.00", - "port-version": 2 + "baseline": "2022.07.11.00", + "port-version": 0 }, "font-chef": { "baseline": "1.1.0", @@ -5677,8 +5677,8 @@ "port-version": 0 }, "proxygen": { - "baseline": "2022.03.21.00", - "port-version": 2 + "baseline": "2022.07.11.00", + "port-version": 0 }, "psimd": { "baseline": "2021-02-21", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index d3d80f15d88ec4..bd43dd1d391e3a 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcb721c422a09f612a5a83519d0c163c8cc83257", + "version-string": "2022.07.11.00", + "port-version": 0 + }, { "git-tree": "9d2f0850a514d305b6b3b56833185aaf7f6154e1", "version-string": "2022.03.21.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 51842ba59d5b8e..6c1060086e626a 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f8e28d0d1ec8591df5cdfa602d60e0efaa8ee7a", + "version-string": "2022.07.11.00", + "port-version": 0 + }, { "git-tree": "27f0950fcf11ac8f561591363715ddf581146325", "version-string": "2022.03.21.00", From 028fce4e888fcdf4fa8cf165f3d9799a446b6d84 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 15 Jul 2022 21:19:38 +0200 Subject: [PATCH 133/791] [gdal] no absolute paths (#25778) --- ports/gdal/portfile.cmake | 2 ++ ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 7acf1640de654d..cfa51dfdcfb787 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -147,6 +147,8 @@ if(NOT bin_files) ) endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index d42510690f8f77..56cc960fcea9bc 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.5.1", - "port-version": 2, + "port-version": 3, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index de45fcc734ae7d..256f408d08a7be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2474,7 +2474,7 @@ }, "gdal": { "baseline": "3.5.1", - "port-version": 2 + "port-version": 3 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 3e8f87955a875a..0fedc3aa8e23b6 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7d7e8b112055c7374cbf2e53172eb1832ddb73b", + "version-semver": "3.5.1", + "port-version": 3 + }, { "git-tree": "4d114225017db64685132cde062afde8ec8cbc9b", "version-semver": "3.5.1", From 504d7a981846381dfa9b424e5a5b618a613d9982 Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Fri, 15 Jul 2022 21:20:03 +0200 Subject: [PATCH 134/791] [cctag] update to v1.0.2 (#25782) * [cctag] update to v1.0.2 * [cctag] update baseline to v1.0.2 --- ports/cctag/portfile.cmake | 4 ++-- ports/cctag/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/cctag.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake index a217d98f7c6520..bce2870c087e8f 100644 --- a/ports/cctag/portfile.cmake +++ b/ports/cctag/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alicevision/cctag - REF v1.0.1 - SHA512 94992141094162d44cf45ad85324517638bf794d693c6a059d6ba5d5ccbedea4f98664a0cc49ebca78f85d2860b637dfcb9d5315114493643a6c7f8fabab3073 + REF v1.0.2 + SHA512 ccd62f6b1ca55035a08660052f38e73866260d5295490864fa9c86af779a42ce2ec727d6c88f0ea38f205903cf8f4107069b690849e432219c74d3b9666e3ae2 HEAD_REF develop ) diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json index 37d3e6460952d1..7661452d0368c7 100644 --- a/ports/cctag/vcpkg.json +++ b/ports/cctag/vcpkg.json @@ -1,10 +1,11 @@ { "name": "cctag", - "version-semver": "1.0.1", + "version-semver": "1.0.2", "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", "documentation": "https://cctag.readthedocs.io/", + "license": "MPL-2.0", "supports": "!(uwp | arm | arm64 | android | x86)", "dependencies": [ "boost-accumulators", diff --git a/versions/baseline.json b/versions/baseline.json index 256f408d08a7be..36eebb71e69b2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1305,7 +1305,7 @@ "port-version": 8 }, "cctag": { - "baseline": "1.0.1", + "baseline": "1.0.2", "port-version": 0 }, "cctz": { diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json index fd2de346b08e94..59c461ac0e55dd 100644 --- a/versions/c-/cctag.json +++ b/versions/c-/cctag.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41cef2a0749658a793585a55c57cb701e0845427", + "version-semver": "1.0.2", + "port-version": 0 + }, { "git-tree": "ffcc7bde96142c2bc54827e3a2280accc592452e", "version-semver": "1.0.1", From f4df9aa996c23bcb1e9eb1cf585c1e88c0547134 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 16 Jul 2022 03:22:46 +0800 Subject: [PATCH 135/791] [armadillo] update to 11.2.3 (#25789) * [armadillo] update to 11.2.3 * update version * add license * overwrite version --- .../armadillo/add-disable-find-package.patch | 16 +++++------ ports/armadillo/fix-CMakePath.patch | 4 +-- ports/armadillo/portfile.cmake | 4 +-- ports/armadillo/remove_custom_modules.patch | 27 +++++++++---------- ports/armadillo/vcpkg.json | 4 +-- versions/a-/armadillo.json | 5 ++++ versions/baseline.json | 4 +-- 7 files changed, 34 insertions(+), 30 deletions(-) diff --git a/ports/armadillo/add-disable-find-package.patch b/ports/armadillo/add-disable-find-package.patch index b5d67d5c21a741..69ff6c4babc01c 100644 --- a/ports/armadillo/add-disable-find-package.patch +++ b/ports/armadillo/add-disable-find-package.patch @@ -14,7 +14,7 @@ index 1a709ad..3029c25 100644 find_library(ARPACK_LIBRARY NAMES arpack diff --git a/cmake_aux/Modules/ARMA_FindATLAS.cmake b/cmake_aux/Modules/ARMA_FindATLAS.cmake -index 491a361..e40a0ff 100644 +index 6ad1eee..6dd372e 100644 --- a/cmake_aux/Modules/ARMA_FindATLAS.cmake +++ b/cmake_aux/Modules/ARMA_FindATLAS.cmake @@ -1,3 +1,8 @@ @@ -23,11 +23,11 @@ index 491a361..e40a0ff 100644 + return() +endif() + - find_path(ATLAS_CBLAS_INCLUDE_DIR - NAMES cblas.h - PATHS /usr/include/atlas/ /usr/include/ /usr/local/include/atlas/ /usr/local/include/ + set(ATLAS_NAMES) + set(ATLAS_NAMES ${ATLAS_NAMES} tatlas) + set(ATLAS_NAMES ${ATLAS_NAMES} satlas) diff --git a/cmake_aux/Modules/ARMA_FindMKL.cmake b/cmake_aux/Modules/ARMA_FindMKL.cmake -index 0fd5b06..d6bcd49 100644 +index 38f6675..4702ab4 100644 --- a/cmake_aux/Modules/ARMA_FindMKL.cmake +++ b/cmake_aux/Modules/ARMA_FindMKL.cmake @@ -6,6 +6,11 @@ @@ -43,7 +43,7 @@ index 0fd5b06..d6bcd49 100644 #set(MKL_NAMES ${MKL_NAMES} mkl_lapack) #set(MKL_NAMES ${MKL_NAMES} mkl_intel_thread) diff --git a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake -index abf046d..e496cb0 100644 +index 88dcb9c..16a26b8 100644 --- a/cmake_aux/Modules/ARMA_FindSuperLU5.cmake +++ b/cmake_aux/Modules/ARMA_FindSuperLU5.cmake @@ -5,6 +5,11 @@ @@ -56,5 +56,5 @@ index abf046d..e496cb0 100644 +endif() + find_path(SuperLU_INCLUDE_DIR slu_ddefs.h - /usr/include/superlu/ - /usr/include/SuperLU/ + PATHS ${CMAKE_SYSTEM_INCLUDE_PATH} /usr/include /usr/local/include /opt/local/include + PATH_SUFFIXES superlu SuperLU "" diff --git a/ports/armadillo/fix-CMakePath.patch b/ports/armadillo/fix-CMakePath.patch index cfafc4f289ead3..74eeeb3f774575 100644 --- a/ports/armadillo/fix-CMakePath.patch +++ b/ports/armadillo/fix-CMakePath.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ea5516e..ecd14bc 100644 +index c60cd53..855391a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -615,7 +615,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION +@@ -664,7 +664,7 @@ install(EXPORT ArmadilloLibraryDepends DESTINATION # and install it set(ARMADILLO_INCLUDE_DIRS "${CMAKE_INSTALL_FULL_INCLUDEDIR}") set(ARMADILLO_LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index aa501fc5d57314..e293d56edc73e1 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma - FILENAME "armadillo-10.6.2.tar.xz" - SHA512 ae04e993830ca04e7eddfaf9c40a50fb9139b10b9667412f5a18707ac73ee529b8e3a5a91337782e4e01bae61207b44f24bdd8a77c6c2404011a06006d849aba + FILENAME "armadillo-11.2.3.tar.xz" + SHA512 db3457adbc799c68c928aaf22714598b4b9df91ec83aff33bf2d0096b755bd316d4bae12ac973bf1821759a71f3a58a7dd8dc64cbcb1f53ea2646d8bb0bc9a3b PATCHES remove_custom_modules.patch fix-CMakePath.patch diff --git a/ports/armadillo/remove_custom_modules.patch b/ports/armadillo/remove_custom_modules.patch index 88631b573aab49..5937f6a649fa6c 100644 --- a/ports/armadillo/remove_custom_modules.patch +++ b/ports/armadillo/remove_custom_modules.patch @@ -1,23 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ab7dbed..ea5516e 100644 +index e5dcf54..c60cd53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -324,15 +324,15 @@ if(APPLE) - else() - +@@ -335,13 +335,12 @@ else() + else() + set(FlexiBLAS_FOUND false) + endif() +- ++ ++ find_package(BLAS) ++ find_package(LAPACK) include(ARMA_FindMKL) - include(ARMA_FindOpenBLAS) - include(ARMA_FindATLAS) + include(ARMA_FindATLAS) # TODO: remove support for ATLAS in next major version - include(ARMA_FindBLAS) - include(ARMA_FindLAPACK) - - if(ALLOW_FLEXIBLAS_LINUX AND (${CMAKE_SYSTEM_NAME} MATCHES "Linux")) - include(ARMA_FindFlexiBLAS) - endif() - -+ find_package(BLAS) -+ find_package(LAPACK) -+ +- ++ + message(STATUS "FlexiBLAS_FOUND = ${FlexiBLAS_FOUND}" ) message(STATUS " MKL_FOUND = ${MKL_FOUND}" ) message(STATUS " OpenBLAS_FOUND = ${OpenBLAS_FOUND}" ) - message(STATUS " ATLAS_FOUND = ${ATLAS_FOUND}" ) diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 27e432049a8852..4b641a135d0aa6 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,9 +1,9 @@ { "name": "armadillo", - "version": "10.6.2", - "port-version": 5, + "version": "11.2.3", "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", + "license": "Apache-2.0", "dependencies": [ "blas", "lapack", diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 395d93271eca38..02163cc409f50e 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4bc853e4132b3e2f8c13fa5cfc21030daa6d10a", + "version": "11.2.3", + "port-version": 0 + }, { "git-tree": "fb3b2fb5c5daeea857a0b9952dbef5c980fa14c9", "version": "10.6.2", diff --git a/versions/baseline.json b/versions/baseline.json index 36eebb71e69b2e..5523c4a1ae3393 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -169,8 +169,8 @@ "port-version": 0 }, "armadillo": { - "baseline": "10.6.2", - "port-version": 5 + "baseline": "11.2.3", + "port-version": 0 }, "arrayfire": { "baseline": "3.8.0", From 6784c97c22f7c29c2453a468a1c28c44081c63d5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 15 Jul 2022 21:27:25 +0200 Subject: [PATCH 136/791] [libdc1394] Fix dependencies, fix osx (#25791) * Fix dependencies * Fix osx build * Update versions --- ports/libdc1394/fix-macosx.patch | 11 +++++++++++ ports/libdc1394/portfile.cmake | 13 +++++++++++-- ports/libdc1394/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libdc1394.json | 5 +++++ 5 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 ports/libdc1394/fix-macosx.patch diff --git a/ports/libdc1394/fix-macosx.patch b/ports/libdc1394/fix-macosx.patch new file mode 100644 index 00000000000000..9e626e149d4564 --- /dev/null +++ b/ports/libdc1394/fix-macosx.patch @@ -0,0 +1,11 @@ +--- a/dc1394/macosx/Makefile.in ++++ b/dc1394/macosx/Makefile.in +@@ -119,7 +119,7 @@ AM_V_at = $(am__v_at_@AM_V@) + am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) + am__v_at_0 = @ + am__v_at_1 = +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I.@am__isrc@/.. -I.@am__isrc@/../.. + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f diff --git a/ports/libdc1394/portfile.cmake b/ports/libdc1394/portfile.cmake index 2cc7f3d33e332f..64856f91f44bdf 100644 --- a/ports/libdc1394/portfile.cmake +++ b/ports/libdc1394/portfile.cmake @@ -6,17 +6,26 @@ vcpkg_from_sourceforge( REF "${LIBDC1394_VER}" FILENAME "libdc1394-${LIBDC1394_VER}.tar.gz" SHA512 2d60ed1054da67d8518e870193b60c1d79778858f48cc6487e252de00cc57a08548515d41914a37d0227d29e158d68892c290f83930ffd95f4a483dce5aa3d25 + PATCHES + fix-macosx.patch ) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS "--disable-examples" + OPTIONS + "--disable-examples" + ac_cv_lib_raw1394_raw1394_channel_modify=no + ac_cv_path_SDL_CONFIG=no ) vcpkg_install_make() + +file(APPEND "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdc1394-2.pc" "\nRequires.private: libusb-1.0\n") +if(NOT VCPKG_BUILD_TYPE) + file(APPEND "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdc1394-2.pc" "\nRequires.private: libusb-1.0\n") +endif() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdc1394/vcpkg.json b/ports/libdc1394/vcpkg.json index d48cd5a55cc159..34ff812baabf62 100644 --- a/ports/libdc1394/vcpkg.json +++ b/ports/libdc1394/vcpkg.json @@ -1,10 +1,11 @@ { "name": "libdc1394", "version": "2.2.6", + "port-version": 1, "description": "libdc1394 is a library that provides a complete high level application programming interface (API) for developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specifications (also known as the IIDC or DCAM Specifications).", "homepage": "https://damien.douxchamps.net/ieee1394/libdc1394", "supports": "!windows", "dependencies": [ - "sdl1" + "libusb" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5523c4a1ae3393..1f052a2c3d0c7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3550,7 +3550,7 @@ }, "libdc1394": { "baseline": "2.2.6", - "port-version": 0 + "port-version": 1 }, "libde265": { "baseline": "1.0.8", diff --git a/versions/l-/libdc1394.json b/versions/l-/libdc1394.json index 4e630d646eb94c..cf9e2628c9f1ec 100644 --- a/versions/l-/libdc1394.json +++ b/versions/l-/libdc1394.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "836d621852118c9ba8ce3e7ec8f3d8a2b9d9ea2b", + "version": "2.2.6", + "port-version": 1 + }, { "git-tree": "709fb395bf34f777acced25c12d6fd76d90f0100", "version": "2.2.6", From 33c8f025390f8682811629b6830d2d66ecedcaa5 Mon Sep 17 00:00:00 2001 From: Bryan B Date: Fri, 15 Jul 2022 12:33:50 -0700 Subject: [PATCH 137/791] [gpgmm] Add gpgmm. Highly experimental. (#25650) --- ports/gpgmm/portfile.cmake | 31 +++++++++++++++++++++++++++++++ ports/gpgmm/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gpgmm.json | 9 +++++++++ 4 files changed, 62 insertions(+) create mode 100644 ports/gpgmm/portfile.cmake create mode 100644 ports/gpgmm/vcpkg.json create mode 100644 versions/g-/gpgmm.json diff --git a/ports/gpgmm/portfile.cmake b/ports/gpgmm/portfile.cmake new file mode 100644 index 00000000000000..590f937fd73e44 --- /dev/null +++ b/ports/gpgmm/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/gpgmm + REF v0.0.4 + SHA512 2ffc3c8299f2d10cb1c0013cd306ba45781a644fa0aa426ef1dfa616e4b53671461a376f65b7068b1ff8a4a2d1a6f9539664174eb5830ea6a760ef5e5d0fc6b0 + HEAD_REF main +) + +# gpgmm\third_party config requires Git. Make the tool visible. +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_DIR "${GIT}" DIRECTORY) +vcpkg_add_to_path("${GIT_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DGPGMM_STANDALONE=OFF + -DGPGMM_ENABLE_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gpgmm/vcpkg.json b/ports/gpgmm/vcpkg.json new file mode 100644 index 00000000000000..1786fab4056a11 --- /dev/null +++ b/ports/gpgmm/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gpgmm", + "version": "0.0.4", + "description": "GPGMM is a General-Purpose GPU Memory Management library. It provides a common set of GPU memory routines optimized for GPUs. The library helps developers manage video memory by implementing the necessary functionality across components based on Vulkan or D3D12", + "homepage": "https://github.com/intel/GPGMM/", + "license": "Apache-2.0", + "supports": "windows & !(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1f052a2c3d0c7e..13fbf89bb05814 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2660,6 +2660,10 @@ "baseline": "1.14.0", "port-version": 2 }, + "gpgmm": { + "baseline": "0.0.4", + "port-version": 0 + }, "gppanel": { "baseline": "2020-05-20", "port-version": 2 diff --git a/versions/g-/gpgmm.json b/versions/g-/gpgmm.json new file mode 100644 index 00000000000000..bc2b5d848b4fb3 --- /dev/null +++ b/versions/g-/gpgmm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "08e07fe17d9d990b3d2579b33c6851b60faa6c2c", + "version": "0.0.4", + "port-version": 0 + } + ] +} From 68b7fec22eb5fd9c0236b1e42b3c0deb8e771b37 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 15 Jul 2022 21:11:16 -0700 Subject: [PATCH 138/791] Update VMs for July 2022 Patch Tuesday, and to Ubuntu 22.04. (#25785) * Update Ubuntu to 22.04. * Add libxtst-dev from https://github.com/microsoft/vcpkg/pull/24934 * Add standard prereqs. * Update some package references for Ubuntu 22.04. * [cuda] Update to search in /usr/bin as used on Ubuntu 22.04. * [cudnn] Add where ubuntu 22.04 puts it. * Add update-nvidia-cudnn calls. * Update powershell to 7.2.5 * Re-add NCCL installation from CUDA official sources. * Update pools. --- ports/cuda/vcpkg.json | 2 +- ports/cuda/vcpkg_find_cuda.cmake | 2 + ports/cudnn/FindCUDNN.cmake | 2 +- ports/cudnn/portfile.cmake | 2 +- ports/cudnn/vcpkg.json | 2 +- scripts/azure-pipelines/azure-pipelines.yml | 4 +- .../azure-pipelines/linux/create-image.ps1 | 4 +- .../azure-pipelines/linux/provision-image.sh | 37 +++++++++++++------ .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- scripts/vcpkgTools.xml | 8 ++-- versions/baseline.json | 4 +- versions/c-/cuda.json | 5 +++ versions/c-/cudnn.json | 5 +++ 13 files changed, 52 insertions(+), 27 deletions(-) diff --git a/ports/cuda/vcpkg.json b/ports/cuda/vcpkg.json index 61a3ce96ce8540..4a17ad81e6111e 100644 --- a/ports/cuda/vcpkg.json +++ b/ports/cuda/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cuda", "version": "10.1", - "port-version": 10, + "port-version": 11, "description": "A parallel computing platform and programming model", "homepage": "https://developer.nvidia.com/cuda-toolkit", "license": null, diff --git a/ports/cuda/vcpkg_find_cuda.cmake b/ports/cuda/vcpkg_find_cuda.cmake index 64b7585404c89f..a6265b78b7192a 100644 --- a/ports/cuda/vcpkg_find_cuda.cmake +++ b/ports/cuda/vcpkg_find_cuda.cmake @@ -42,6 +42,8 @@ function(vcpkg_find_cuda) endif() endforeach() + vcpkg_list(APPEND CUDA_PATHS /usr/bin) + find_program(NVCC NAMES nvcc PATHS diff --git a/ports/cudnn/FindCUDNN.cmake b/ports/cudnn/FindCUDNN.cmake index c90f3a79189d95..178cdaf02f2328 100644 --- a/ports/cudnn/FindCUDNN.cmake +++ b/ports/cudnn/FindCUDNN.cmake @@ -25,7 +25,7 @@ include(FindPackageHandleStandardArgs) find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h - HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/ PATH_SUFFIXES cuda/include include) find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ /usr/ diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index b5ebb3239d24c7..f53dc53566198b 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VE # Try to find CUDNN if it exists; only download if it doesn't exist find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h - HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include /usr/include/x86_64-linux-gnu/ PATH_SUFFIXES cuda/include include) message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}") find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json index 2918c45688babf..36ba88bfc0e4fa 100644 --- a/ports/cudnn/vcpkg.json +++ b/ports/cudnn/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cudnn", "version": "7.6.5", - "port-version": 7, + "port-version": 8, "description": "NVIDIA's cuDNN deep neural network acceleration library.", "homepage": "https://developer.nvidia.com/cudnn", "license": null, diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index be5120ad4f71f5..12e0354af74ceb 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-06-15' - linux-pool: 'PrLin-2022-06-15' + windows-pool: 'PrWin-2022-07-14' + linux-pool: 'PrLin-2022-07-14' osx-pool: 'PrOsx-2022-02-04' parameters: diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index 932d25aecde22b..a1690ee9ec05ea 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -88,8 +88,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id $VM = Set-AzVMSourceImage ` -VM $VM ` -PublisherName 'Canonical' ` - -Offer '0001-com-ubuntu-server-focal' ` - -Skus '20_04-lts' ` + -Offer '0001-com-ubuntu-server-jammy' ` + -Skus '22_04-lts' ` -Version latest $VM = Set-AzVMBootDiagnostic -VM $VM -Disable diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 35ed5931277004..8c78f485f8fb57 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -7,22 +7,29 @@ export DEBIAN_FRONTEND=noninteractive apt-get -y update apt-get -y dist-upgrade + +# Install vcpkg prerequisites +APT_PACKAGES="git curl zip unzip tar" + # 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 \ +APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \ + build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ - libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \ + libxcursor-dev yasm libnuma1 libnuma-dev \ flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ pkg-config meson nasm cmake ninja-build" +# CUDA tooling +APT_PACKAGES="$APT_PACKAGES nvidia-cudnn nvidia-cuda-toolkit" + # Additionally required by qt5-base APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev" # Additionally required by qt5-base for qt5-x11extras APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ - libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev \ + libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \ libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev" @@ -56,22 +63,28 @@ APT_PACKAGES="$APT_PACKAGES libxdamage-dev" # Additionally required by gtk3 and at-spi2-atk APT_PACKAGES="$APT_PACKAGES libdbus-1-dev" +# Additionally required by at-spi2-atk +APT_PACKAGES="$APT_PACKAGES libxtst-dev" + # Additionally required/installed by Azure DevOps Scale Set Agents -APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" +APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70" apt-get -y install $APT_PACKAGES # Install the latest Haskell stack for bond curl -sSL https://get.haskellstack.org/ | sh -# Install CUDA -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 -apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub -add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" +# Start up cudnn +update-nvidia-cudnn -d +update-nvidia-cudnn -u + +# Install nccl +wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin +mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/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 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 libnccl-dev +apt-get install --no-install-recommends libnccl2 libnccl-dev # Install PowerShell wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index a2a3f4853e8773..e0577d20a474cd 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 9b32fe40643276..4f555dd817e4ab 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -194,11 +194,11 @@ ninja-freebsd-1.8.2.zip - 7.2.4 + 7.2.5 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.4/PowerShell-7.2.4-win-x86.zip - 4f337c66e03124cfc1e96a56a943ccd24f9a22f588fa461bea9e14733acf06acddd873860b10843c92251257a64fbfac967ae77c084960aaf6b14522435b7769 - PowerShell-7.2.4-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.zip + 75b549db2500a5510eae3ec595540b42726c1b049f382c7683b6f0ed26dddd219e2ac67e9902358615f96c7884eda63ec3d0ca558b7b92f4604fdc61322ca4dd + PowerShell-7.2.5-win-x86.zip 16.15.1 diff --git a/versions/baseline.json b/versions/baseline.json index 13fbf89bb05814..471b84033bf862 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1754,11 +1754,11 @@ }, "cuda": { "baseline": "10.1", - "port-version": 10 + "port-version": 11 }, "cudnn": { "baseline": "7.6.5", - "port-version": 7 + "port-version": 8 }, "cunit": { "baseline": "2.1.3", diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 53553cb146522e..05fbc129641cad 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d190177076c48287897d233ae2fa8c241f28f40", + "version": "10.1", + "port-version": 11 + }, { "git-tree": "4e8939c3547a570a73098c091da7b9e28f71015c", "version": "10.1", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 3ef9d240d946b3..1acfa99d4cd86e 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b29eb71b5187d6f0991ede2a56e2fda57e6cb520", + "version": "7.6.5", + "port-version": 8 + }, { "git-tree": "cfd70db6f58e45dc96c44a61833d821d987c1588", "version": "7.6.5", From de176433e9a8769eed0e43d61758f4cdc1dc6e20 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Mon, 18 Jul 2022 10:41:15 +0800 Subject: [PATCH 139/791] [meson] Add support for loongarch64 cpu. (#25615) * Add support for loongarch64 cpu. * update ci.baseline.txt * Revert "update ci.baseline.txt" This reverts commit 0b3f4851bc05a4101f07a865a9260915e5385763. * Allow user to add additional options for meson within custom triplet. Co-authored-by: Jamlys Lee --- docs/users/triplets.md | 7 +++++++ scripts/cmake/vcpkg_configure_meson.cmake | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 4bd9d7e1b47300..f3ce26a302e34f 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -93,6 +93,13 @@ This option also has forms for configuration-specific flags: - `VCPKG_LINKER_FLAGS_DEBUG` - `VCPKG_LINKER_FLAGS_RELEASE` +### VCPKG_MESON_CONFIGURE_OPTIONS +Set additional Meson configure options that are appended to the configure command (in [`vcpkg_configure_meson`](../maintainers/vcpkg_configure_meson.md)). + +This field is optional. + +Also available as build-type specific `VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG` and `VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE` variables. + ### VCPKG_CMAKE_CONFIGURE_OPTIONS Set additional CMake configure options that are appended to the configure command (in [`vcpkg_cmake_configure`](../maintainers/vcpkg_cmake_configure.md)). diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 94c1a9f61601dc..e98beefbb243ed 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -233,6 +233,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu elseif(MACHINE MATCHES "i386") set(build_cpu_fam x86) set(build_cpu i386) + elseif(MACHINE MATCHES "loongarch64") + set(build_cpu_fam loongarch64) + set(build_cpu loongarch64) else() # https://github.com/mesonbuild/meson/blob/master/docs/markdown/Reference-tables.md#cpu-families message(FATAL_ERROR "Unhandled machine: ${MACHINE}") @@ -253,6 +256,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") set(host_cpu_fam arm) set(host_cpu armv7hl) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch64") + set(host_cpu_fam loongarch64) + set(host_cpu loongarch64) else() message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) endif() @@ -341,6 +347,17 @@ function(vcpkg_configure_meson) vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS ${VCPKG_MESON_CONFIGURE_OPTIONS}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG}) + endif() + if(NOT vcpkg_meson_cross_file) z_vcpkg_meson_generate_cross_file("${arg_ADDITIONAL_CROSS_BINARIES}") endif() From 15a0ab7a3e62e62c29bc677589e8974fe401a436 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 18 Jul 2022 11:37:11 -0700 Subject: [PATCH 140/791] Update vcpkg-tool to 2022-07-14. (#25788) --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index a302a4851cf47e..c194dc610ad7ab 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-06-17' +$versionDate = '2022-07-14' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1323e05bc00b20..607030c770750a 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-06-17" +vcpkgToolReleaseTag="2022-07-14" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="66ef24562d0a165d9462a3b3cc2e6ff728e26ab529aa4406dffb107492c1e91277fee4b187e776ae7a7730c5ff8cfb1063822852493b156e03151c730b509b2b" + vcpkgToolReleaseSha="f89d0abbc2b385ccf7a8548fb7e612007f092891fa7feaa6a7090fdee8877d8f3f08c580c6866c42bcaed9bf7263eab214c511709fc7972d321c136fcb5a6920" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="28533a64c0d876fdf78f7ed301847063b3ff0c2593cac6df3b0d38a5e09174cd8770caf985476523dab6f740b54c7400c8542e8df63fd094b5956a35d8579989" + vcpkgToolReleaseSha="f54d1739e52177a528221eed7e1bca365c8e4bad0c9dbfe925089bf9b57f50563d39ac44aafaae33ec553b8388b98ec6af0ed3bdde8ee23e2233578a2ce3df8b" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="c85ec50df0de9648e1c5bdb690aa38d6c2ad2d9e5f92cd77648966f44f9b45418374925aacf5bbff0c608145f58dc9cd3391368e441e8254145c39ab1ae1fd33" + vcpkgToolReleaseSha="df734af8160ed3d67d40f6f9bb721a6fc5a735fda99efaba2588400a5fd681a1e3d15d13b316d7ccba5506d90d1086e60608b2e67e137a702bea3679cb3d1663" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="e52a359617c283932b4e4a33f4fa288fbe06edd676e4248b5543b83573a378dbf30c021395045e0726e69d4b5d41b012fd61af5eb4d586a1fb793c16bd64b77c" + vcpkgToolReleaseSha="eebdedb2743476342ea578c360cdc35c869680139c7e0a841a453dd856b2f8b50f951b6c807d4b783e3c46c94f36d66fb498316d3039d6c9b79613553c564612" fi # Do the download or build. From 42b287664591da6ed6abb1d18a591e6c4582677e Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 18 Jul 2022 22:44:34 +0300 Subject: [PATCH 141/791] [vcpkg] Fixup rpath after building dynamic libraries on linux (#23035) * Fixup rpath after building dynamic libraries on linux * Switch back to a single variable VCPKG_FIXUP_ELF_RPATH Co-authored-by: Victor Romero * Don't force fixup in x64-linux triplet yet Co-authored-by: Victor Romero Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- .../cmake/vcpkg_find_acquire_program.cmake | 18 ++++++ scripts/cmake/z_vcpkg_fixup_rpath.cmake | 57 +++++++++++++++++++ scripts/ports.cmake | 3 + triplets/community/x64-linux-dynamic.cmake | 7 +++ 4 files changed, 85 insertions(+) create mode 100644 scripts/cmake/z_vcpkg_fixup_rpath.cmake create mode 100644 triplets/community/x64-linux-dynamic.cmake diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index fd96bd70108c6e..8fa5c184887fa0 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -545,6 +545,24 @@ function(vcpkg_find_acquire_program program) set(apt_package_name pkg-config) set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin") endif() + elseif(program STREQUAL "PATCHELF") + set(program_name patchelf) + set(program_version 0.14.5) + set(supported_on_unix ON) + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + if(HOST_ARCH STREQUAL "aarch64") + set(patchelf_platform "aarch64") + set(download_sha512 "3B5EB4405FAB1D5202728AA390DD9F059CD7AFD582BAD9C50383CAD605127BC77DFCE3F2F26E9714F6BD5CCFFD49D3973BA2F061D2E2931B6E1BD0C263B99E75") + else() + set(patchelf_platform "x86_64") + set(download_sha512 "5E983A25B3F3F3B8582D1DE6C7DE30812E8D6E58E96F711F33A2634D3FB1F2370531DA179927AA401328319F92465E6F76274A6F994D1DC54C74B98E704D0D29") + endif() + set(download_filename "${program_name}-${program_version}-${patchelf_platform}.tar.gz") + set(download_urls "https://github.com/NixOS/patchelf/releases/download/${program_version}/${download_filename}") + set(tool_subdirectory "${program_version}-${patchelf_platform}-linux") + set(paths_to_search "${DOWNLOADS}/tools/patchelf/${program_version}-${patchelf_platform}-linux/bin") + endif() + set(version_command --version) else() message(FATAL "unknown tool ${program} -- unable to acquire.") endif() diff --git a/scripts/cmake/z_vcpkg_fixup_rpath.cmake b/scripts/cmake/z_vcpkg_fixup_rpath.cmake new file mode 100644 index 00000000000000..c61bda5a5dedbb --- /dev/null +++ b/scripts/cmake/z_vcpkg_fixup_rpath.cmake @@ -0,0 +1,57 @@ +function(z_vcpkg_fixup_rpath_in_dir) + vcpkg_find_acquire_program(PATCHELF) + + # We need to iterate trough everything because we + # can't predict where an elf file will be located + file(GLOB root_entries LIST_DIRECTORIES TRUE "${CURRENT_PACKAGES_DIR}/*") + + # Skip some folders for better throughput + list(APPEND folders_to_skip "include") + list(JOIN folders_to_skip "|" folders_to_skip_regex) + set(folders_to_skip_regex "^(${folders_to_skip_regex})$") + + foreach(folder IN LISTS root_entries) + if(NOT IS_DIRECTORY "${folder}") + continue() + endif() + + get_filename_component(folder_name "${folder}" NAME) + if(folder_name MATCHES "${folders_to_skip_regex}") + continue() + endif() + + file(GLOB_RECURSE elf_files LIST_DIRECTORIES FALSE "${folder}/*") + foreach(elf_file IN LISTS elf_files) + if(IS_SYMLINK "${elf_file}") + continue() + endif() + + get_filename_component(elf_file_dir "${elf_file}" DIRECTORY) + + set(current_prefix "${CURRENT_PACKAGES_DIR}") + if(elf_file_dir MATCHES "debug/") + set(current_prefix "${CURRENT_PACKAGES_DIR}/debug") + endif() + + # compute path relative to lib + file(RELATIVE_PATH relative_to_lib "${elf_file_dir}" "${current_prefix}/lib") + if(relative_to_lib STREQUAL "") + set(rpath "\$ORIGIN") + else() + set(rpath "\$ORIGIN:\$ORIGIN/${relative_to_lib}") + endif() + + # If this fails, the file is not an elf + execute_process( + COMMAND "${PATCHELF}" --set-rpath "${rpath}" "${elf_file}" + OUTPUT_QUIET + ERROR_VARIABLE set_rpath_error + ) + if("${set_rpath_error}" STREQUAL "") + message(STATUS "Fixed rpath: ${elf_file} (${rpath})") + endif() + endforeach() + endforeach() +endfunction() + +z_vcpkg_fixup_rpath_in_dir() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 312b02ff09e979..9f7b9d01f95c27 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -146,6 +146,9 @@ if(CMD STREQUAL "BUILD") include("${CURRENT_PORT_DIR}/portfile.cmake") if(DEFINED PORT) + if(VCPKG_FIXUP_ELF_RPATH) + include("${SCRIPTS}/cmake/z_vcpkg_fixup_rpath.cmake") + endif() include("${SCRIPTS}/build_info.cmake") endif() elseif(CMD STREQUAL "CREATE") diff --git a/triplets/community/x64-linux-dynamic.cmake b/triplets/community/x64-linux-dynamic.cmake new file mode 100644 index 00000000000000..abccb40b1faf35 --- /dev/null +++ b/triplets/community/x64-linux-dynamic.cmake @@ -0,0 +1,7 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + +set(VCPKG_CMAKE_SYSTEM_NAME Linux) + +set(VCPKG_FIXUP_ELF_RPATH ON) From bb920d6a58ac46ebf3c38379ee282e681e3750ef Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 19 Jul 2022 03:52:19 +0800 Subject: [PATCH 142/791] [libtorrent] update to 2.0.7 (#25830) * [libtorrent] update to 2.0.7 * update version --- ports/libtorrent/portfile.cmake | 4 ++-- ports/libtorrent/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtorrent.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index 645fca72b0dccd..816a30b7eade6d 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -30,8 +30,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arvidn/libtorrent - REF e9bbf16bdd899f42aef0f0c2b1f214de2c15ac92 # v2.0.6 - SHA512 5bc93be6b1bf5208f1bfc10ffe515e20face41ebf0f9cf7afc8f1c03addc42a88f92ec79a2c2a1d1a4fd0a3014b752d68e7e62cd86349694636b79da31ed8e08 + REF 722d78250a30c89c92970a78be970269a395be36 # v2.0.7 + SHA512 69c7e6c02db6ff6b10d94b52470eda38839b4121960f7d19c3829eb453a84a62f017e1607bbb8dd63528c1461686fa6f30af605a046faae2c9c916aa688b555f HEAD_REF RC_2_0 ) diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index faf3361412bdcb..9ea765211d8ba3 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtorrent", - "version": "2.0.6", + "version": "2.0.7", "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/versions/baseline.json b/versions/baseline.json index 471b84033bf862..9ae5bfdf6af6fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4161,7 +4161,7 @@ "port-version": 2 }, "libtorrent": { - "baseline": "2.0.6", + "baseline": "2.0.7", "port-version": 0 }, "libu2f-server": { diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index 015b3e7a2a64f6..0e34f91c40ffae 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1c101af3351c28c84e89394e1fb6826352bec76", + "version": "2.0.7", + "port-version": 0 + }, { "git-tree": "1ca0a5e5498fe7a999d78650e6ae935cebf1d764", "version": "2.0.6", From d2dbf996155395be1bb874340eca8984205b86a1 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 18 Jul 2022 23:02:35 +0300 Subject: [PATCH 143/791] [ccfits] Fix x64-linux-dynamic build (#25826) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/ccfits/dll_exports.patch | 39 +++++++++------------------------- ports/ccfits/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/ccfits.json | 5 +++++ 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/ports/ccfits/dll_exports.patch b/ports/ccfits/dll_exports.patch index 6321cbb4e42393..0f34c26e52bf56 100644 --- a/ports/ccfits/dll_exports.patch +++ b/ports/ccfits/dll_exports.patch @@ -311,45 +311,26 @@ new file mode 100644 index 0000000..a2540a6 100644 --- /dev/null +++ b/ccfits_export.h -@@ -0,0 +1,41 @@ +@@ -0,0 +1,22 @@ +#ifndef CCFITS_EXPORT_H +#define CCFITS_EXPORT_H + +#ifdef CCFITS_STATIC_DEFINE +# define CCFITS_EXPORT -+# define CCFITS_NO_EXPORT +#else +# ifndef CCFITS_EXPORT -+# ifdef CCfits_EXPORTS -+ /* We are building this library */ -+# define CCFITS_EXPORT __declspec(dllexport) ++# ifdef _MSC_VER ++# ifdef CCfits_EXPORTS ++ /* We are building this library */ ++# define CCFITS_EXPORT __declspec(dllexport) ++# else ++ /* We are using this library */ ++# define CCFITS_EXPORT __declspec(dllimport) ++# endif +# else -+ /* We are using this library */ -+# define CCFITS_EXPORT __declspec(dllimport) ++# define CCFITS_EXPORT __attribute__((visibility("default"))) +# endif +# endif -+ -+# ifndef CCFITS_NO_EXPORT -+# define CCFITS_NO_EXPORT -+# endif -+#endif -+ -+#ifndef CCFITS_DEPRECATED -+# define CCFITS_DEPRECATED __declspec(deprecated) -+#endif -+ -+#ifndef CCFITS_DEPRECATED_EXPORT -+# define CCFITS_DEPRECATED_EXPORT CCFITS_EXPORT CCFITS_DEPRECATED -+#endif -+ -+#ifndef CCFITS_DEPRECATED_NO_EXPORT -+# define CCFITS_DEPRECATED_NO_EXPORT CCFITS_NO_EXPORT CCFITS_DEPRECATED -+#endif -+ -+#if 0 /* DEFINE_NO_DEPRECATED */ -+# ifndef CCFITS_NO_DEPRECATED -+# define CCFITS_NO_DEPRECATED -+# endif +#endif + +#endif diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json index 7124381b9978bd..f66a2ef5a15534 100644 --- a/ports/ccfits/vcpkg.json +++ b/ports/ccfits/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ccfits", "version": "2.5", - "port-version": 8, + "port-version": 9, "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.", "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/", + "license": "NASA-1.3", "dependencies": [ "cfitsio", { diff --git a/versions/baseline.json b/versions/baseline.json index 9ae5bfdf6af6fd..2753a32a2905f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1302,7 +1302,7 @@ }, "ccfits": { "baseline": "2.5", - "port-version": 8 + "port-version": 9 }, "cctag": { "baseline": "1.0.2", diff --git a/versions/c-/ccfits.json b/versions/c-/ccfits.json index 7bf0a662a0a9c6..466b8ade8407c3 100644 --- a/versions/c-/ccfits.json +++ b/versions/c-/ccfits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "659ca5a77df9383a31166079a5f08ce70400d4ab", + "version": "2.5", + "port-version": 9 + }, { "git-tree": "ebcb81196a7e63b3b7c4b78f67ebc4e5f20c97c3", "version": "2.5", From 5a7c56f93443afa55eb20babf8ddac8d8076f8df Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 18 Jul 2022 23:10:46 +0300 Subject: [PATCH 144/791] [zopfli] Fix x64-linux-dynamic build (#25824) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/zopfli/portfile.cmake | 57 ++++++++++++++++--------------------- ports/zopfli/vcpkg.json | 17 +++++++++-- versions/baseline.json | 2 +- versions/z-/zopfli.json | 5 ++++ 4 files changed, 45 insertions(+), 36 deletions(-) diff --git a/ports/zopfli/portfile.cmake b/ports/zopfli/portfile.cmake index 7ce1dfeffb871f..d796980a8e1055 100644 --- a/ports/zopfli/portfile.cmake +++ b/ports/zopfli/portfile.cmake @@ -6,64 +6,57 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DZOPFLI_BUILD_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(EXECUTABLE_SUFFIX ".exe") -else() - set(EXECUTABLE_SUFFIX "") -endif() - # Install tools -file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(COPY ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(COPY "${CURRENT_PACKAGES_DIR}/bin/zopfli${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(COPY "${CURRENT_PACKAGES_DIR}/bin/zopflipng${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/zopfli${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/bin/zopflipng${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/zopfli${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/zopflipng${VCPKG_TARGET_EXECUTABLE_SUFFIX}" +) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/zopfli${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/zopflipng${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/zopfli${EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/zopflipng${EXECUTABLE_SUFFIX} - ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Zopfli) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Zopfli") -# vcpkg_fixup_cmake_targets can not handles this on UNIX currently. +# vcpkg_cmake_config_fixup can not handles this on UNIX currently. if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" "\"\${_IMPORT_PREFIX}/debug/bin/zopfli\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-debug.cmake" "\"\${_IMPORT_PREFIX}/debug/bin/zopflipng\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake" "\"\${_IMPORT_PREFIX}/bin/zopfli\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopfli\"" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/zopfli/ZopfliConfig-release.cmake" "\"\${_IMPORT_PREFIX}/bin/zopflipng\"" "\"\${_IMPORT_PREFIX}/tools/zopfli/zopflipng\"" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/zopfli/vcpkg.json b/ports/zopfli/vcpkg.json index 668234f532cbe7..f0f895ab326fbc 100644 --- a/ports/zopfli/vcpkg.json +++ b/ports/zopfli/vcpkg.json @@ -1,7 +1,18 @@ { "name": "zopfli", - "version-string": "1.0.3", - "port-version": 1, + "version": "1.0.3", + "port-version": 2, "description": "Zopfli Compression Algorithm compression library programmed in C", - "homepage": "https://github.com/google/zopfli" + "homepage": "https://github.com/google/zopfli", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 2753a32a2905f8..9367bd2d7f371a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7846,7 +7846,7 @@ }, "zopfli": { "baseline": "1.0.3", - "port-version": 1 + "port-version": 2 }, "zpp-bits": { "baseline": "4.4.4", diff --git a/versions/z-/zopfli.json b/versions/z-/zopfli.json index 43770260268522..20f84d691e8657 100644 --- a/versions/z-/zopfli.json +++ b/versions/z-/zopfli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0451fdd88ef4beba9c0f572d219c0148ac28a25", + "version": "1.0.3", + "port-version": 2 + }, { "git-tree": "e80818813d5dfa5b563c84485d4a0030ce90906a", "version-string": "1.0.3", From 9ab9880238b97cc7281ca6a219c5af70aa5215f4 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 18 Jul 2022 22:14:05 +0200 Subject: [PATCH 145/791] [apr] no absolute paths (#25816) --- ports/apr/portfile.cmake | 5 +++++ ports/apr/vcpkg.json | 2 +- versions/a-/apr.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 924d6ee7fc6239..b6970da1011a38 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -75,10 +75,15 @@ else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\"" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "") if(NOT VCPKG_BUILD_TYPE) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_SOURCE_DIR=\"${SOURCE_PATH}\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "APR_BUILD_DIR=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\"" "") + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/lib" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/build-1/libtool" "${CURRENT_INSTALLED_DIR}/debug/lib" "") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index f8efdea9b9b32d..e5d1ab75d6ae2b 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apr", "version": "1.7.0", - "port-version": 9, + "port-version": 10, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 63a44a486e9b0c..82e10c5cc0b3b3 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b9002157134602da80c38b7eda863fd9e0012da", + "version": "1.7.0", + "port-version": 10 + }, { "git-tree": "419034d960a2d9d932f18154e386d1ce4947d514", "version": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9367bd2d7f371a..419e317f84173f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -118,7 +118,7 @@ }, "apr": { "baseline": "1.7.0", - "port-version": 9 + "port-version": 10 }, "apr-util": { "baseline": "1.6.1", From 2c208f9831add3863e49558c7452cd24ee5b7e52 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 18 Jul 2022 23:15:02 +0300 Subject: [PATCH 146/791] [readline-unix] Fix x64-linux-dynamic build (#25823) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/readline-unix/portfile.cmake | 1 + ports/readline-unix/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/r-/readline-unix.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/readline-unix/portfile.cmake b/ports/readline-unix/portfile.cmake index b7422e53af09bd..8951f96edfd7fb 100644 --- a/ports/readline-unix/portfile.cmake +++ b/ports/readline-unix/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_configure_make( vcpkg_install_make() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/readline-unix/bin" "${CURRENT_PACKAGES_DIR}/tools/readline-unix/debug/bin") vcpkg_fixup_pkgconfig() diff --git a/ports/readline-unix/vcpkg.json b/ports/readline-unix/vcpkg.json index 6d3b9382b636a9..721acc13b11f63 100644 --- a/ports/readline-unix/vcpkg.json +++ b/ports/readline-unix/vcpkg.json @@ -1,8 +1,9 @@ { "name": "readline-unix", "version": "8.1", - "port-version": 1, + "port-version": 2, "description": "Implementation of readline for unix", + "license": "GPL-3.0-or-later", "supports": "!windows", "dependencies": [ "ncurses" diff --git a/versions/baseline.json b/versions/baseline.json index 419e317f84173f..9068a62199dd73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6222,7 +6222,7 @@ }, "readline-unix": { "baseline": "8.1", - "port-version": 1 + "port-version": 2 }, "readline-win32": { "baseline": "5.0", diff --git a/versions/r-/readline-unix.json b/versions/r-/readline-unix.json index a0284c726ab2a9..442ccc2dfe5ec9 100644 --- a/versions/r-/readline-unix.json +++ b/versions/r-/readline-unix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e81a9fe4baa7c437b6e6d9636ae7c291e2ed81e9", + "version": "8.1", + "port-version": 2 + }, { "git-tree": "cc7ba8176a2492af17dc561bcb82c36f7c89e540", "version": "8.1", From f0815eb528f8d2bddff9d9184520c35747f8ea9d Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 18 Jul 2022 23:16:02 +0300 Subject: [PATCH 147/791] [libtheora] Fix x64-linux-debug build (#25819) Also switch to vcpkg-cmake and install both copyright files Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/libtheora/CMakeLists.txt | 6 +++--- ports/libtheora/portfile.cmake | 21 ++++++++++----------- ports/libtheora/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/l-/libtheora.json | 5 +++++ 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ports/libtheora/CMakeLists.txt b/ports/libtheora/CMakeLists.txt index 0d4aed76e04fbc..c11adc21ce48dd 100644 --- a/ports/libtheora/CMakeLists.txt +++ b/ports/libtheora/CMakeLists.txt @@ -103,9 +103,9 @@ install( install(TARGETS theora theoraenc theoradec EXPORT unofficial-theora-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION bin - ARCHIVE DESTINATION lib + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) install(EXPORT unofficial-theora-targets diff --git a/ports/libtheora/portfile.cmake b/ports/libtheora/portfile.cmake index 8c88e261b27d93..5b84a7d726a0e2 100644 --- a/ports/libtheora/portfile.cmake +++ b/ports/libtheora/portfile.cmake @@ -8,9 +8,9 @@ vcpkg_from_github( 0001-fix-uwp.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libtheora.def DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-theora-config.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/libtheora.def" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-theora-config.cmake.in" DESTINATION "${SOURCE_PATH}") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(THEORA_X86_OPT ON) @@ -18,18 +18,17 @@ else() set(THEORA_X86_OPT OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_X86=${THEORA_X86_OPT} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/unofficial-theora") + vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/unofficial-theora TARGET_PATH share/unofficial-theora) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtheora) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libtheora/LICENSE ${CURRENT_PACKAGES_DIR}/share/libtheora/copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/LICENSE") diff --git a/ports/libtheora/vcpkg.json b/ports/libtheora/vcpkg.json index 58167e7d1bbf41..17f4ccdf9923c5 100644 --- a/ports/libtheora/vcpkg.json +++ b/ports/libtheora/vcpkg.json @@ -1,10 +1,19 @@ { "name": "libtheora", "version-string": "1.2.0alpha1-20170719", - "port-version": 3, + "port-version": 4, "description": "Theora is a free and open video compression format from the Xiph.org Foundation.", "homepage": "https://github.com/xiph/theora", + "license": null, "dependencies": [ - "libogg" + "libogg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 9068a62199dd73..ba5408f03b5c63 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4146,7 +4146,7 @@ }, "libtheora": { "baseline": "1.2.0alpha1-20170719", - "port-version": 3 + "port-version": 4 }, "libtins": { "baseline": "4.3", diff --git a/versions/l-/libtheora.json b/versions/l-/libtheora.json index 3aa9a91bb98bf9..4fba0ff535c709 100644 --- a/versions/l-/libtheora.json +++ b/versions/l-/libtheora.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77e6aad4fc7e821831290f3e17d368ea17609117", + "version-string": "1.2.0alpha1-20170719", + "port-version": 4 + }, { "git-tree": "f54e2dbc66d96847b2b075baa7ae3a4cc032328d", "version-string": "1.2.0alpha1-20170719", From 1c6c0861accce8cb38830d0fc6569a57f78833b4 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 18 Jul 2022 22:16:51 +0200 Subject: [PATCH 148/791] [secp256k1] no absolute paths (#25815) --- ports/secp256k1/CMakeLists.txt | 2 +- ports/secp256k1/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/secp256k1.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/secp256k1/CMakeLists.txt b/ports/secp256k1/CMakeLists.txt index 0f86ca49529be2..3fe32d099c8fde 100644 --- a/ports/secp256k1/CMakeLists.txt +++ b/ports/secp256k1/CMakeLists.txt @@ -15,7 +15,7 @@ add_definitions( file(GLOB SOURCES src/secp256k1.c) add_library(secp256k1 ${SOURCES}) -target_include_directories(secp256k1 PUBLIC $ $) +target_include_directories(secp256k1 PUBLIC $ $ $) file(GLOB SOURCES_PRECOMP src/precomputed_ecmult.c src/precomputed_ecmult_gen.c) add_library(secp256k1_precomputed ${SOURCES_PRECOMP}) diff --git a/ports/secp256k1/vcpkg.json b/ports/secp256k1/vcpkg.json index f5c05ffeec8107..8026e540c7891d 100644 --- a/ports/secp256k1/vcpkg.json +++ b/ports/secp256k1/vcpkg.json @@ -1,6 +1,7 @@ { "name": "secp256k1", "version-date": "2022-07-11", + "port-version": 1, "description": "Optimized C library for EC operations on curve", "homepage": "https://github.com/bitcoin-core/secp256k1", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ba5408f03b5c63..e7858d24980f23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6514,7 +6514,7 @@ }, "secp256k1": { "baseline": "2022-07-11", - "port-version": 0 + "port-version": 1 }, "selene": { "baseline": "0.3.1", diff --git a/versions/s-/secp256k1.json b/versions/s-/secp256k1.json index ec3131b275b1bf..0d095d4f519211 100644 --- a/versions/s-/secp256k1.json +++ b/versions/s-/secp256k1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "deb0a4b2cf9d3e5a0d4c3c8475a6851b7345d39d", + "version-date": "2022-07-11", + "port-version": 1 + }, { "git-tree": "31de2b5d2286595ff7771a30dee3c68d04e78082", "version-date": "2022-07-11", From 7529e8c4cc37f424edaf38e222ee9ff4f0a184c6 Mon Sep 17 00:00:00 2001 From: An Tao Date: Tue, 19 Jul 2022 04:17:56 +0800 Subject: [PATCH 149/791] [trantor] Update to 1.5.6 (#25809) --- ports/trantor/portfile.cmake | 5 ++--- ports/trantor/vcpkg.json | 2 +- ports/trantor/vcpkg.patch | 14 -------------- versions/baseline.json | 2 +- versions/t-/trantor.json | 5 +++++ 5 files changed, 9 insertions(+), 19 deletions(-) delete mode 100644 ports/trantor/vcpkg.patch diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index f2dcdfb46b19de..d7cec3fb19626e 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.5.5 - SHA512 41068dcefcaf55908735126375b65a83a7d7085f30d5eb14e8d73fa255405ec77164c34b9ef0e5e6da3aeae3e66b9d57d4fca8901d63d4414bf8e857bd25dcd4 + REF v1.5.6 + SHA512 9c9827b1640fa23f2941c6c10ffe692d4207595de1cb149f94140c0f20d4fe6c45e3efcc50d464bd40aff80443dfe3bdd8db263302755ab8f639a920e497c0b3 HEAD_REF master PATCHES - vcpkg.patch ) vcpkg_cmake_configure( diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json index 3af0abe63ec8fd..67440de43425e9 100644 --- a/ports/trantor/vcpkg.json +++ b/ports/trantor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "trantor", - "version-semver": "1.5.5", + "version-semver": "1.5.6", "description": "A non-blocking I/O cross-platform TCP network library, using C++14", "homepage": "https://github.com/an-tao/trantor", "license": "BSD-2-Clause", diff --git a/ports/trantor/vcpkg.patch b/ports/trantor/vcpkg.patch deleted file mode 100644 index 7735262b1844b1..00000000000000 --- a/ports/trantor/vcpkg.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 33b8e2c..e8c1cc2 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -148,6 +148,9 @@ if(HAVE_C-ARES) - set(private_headers - ${private_headers} - trantor/net/inner/AresResolver.h) -+ if(APPLE) -+ target_link_libraries(${PROJECT_NAME} PRIVATE resolv) -+ endif() - else() - set(TRANTOR_SOURCES - ${TRANTOR_SOURCES} diff --git a/versions/baseline.json b/versions/baseline.json index e7858d24980f23..232c7c9d3cffe5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7217,7 +7217,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.5", + "baseline": "1.5.6", "port-version": 0 }, "tre": { diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 7f1733fc86f6e1..56cc41162164b0 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f72c33fe2ab8b7d6b89cf48402c3cb550233abe", + "version-semver": "1.5.6", + "port-version": 0 + }, { "git-tree": "9d602ca62a711669efb9d496f9644334fecd8c9d", "version-semver": "1.5.5", From 56cc138c0ac2585f698e77ab339505c3371c570e Mon Sep 17 00:00:00 2001 From: Tatsunori Uchino Date: Tue, 19 Jul 2022 05:18:32 +0900 Subject: [PATCH 150/791] [nowide] update to 11.2.0 (#25808) --- ports/nowide/portfile.cmake | 6 +++--- ports/nowide/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nowide.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/nowide/portfile.cmake b/ports/nowide/portfile.cmake index 159486f1cfaa23..e77c5085546a77 100644 --- a/ports/nowide/portfile.cmake +++ b/ports/nowide/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/boostorg/nowide/releases/download/v11.1.3/nowide_standalone_v11.1.3.tar.gz" - FILENAME "nowide_standalone_v11.1.3.tar.gz" - SHA512 8e493b9ee7f3f218dcc1a0c2f040c040f8f3d10ec7c204caee92986a2cc54d4fc06f530b13e7b14cfdbbd42fd106e151916e2f8fae524a051688d6785d7c2993 + URLS "https://github.com/boostorg/nowide/releases/download/v11.2.0/nowide_standalone_v11.2.0.tar.gz" + FILENAME "nowide_standalone_v11.2.0.tar.gz" + SHA512 c3748921b85648aa0e89970f2ab24588cbc72d05edd7ddf4f61a607d9ecbddd45e9e6799d2ed83386c43045b9487693e027494a81b11a6a7bdfaa939d1251938 ) vcpkg_extract_source_archive_ex( diff --git a/ports/nowide/vcpkg.json b/ports/nowide/vcpkg.json index 82269b0566dc85..ec60ea01c74d23 100644 --- a/ports/nowide/vcpkg.json +++ b/ports/nowide/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nowide", - "version": "11.1.3", + "version": "11.2.0", "description": "Boost nowide module (standalone)", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 232c7c9d3cffe5..328edc26267ce9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4961,7 +4961,7 @@ "port-version": 2 }, "nowide": { - "baseline": "11.1.3", + "baseline": "11.2.0", "port-version": 0 }, "nrf-ble-driver": { diff --git a/versions/n-/nowide.json b/versions/n-/nowide.json index ef5bd9f1aee30a..a90912bd77c9e8 100644 --- a/versions/n-/nowide.json +++ b/versions/n-/nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc71e4553a59625e8daaf2c3e1d54af1f19a0279", + "version": "11.2.0", + "port-version": 0 + }, { "git-tree": "2243fbc97eb5f4ef81fe44e85e449227464cc185", "version": "11.1.3", From 687f4aab11df9b1a854d0d7207c558da545b4cc9 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Jul 2022 22:21:36 +0200 Subject: [PATCH 151/791] Save meson logs on failure (#25806) * [vcpkg_configure_meson] Save log files on error * Document SAVE_LOG_FILES option --- .../vcpkg_execute_required_process.md | 9 +++++++++ scripts/cmake/vcpkg_configure_meson.cmake | 17 ++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/maintainers/vcpkg_execute_required_process.md b/docs/maintainers/vcpkg_execute_required_process.md index b00c97260f2ad3..7aaf5c45dad262 100644 --- a/docs/maintainers/vcpkg_execute_required_process.md +++ b/docs/maintainers/vcpkg_execute_required_process.md @@ -13,6 +13,7 @@ vcpkg_execute_required_process( [TIMEOUT ] [OUTPUT_VARIABLE ] [ERROR_VARIABLE ] + [SAVE_LOG_FILES [...]] ) ``` ## Parameters @@ -40,6 +41,14 @@ Optional variable to receive stderr of the command. This should be a unique name for different triplets so that the logs don't conflict when building multiple at once. +### SAVE_LOG_FILES + +Optional files to be moved from the working directory to `${CURRENT_BUILDTREES_DIR}`. +The files are copied even if the process failed. +The target file names are constructed from the `LOGNAME` parameter and the source filename. +If the target file name doesn't end in `.log`, this suffix is appended. +This helps to collect relevant log files in CI setups. + ## Examples * [ffmpeg](https://github.com/Microsoft/vcpkg/blob/master/ports/ffmpeg/portfile.cmake) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index e98beefbb243ed..9056a1099f91d3 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -446,21 +446,12 @@ function(vcpkg_configure_meson) COMMAND ${MESON} ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}} ${arg_SOURCE_PATH} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}" LOGNAME config-${TARGET_TRIPLET}-${suffix_${buildtype}} + SAVE_LOG_FILES + meson-logs/meson-log.txt + meson-info/intro-dependencies.json + meson-logs/install-log.txt ) - #Copy meson log files into buildtree for CI - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.log") - endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-info/intro-dependencies.json" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/intro-dependencies.json" "${CURRENT_BUILDTREES_DIR}/intro-dependencies-${suffix_${buildtype}}.log") - endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.log") - endif() message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") if(NOT arg_NO_PKG_CONFIG) From 28f7523ba06e02a9cc1f84412219963c0eceac55 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 18 Jul 2022 22:36:48 +0200 Subject: [PATCH 152/791] [opencolorio] Update to 2.1.2, fixes (#25805) * Fix exported Imath dependency * Drop unused deps from patches and config * Handle DLL import in installed header * Fix non-required find_package(OpenColorIO) * Omit unrelocatable script * Installation cleanup * Update to 2.1.2 * Fix exported pc file * Update versions * Silence warning * Update versions --- ports/opencolorio/fix-buildTools.patch | 13 ------- ports/opencolorio/fix-dependency.patch | 48 ++++---------------------- ports/opencolorio/fix-pkgconfig.patch | 10 ++++++ ports/opencolorio/portfile.cmake | 27 +++++++++------ ports/opencolorio/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/o-/opencolorio.json | 5 +++ 7 files changed, 41 insertions(+), 69 deletions(-) delete mode 100644 ports/opencolorio/fix-buildTools.patch create mode 100644 ports/opencolorio/fix-pkgconfig.patch diff --git a/ports/opencolorio/fix-buildTools.patch b/ports/opencolorio/fix-buildTools.patch deleted file mode 100644 index 24b1c3fd850a4c..00000000000000 --- a/ports/opencolorio/fix-buildTools.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt -index b992bbc..804d3c5 100644 ---- a/src/OpenColorIO/CMakeLists.txt -+++ b/src/OpenColorIO/CMakeLists.txt -@@ -248,7 +248,7 @@ if(NOT BUILD_SHARED_LIBS) - else() - # Only exports selected symbols. - target_compile_definitions(OpenColorIO -- PUBLIC -+ PRIVATE - OpenColorIO_EXPORTS - ) - endif() diff --git a/ports/opencolorio/fix-dependency.patch b/ports/opencolorio/fix-dependency.patch index 1ddda42ec02fb4..d446358fc3be4f 100644 --- a/ports/opencolorio/fix-dependency.patch +++ b/ports/opencolorio/fix-dependency.patch @@ -39,7 +39,7 @@ index 8787b87..f953ceb 100644 set(OCIO_HALF_LIB IlmBase::Half CACHE STRING "Half library target" FORCE) set(OCIO_USE_IMATH_HALF "0" CACHE STRING "Whether 'half' type will be sourced from the Imath library (>=v3.0)" FORCE) -@@ -65,13 +65,13 @@ if(OCIO_BUILD_APPS) +@@ -65,7 +65,7 @@ if(OCIO_BUILD_APPS) # lcms2 # https://github.com/mm2/Little-CMS @@ -48,21 +48,6 @@ index 8787b87..f953ceb 100644 endif() if(OCIO_BUILD_OPENFX) - # openfx - # https://github.com/ofxa/openfx -- find_package(openfx 1.4 REQUIRED) -+ find_package(openfx CONFIG REQUIRED) - endif() - - if (OCIO_PYTHON_VERSION AND NOT OCIO_BUILD_PYTHON) -@@ -100,6 +100,6 @@ if(OCIO_BUILD_PYTHON OR OCIO_BUILD_DOCS) - if(OCIO_BUILD_PYTHON) - # pybind11 - # https://github.com/pybind/pybind11 -- find_package(pybind11 2.6.1 REQUIRED) -+ find_package(pybind11 CONFIG REQUIRED) - endif() - endif() diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt index 034185d..b992bbc 100755 --- a/src/OpenColorIO/CMakeLists.txt @@ -80,38 +65,17 @@ index 034185d..b992bbc 100755 yaml-cpp ) -@@ -242,13 +242,13 @@ endif() - - if(NOT BUILD_SHARED_LIBS) - target_compile_definitions(OpenColorIO -- PRIVATE -+ PUBLIC - OpenColorIO_SKIP_IMPORTS - ) - else() - # Only exports selected symbols. - target_compile_definitions(OpenColorIO -- PRIVATE -+ PUBLIC - OpenColorIO_EXPORTS - ) - endif() diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in index eebb2c1..7147dc3 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in -@@ -2,4 +2,14 @@ +@@ -2,4 +2,9 @@ include(CMakeFindDependencyMacro) -+find_dependency(expat CONFIG REQUIRED) -+find_dependency(imath CONFIG REQUIRED) -+find_dependency(pystring CONFIG REQUIRED) -+find_dependency(yaml-cpp CONFIG REQUIRED) -+ -+if(@OCIO_BUILD_APPS@) -+ find_dependency(lcms2 CONFIG REQUIRED) -+ find_dependency(GLEW) -+endif() ++find_dependency(expat CONFIG) ++find_dependency(Imath CONFIG) ++find_dependency(pystring CONFIG) ++find_dependency(yaml-cpp CONFIG) + include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake) diff --git a/ports/opencolorio/fix-pkgconfig.patch b/ports/opencolorio/fix-pkgconfig.patch new file mode 100644 index 00000000000000..7337952c8c12a2 --- /dev/null +++ b/ports/opencolorio/fix-pkgconfig.patch @@ -0,0 +1,10 @@ +diff --git a/src/OpenColorIO/res/OpenColorIO.pc.in b/src/OpenColorIO/res/OpenColorIO.pc.in +index f25c280..d9a450b 100644 +--- a/src/OpenColorIO/res/OpenColorIO.pc.in ++++ b/src/OpenColorIO/res/OpenColorIO.pc.in +@@ -9,3 +9,5 @@ Description: @PROJECT_DESCRIPTION@ + URL: @PROJECT_HOMEPAGE_URL@ + Libs: -L${libdir} -l@PROJECT_NAME@ + Cflags: -I${includedir} ++Libs.private: -lpystring ++Requires.private: expat Imath yaml-cpp diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index 9465e4978a9b30..a9bf1feeaacaf2 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO - REF v2.1.1 - SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194 + REF v2.1.2 + SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353 HEAD_REF master PATCHES fix-dependency.patch - fix-buildTools.patch + fix-pkgconfig.patch ) file(REMOVE "${SOURCE_PATH}/share/cmake/modules/Findexpat.cmake") @@ -34,20 +34,30 @@ vcpkg_cmake_configure( -DOCIO_INSTALL_EXT_PACKAGES=NONE -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_OpenImageIO ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME OpenColorIO CONFIG_PATH "lib/cmake/OpenColorIO") +set(dll_import 0) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(dll_import 1) +endif() +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/OpenColorIO/OpenColorABI.h" + "ifndef OpenColorIO_SKIP_IMPORTS" + "if ${dll_import}" +) + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/OpenColorIO") vcpkg_copy_pdbs() -# Clean redundant files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake" - "${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake" + "${CURRENT_PACKAGES_DIR}/share/ocio" ) if(OCIO_BUILD_APPS) vcpkg_copy_tools( @@ -57,8 +67,5 @@ if(OCIO_BUILD_APPS) endif() vcpkg_fixup_pkgconfig() -if(NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ocio/setup_ocio.sh" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../") -endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index 751770137964ee..b206a5688534ef 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencolorio", - "version-semver": "2.1.1", - "port-version": 2, + "version-semver": "2.1.2", "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 328edc26267ce9..895fc5fea58fe4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5157,8 +5157,8 @@ "port-version": 8 }, "opencolorio": { - "baseline": "2.1.1", - "port-version": 2 + "baseline": "2.1.2", + "port-version": 0 }, "opencolorio-tools": { "baseline": "1.1.1", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index ac457821ba1b2d..4d749dfe24d568 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d728bb2681e89ffbe9c6e1ec2811d5d194d9fd09", + "version-semver": "2.1.2", + "port-version": 0 + }, { "git-tree": "80e8a46f8c1c2cd748834cd225edbe127a489d5a", "version-semver": "2.1.1", From a68d803377c874c1676c4778aa57ab45d8c751b7 Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Mon, 18 Jul 2022 14:12:32 -0700 Subject: [PATCH 153/791] [libtcod] Update to 1.21.0 (#25802) * STB patch no longer needed. * Replace deprecated dependency lodepng-c. * Added 'sdl' and 'threads' features. Libtcod can now be compiled without linking to SDL2. Problematic threading functions can be disabled, and are disabled by default. * Update to 1.21.0. Change head ref to 'main'. --- ports/libtcod/portfile.cmake | 17 +++++++++++------ ports/libtcod/stb-headers.patch | 11 ----------- ports/libtcod/vcpkg.json | 21 +++++++++++++++------ versions/baseline.json | 4 ++-- versions/l-/libtcod.json | 5 +++++ 5 files changed, 33 insertions(+), 25 deletions(-) delete mode 100644 ports/libtcod/stb-headers.patch diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index d185df19fbcc72..fd17041cfa6578 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,11 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.20.1 - SHA512 bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76 - HEAD_REF develop - PATCHES - stb-headers.patch + REF 1.21.0 + SHA512 1d18a49b0d66337e2b29ad6b9a4a412cc4d2fd723d9a3d3c983ff3ef2f5bee4422ea3469513e0fe3b2f885773fb5d70e17128bc473b952ab6e0de27f687c905e + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "sdl" CMAKE_DISABLE_FIND_PACKAGE_SDL2 + "sdl" CMAKE_DISABLE_FIND_PACKAGE_GLAD + "threads" CMAKE_DISABLE_FIND_PACKAGE_Threads ) vcpkg_cmake_configure( @@ -18,7 +23,7 @@ vcpkg_cmake_configure( -DLIBTCOD_GLAD=find_package -DLIBTCOD_LODEPNG=find_package -DLIBTCOD_UTF8PROC=vcpkg - -DLIBTCOD_STB=vcpkg + -DLIBTCOD_STB=find_package ) vcpkg_cmake_install() diff --git a/ports/libtcod/stb-headers.patch b/ports/libtcod/stb-headers.patch deleted file mode 100644 index 742ae773a121b0..00000000000000 --- a/ports/libtcod/stb-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -91,7 +91,7 @@ - message("Will be vendored: stb") - target_include_directories(${PROJECT_NAME} PRIVATE "vendor/") - elseif(LIBTCOD_STB STREQUAL "vcpkg") -- find_path(STB_INCLUDE_DIRS "stb.h") -+ find_path(STB_INCLUDE_DIRS stb_ds.h) - target_include_directories(${PROJECT_NAME} PRIVATE ${STB_INCLUDE_DIRS}) - else() - message(FATAL_ERROR "Unknown option for LIBTCOD_STB: '${LIBTCOD_STB}'") diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index 29c5e4036d407e..b6cd1e7ad02519 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,16 +1,13 @@ { "name": "libtcod", - "version": "1.20.1", - "port-version": 1, + "version": "1.21.0", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", "documentation": "https://libtcod.readthedocs.io/en/latest/", "license": "BSD-3-Clause", "dependencies": [ - "glad", - "lodepng-c", - "sdl2", + "lodepng", "stb", "utf8proc", { @@ -22,5 +19,17 @@ "host": true }, "zlib" - ] + ], + "features": { + "sdl": { + "description": "Support for SDL2 windows and events including OpenGL support and the libtcod context.", + "dependencies": [ + "glad", + "sdl2" + ] + }, + "threads": { + "description": "Support for deprecated threading functions. If in doubt then leave this disabled." + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 895fc5fea58fe4..225c9748e0e220 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4137,8 +4137,8 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.20.1", - "port-version": 1 + "baseline": "1.21.0", + "port-version": 0 }, "libtess2": { "baseline": "2021-12-27", diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index 83b242ce74fac4..d25e566a5e3cd4 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "598c5c5eb9ba1628257089e6397b7bbdd6723ee0", + "version": "1.21.0", + "port-version": 0 + }, { "git-tree": "34c13b63430589533e25be1fdec7afc8fbe68f6c", "version": "1.20.1", From c8ace4788a1ede82e1a53ef606f4c1cae10b8b32 Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Mon, 18 Jul 2022 17:13:39 -0400 Subject: [PATCH 154/791] [bshoshany-thread-pool] Updated to v3.1.0 (#25795) * [bshoshany-thread-pool] Updated to v3.1.0 * [bshoshany-thread-pool] Updated to v3.1.0 --- ports/bshoshany-thread-pool/portfile.cmake | 4 ++-- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index 3476bb580f5c6b..fa4864651b811b 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool - REF v3.0.0 - SHA512 009c45bdca7555d7446add9bdfd1080d1af09071f94034933bf09629425b6945b708e41cd572b0eb270fd53a1e8a57eed606378d147c88e9f05eaf6fd89d88c9 + REF v3.1.0 + SHA512 c53f85392422c957610fe3414340bce9dc22b7d2eab901f253510ea85bb50ee386c01258569b72dbaf151782fe5284d88f706d188d96d0746744bdd92c1ada71 HEAD_REF master ) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 85bb9d7aa6133d..12c4c3830f33d3 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "3.0.0", + "version": "3.1.0", "maintainers": "Barak Shoshany ", "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index 7cd55ea99242a5..4fe6e7bd30ac3a 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9903a88f968331b1a71254f21e8db7ddd5782df9", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "76370f19ee1a5791b57631d57ced31da022f8d3e", "version": "3.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 225c9748e0e220..b63b9e254e0871 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1177,7 +1177,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "3.0.0", + "baseline": "3.1.0", "port-version": 0 }, "bsio": { From 359dbe3a07c7fb55fd70478d73a5082299ff0f6a Mon Sep 17 00:00:00 2001 From: Oleg Derevenetz Date: Tue, 19 Jul 2022 00:26:05 +0300 Subject: [PATCH 155/791] [sdl2-mixer] Update to 2.6.1 (#25763) * Update sdl2-mixer to 2.6.1 * SDL2_mixer: fix upstream CMakeLists * SDL2_mixer: add vcpkg_fixup_pkgconfig() * Fix sdl2pp dependency on SDL2_mixer * Never use vendored libs * Update baseline * sdl2pp: add license * Update baseline * Remove apparently redundant pkgconfig fix * Use the commit hash for REF * Update baseline * Revert "Remove apparently redundant pkgconfig fix" This reverts commit 98e0d7f76ddad34dde2ac57627b25f6c5e33f904. * Update baseline * Minimize sdl2pp patch * Update baseline * Reformat * Update baseline --- ports/sdl2-mixer/CMakeLists.txt | 166 ----------------------- ports/sdl2-mixer/fix-featurempg123.patch | 47 ------- ports/sdl2-mixer/fix-pkg-prefix.patch | 13 ++ ports/sdl2-mixer/fix-pkgconfig.patch | 13 ++ ports/sdl2-mixer/portfile.cmake | 63 +++------ ports/sdl2-mixer/vcpkg.json | 21 ++- ports/sdl2pp/fix-dependencies.patch | 13 +- ports/sdl2pp/vcpkg.json | 3 +- versions/baseline.json | 6 +- versions/s-/sdl2-mixer.json | 5 + versions/s-/sdl2pp.json | 5 + 11 files changed, 76 insertions(+), 279 deletions(-) delete mode 100644 ports/sdl2-mixer/CMakeLists.txt delete mode 100644 ports/sdl2-mixer/fix-featurempg123.patch create mode 100644 ports/sdl2-mixer/fix-pkg-prefix.patch create mode 100644 ports/sdl2-mixer/fix-pkgconfig.patch diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt deleted file mode 100644 index 2ab5e00ad91cc2..00000000000000 --- a/ports/sdl2-mixer/CMakeLists.txt +++ /dev/null @@ -1,166 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(SDL2_MIXER C) - -find_path(SDL_INCLUDE_DIR SDL.h PATH_SUFFIXES SDL2) -find_package(SDL2 CONFIG REQUIRED) -set(SDL_MIXER_INCLUDES ${SDL_INCLUDE_DIR}) - -set(SDL_MIXER_LIBRARIES SDL2::SDL2) - -# builtin formats -set(SDL_MIXER_DEFINES MUSIC_WAV) - -# MP3 support -if(SDL_MIXER_ENABLE_MP3) - find_path(MPG123_INCLUDE_DIR mpg123.h) - find_library(MPG123_LIBRARY NAMES libmpg123 mpg123) - list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123) - list(APPEND SDL_MIXER_LIBRARIES ${MPG123_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(MPG123_LIBRARY_NAME "${MPG123_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DMPG123_DYNAMIC="${MPG123_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# FLAC support -if(SDL_MIXER_ENABLE_FLAC) - find_path(FLAC_INCLUDE_DIR FLAC/all.h) - find_library(FLAC_LIBRARY FLAC) - list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC) - list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(FLAC_LIBRARY_NAME "${FLAC_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DFLAC_DYNAMIC="${FLAC_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# MOD support -if(SDL_MIXER_ENABLE_MOD) - find_path(MODPLUG_INCLUDE_DIR libmodplug/modplug.h) - find_library(MODPLUG_LIBRARY modplug) - list(APPEND SDL_MIXER_INCLUDES ${MODPLUG_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_MOD_MODPLUG) - list(APPEND SDL_MIXER_LIBRARIES ${MODPLUG_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(MODPLUG_LIBRARY_NAME "${MODPLUG_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DMODPLUG_DYNAMIC="${MODPLUG_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# Ogg-Vorbis support -if(SDL_MIXER_ENABLE_OGGVORBIS) - find_path(VORBIS_INCLUDE_DIR vorbis/codec.h) - find_library(VORBISFILE_LIBRARY vorbisfile) - list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) - list(APPEND SDL_MIXER_LIBRARIES ${VORBISFILE_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(VORBISFILE_LIBRARY_NAME "${VORBISFILE_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DOGG_DYNAMIC="${VORBISFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# Opus support -if(SDL_MIXER_ENABLE_OPUS) - find_path(OPUS_INCLUDE_DIR opus/opusfile.h) - find_library(OPUSFILE_LIBRARY opusfile) - list(APPEND SDL_MIXER_INCLUDES ${OPUS_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_OPUS) - list(APPEND SDL_MIXER_LIBRARIES ${OPUSFILE_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(OPUSFILE_LIBRARY_NAME "${OPUSFILE_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DOPUS_DYNAMIC="${OPUSFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -# Fluidsynth support -if(SDL_MIXER_ENABLE_FLUIDSYNTH) - find_path(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h) - find_library(FLUIDSYNTH_LIBRARY fluidsynth) - list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR}) - list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH) - list(APPEND SDL_MIXER_LIBRARIES ${FLUIDSYNTH_LIBRARY}) - if (SDL_DYNAMIC_LOAD) - get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE) - list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}") - endif() -endif() - -add_library(SDL2_mixer - effect_position.c - effect_stereoreverse.c - effects_internal.c - load_aiff.c - load_voc.c - mixer.c - music.c - music_cmd.c - music_flac.c - music_fluidsynth.c - music_mad.c - music_mikmod.c - music_modplug.c - music_mpg123.c - music_ogg.c - music_opus.c - music_timidity.c - music_wav.c - version.rc) - -if((WIN32 OR APPLE) AND SDL_MIXER_ENABLE_NATIVEMIDI) - list(APPEND SDL_MIXER_DEFINES MUSIC_MID_NATIVE) - target_sources(SDL2_mixer PRIVATE music_nativemidi.c native_midi/native_midi_common.c) - target_link_libraries(SDL2_mixer ${SDL_MIXER_LIBRARIES}) - if(WIN32) - target_sources(SDL2_mixer PRIVATE native_midi/native_midi_win32.c) - target_link_libraries(SDL2_mixer Winmm) - elseif(APPLE) - target_sources(SDL2_mixer PRIVATE native_midi/native_midi_macosx.c) - endif() -endif() - -set_target_properties(SDL2_mixer PROPERTIES DEFINE_SYMBOL DLL_EXPORT) -target_compile_definitions(SDL2_mixer PRIVATE ${SDL_MIXER_DEFINES} ${SDL_MIXER_LOAD_DEFINES}) -target_include_directories(SDL2_mixer PRIVATE ${SDL_MIXER_INCLUDES} ./native_midi) - -install(TARGETS SDL2_mixer - EXPORT SDL2_mixer - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -install(EXPORT SDL2_mixer - DESTINATION share/sdl2-mixer/ - FILE sdl2-mixer-config.cmake - NAMESPACE SDL2:: -) - -set(prefix "") -set(exec_prefix [[${prefix}]]) -set(libdir [[${prefix}/lib]]) -set(includedir [[${prefix}/include]]) -set(PACKAGE "SDL2_mixer") -file(READ "SDL_mixer.h" header_contents) -# #define SDL_MIXER_MAJOR_VERSION 2 -# #define SDL_MIXER_MINOR_VERSION 0 -# #define SDL_MIXER_PATCHLEVEL 5 -string(REGEX MATCH "define *SDL_MIXER_MAJOR_VERSION *([0-9]+)" _ "${header_contents}") -set(VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH "define *SDL_MIXER_MINOR_VERSION *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -string(REGEX MATCH "define *SDL_MIXER_PATCHLEVEL *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -set(SDL_VERSION 0.0) -configure_file(SDL2_mixer.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc" @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_mixer.pc DESTINATION lib/pkgconfig) - -if(NOT SDL_MIXER_SKIP_HEADERS) - install(FILES SDL_mixer.h DESTINATION include/SDL2) -endif() - -message(STATUS "Link-time dependencies:") -foreach(LIBRARY ${SDL_MIXER_LIBRARIES}) - message(STATUS " " ${LIBRARY}) -endforeach() diff --git a/ports/sdl2-mixer/fix-featurempg123.patch b/ports/sdl2-mixer/fix-featurempg123.patch deleted file mode 100644 index 0edcdf871e45ed..00000000000000 --- a/ports/sdl2-mixer/fix-featurempg123.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/music_mpg123.c b/music_mpg123.c -index cd151b9..b4294ab 100644 ---- a/music_mpg123.c -+++ b/music_mpg123.c -@@ -31,7 +31,11 @@ - #include "music_mpg123.h" - - #include -- -+#ifdef _MSC_VER -+typedef ptrdiff_t MIX_SSIZE_T; -+#else -+typedef ssize_t MIX_SSIZE_T; -+#endif - - typedef struct { - int loaded; -@@ -49,7 +53,7 @@ typedef struct { - const char* (*mpg123_plain_strerror)(int errcode); - void (*mpg123_rates)(const long **list, size_t *number); - int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); -- int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); -+ int (*mpg123_replace_reader_handle)( mpg123_handle *mh, MIX_SSIZE_T (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); - off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); - const char* (*mpg123_strerror)(mpg123_handle *mh); - } mpg123_loader; -@@ -96,7 +100,7 @@ static int MPG123_Load(void) - FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode)) - FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number)); - FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) -- FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) -+ FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, MIX_SSIZE_T (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) - FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) - FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) - } -@@ -181,9 +185,9 @@ static char const* mpg_err(mpg123_handle* mpg, int result) - } - - /* we're gonna override mpg123's I/O with these wrappers for RWops */ --static ssize_t rwops_read(void* p, void* dst, size_t n) -+static MIX_SSIZE_T rwops_read(void* p, void* dst, size_t n) - { -- return (ssize_t)SDL_RWread((SDL_RWops*)p, dst, 1, n); -+ return (MIX_SSIZE_T )SDL_RWread((SDL_RWops*)p, dst, 1, n); - } - - static off_t rwops_seek(void* p, off_t offset, int whence) diff --git a/ports/sdl2-mixer/fix-pkg-prefix.patch b/ports/sdl2-mixer/fix-pkg-prefix.patch new file mode 100644 index 00000000000000..90a337784f636f --- /dev/null +++ b/ports/sdl2-mixer/fix-pkg-prefix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e70c4d0b..8038abee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -753,7 +753,7 @@ if(SDL2MIXER_INSTALL) + endif() + + ##### export files ##### +- if(WIN32 AND NOT MINGW) ++ if(0) + set(PKG_PREFIX "cmake") + else() + set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2_mixer") diff --git a/ports/sdl2-mixer/fix-pkgconfig.patch b/ports/sdl2-mixer/fix-pkgconfig.patch new file mode 100644 index 00000000000000..8face0103d24ec --- /dev/null +++ b/ports/sdl2-mixer/fix-pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e70c4d0b..8038abee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -796,7 +796,7 @@ if(SDL2MIXER_INSTALL) + COMPONENT devel + ) + +- if(SDL2MIXER_BUILD_SHARED_LIBS) ++ if(1) + # Only create a .pc file for a shared SDL2_mixer + set(VERSION ${FULL_VERSION}) + set(SDL_VERSION ${SDL_REQUIRED_VERSION}) diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index c0f1a0225909e9..ccca1c94434471 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -1,60 +1,39 @@ -set(SDL2_MIXER_VERSION 2.0.4) - -vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-${SDL2_MIXER_VERSION}.zip" - FILENAME "SDL2_mixer-${SDL2_MIXER_VERSION}.zip" - SHA512 359b4f9877804f9c4b3cb608ca6082aab684f07a20a816ab71c8cdf85d26f76d67eeb5aee44daf52b7935d82aa3b45941f8f53f07ca3dd5150d6c58ed99e1492 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${SDL2_MIXER_VERSION} - PATCHES - fix-featurempg123.patch + REPO libsdl-org/SDL_mixer + REF 1cf51b6e16552e4118d90799ef752f7644efb9fd # release-2.6.1 + SHA512 c18c5d374ba1db8b07c796be5acae3e82b2191c43f9e1156b86f5ce6a088bd8200d9b7feee36de88d518f1ee2a6ff7410e911d37ac641ee4b46f7b098bf916fe + PATCHES fix-pkg-prefix.patch fix-pkgconfig.patch ) -if ("dynamic-load" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message("Building static library, disable dynamic loading") - elseif (NOT "mpg123" IN_LIST FEATURES - AND NOT "libflac" IN_LIST FEATURES - AND NOT "libmodplug" IN_LIST FEATURES - AND NOT "libvorbis" IN_LIST FEATURES - AND NOT "opusfile" IN_LIST FEATURES - ) - message("No features selected, dynamic loading will not be enabled") - endif() -endif() - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - dynamic-load SDL_DYNAMIC_LOAD - mpg123 SDL_MIXER_ENABLE_MP3 - libflac SDL_MIXER_ENABLE_FLAC - libmodplug SDL_MIXER_ENABLE_MOD - libvorbis SDL_MIXER_ENABLE_OGGVORBIS - opusfile SDL_MIXER_ENABLE_OPUS - nativemidi SDL_MIXER_ENABLE_NATIVEMIDI - fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH + fluidsynth SDL2MIXER_MIDI_FLUIDSYNTH + libflac SDL2MIXER_FLAC_LIBFLAC + libmodplug SDL2MIXER_MOD_MODPLUG + libvorbis SDL2MIXER_VORBIS_VORBISFILE + mpg123 SDL2MIXER_MP3_MPG123 + nativemidi SDL2MIXER_MIDI_NATIVE + opusfile SDL2MIXER_OPUS ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DLIBRARY_SUFFIX=${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} # It should always be dynamic suffix - OPTIONS_DEBUG - -DSDL_MIXER_SKIP_HEADERS=ON + -DSDL2MIXER_VENDORED=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup( + PACKAGE_NAME "SDL2_mixer" + CONFIG_PATH "lib/cmake/SDL2_mixer" +) vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index a0286dd919b1d8..8758995c583f31 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,9 +1,9 @@ { "name": "sdl2-mixer", - "version": "2.0.4", - "port-version": 16, + "version": "2.6.1", "description": "Multi-channel audio mixer library for SDL.", - "homepage": "https://www.libsdl.org/projects/SDL_mixer", + "homepage": "https://github.com/libsdl-org/SDL_mixer", + "license": "Zlib", "dependencies": [ "sdl2", { @@ -19,35 +19,32 @@ "nativemidi" ], "features": { - "dynamic-load": { - "description": "Load plugins with dynamic call." - }, "fluidsynth": { - "description": "Support for FluidSynth MIDI/SF2 audio format.", + "description": "Use FluidSynth to play MIDI audio format.", "dependencies": [ "fluidsynth" ] }, "libflac": { - "description": "Support for FLAC audio format.", + "description": "Use libflac to play FLAC audio format instead of the built-in dr_flac.", "dependencies": [ "libflac" ] }, "libmodplug": { - "description": "Support for MOD audio format.", + "description": "Support for MOD audio format using libmodplug.", "dependencies": [ "libmodplug" ] }, "libvorbis": { - "description": "Support for OGG Vorbis audio format.", + "description": "Use libvorbis to play OGG Vorbis audio format instead of the built-in stb_vorbis.", "dependencies": [ "libvorbis" ] }, "mpg123": { - "description": "Support for MP3 audio format.", + "description": "Use mpg123 to play MP3 audio format instead of the built-in dr_mp3.", "dependencies": [ "mpg123" ] @@ -56,7 +53,7 @@ "description": "Support for MIDI audio format on Windows and macOS." }, "opusfile": { - "description": "Support for Opus audio format.", + "description": "Support for Opus audio format using opusfile.", "dependencies": [ "opusfile" ] diff --git a/ports/sdl2pp/fix-dependencies.patch b/ports/sdl2pp/fix-dependencies.patch index 48e5c8f979bf2e..13cc92e5278bdb 100644 --- a/ports/sdl2pp/fix-dependencies.patch +++ b/ports/sdl2pp/fix-dependencies.patch @@ -22,7 +22,7 @@ index cdfd2a6..dc08748 100644 IF(MINGW) SET(MINGW32_LIBRARY "mingw32" CACHE STRING "mingw32 library") -@@ -36,27 +40,27 @@ IF(MINGW) +@@ -36,18 +40,18 @@ IF(MINGW) ENDIF(MINGW) IF(SDL2PP_WITH_IMAGE) @@ -47,15 +47,12 @@ index cdfd2a6..dc08748 100644 SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf") ELSE(SDL2PP_WITH_TTF) MESSAGE(STATUS "SDL2_ttf support disabled") - ENDIF(SDL2PP_WITH_TTF) - +@@ -56,7 +60,7 @@ ENDIF(SDL2PP_WITH_TTF) IF(SDL2PP_WITH_MIXER) -- FIND_PACKAGE(SDL2_mixer REQUIRED) -- SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR}) + FIND_PACKAGE(SDL2_mixer REQUIRED) + SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_MIXER_INCLUDE_DIR}) - SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_MIXER_LIBRARY}) -+ FIND_PACKAGE(sdl2-mixer CONFIG REQUIRED) -+ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) -+ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_mixer) ++ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2_mixer::SDL2_mixer) SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer") ELSE(SDL2PP_WITH_MIXER) MESSAGE(STATUS "SDL2_mixer support disabled") diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json index 316c630be6a0e0..2c454483e60708 100644 --- a/ports/sdl2pp/vcpkg.json +++ b/ports/sdl2pp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "sdl2pp", "version": "0.16.1", - "port-version": 2, + "port-version": 3, "description": "C++11 bindings/wrapper for SDL2", "homepage": "https://sdl2pp.amdmi3.ru", + "license": "Zlib", "dependencies": [ "sdl2", "sdl2-image", diff --git a/versions/baseline.json b/versions/baseline.json index b63b9e254e0871..fef20d8e36e0fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6493,8 +6493,8 @@ "port-version": 6 }, "sdl2-mixer": { - "baseline": "2.0.4", - "port-version": 16 + "baseline": "2.6.1", + "port-version": 0 }, "sdl2-net": { "baseline": "2.0.1", @@ -6506,7 +6506,7 @@ }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 2 + "port-version": 3 }, "seal": { "baseline": "3.7.2", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index dc799edf6ae75a..a676612174bd07 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e802cb751276e60dc8046e2b6219dd9dae4c13a", + "version": "2.6.1", + "port-version": 0 + }, { "git-tree": "23eb6562f5153eb39a84eb2673d5dc9bd2ce78aa", "version": "2.0.4", diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json index f009fb9acca323..a6a8739b9094f3 100644 --- a/versions/s-/sdl2pp.json +++ b/versions/s-/sdl2pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5730ae91038160f97ba206548f86d3fbda63d7c", + "version": "0.16.1", + "port-version": 3 + }, { "git-tree": "99074ba7a6f080e0b9c74dde8254875c95c7d9ea", "version": "0.16.1", From 870165b0f6d94147d93810121169c1bbdbc2d654 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 19 Jul 2022 05:26:53 +0800 Subject: [PATCH 156/791] [CPR] Update to version 1.9.0 (#25244) * [CPR] Update to 1.8.3 (again, see details) * update version * [CPR] Update to 1.8.4 * update version * [CPR] Update to 1.9.0 * remove v1.8.4 in cpr.json * update version --- ports/cpr/portfile.cmake | 4 ++-- ports/cpr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 3c37382960eb4e..2fea1d0329fac1 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF db351ffbbadc6c4e9239daaa26e9aefa9f0ec82d #v1.8.3 - SHA512 4ce4e791c5a29584eaf147b2efc4e5c0fb363cf254e6ec0c66734f7ec8da538b5b295300fee3de218da6daf4107fc11e0eac695885a3380e03a72720d328c3db + REF 871ed52d350214a034f6ef8a3b8f51c5ce1bd400 #v1.9.0 + SHA512 2f0c38e27597cf33457ca5613ead742da6ecea47674542e7762b2206e58226f21070be288b1bc4ff7af5d01e0f1b9f9548daffc5937559d986c5205b7dbc41f0 HEAD_REF master PATCHES 001-cpr-config.patch diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 1b53b85d2f5b01..e835e7bf99c515 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpr", - "version-semver": "1.8.3", + "version-semver": "1.9.0", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index fef20d8e36e0fa..ee1e860106f67b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1677,7 +1677,7 @@ "port-version": 0 }, "cpr": { - "baseline": "1.8.3", + "baseline": "1.9.0", "port-version": 0 }, "cpu-features": { diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 55445f2871a47a..8a70186ffe71c7 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ad107acca744655eb0b5aa05c5e6fc1c5516347", + "version-semver": "1.9.0", + "port-version": 0 + }, { "git-tree": "0699dd50434f04eeccbcd30ed9a3973c3143052b", "version-semver": "1.8.3", From 8b7ac186bfcc5e6ad98f25ac169b8ad3489ee0bc Mon Sep 17 00:00:00 2001 From: Reder Date: Tue, 19 Jul 2022 00:09:27 +0200 Subject: [PATCH 157/791] [sqlitecpp] do not use stack protection (#25761) * do not use stack protection fixes #25760 * update version * update baseline * only remove stack protection for mingw64 * update version * Make variable visible even if unused Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * update version Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/sqlitecpp/portfile.cmake | 5 +++++ ports/sqlitecpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sqlitecpp.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index efeb214506094c..c60ead0f60ced9 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -14,6 +14,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES sqlcipher SQLITE_HAS_CODEC ) +set(USE_STACK_PROTECTION "") +if(VCPKG_TARGET_IS_MINGW) + set(USE_STACK_PROTECTION "-DSQLITECPP_USE_STACK_PROTECTION=OFF") +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -25,6 +29,7 @@ vcpkg_configure_cmake( -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITE_ENABLE_COLUMN_METADATA=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF + ${USE_STACK_PROTECTION} ) vcpkg_install_cmake() diff --git a/ports/sqlitecpp/vcpkg.json b/ports/sqlitecpp/vcpkg.json index c86c7b95edc530..fef44ac18eade1 100644 --- a/ports/sqlitecpp/vcpkg.json +++ b/ports/sqlitecpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sqlitecpp", "version-string": "3.1.1", - "port-version": 1, + "port-version": 2, "description": "SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.", "homepage": "https://github.com/SRombauts/SQLiteCpp", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index ee1e860106f67b..cec80f828fecb9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6838,7 +6838,7 @@ }, "sqlitecpp": { "baseline": "3.1.1", - "port-version": 1 + "port-version": 2 }, "sqlpp11": { "baseline": "0.61", diff --git a/versions/s-/sqlitecpp.json b/versions/s-/sqlitecpp.json index 8ad9ced317cb2c..7bddf2ededf9f2 100644 --- a/versions/s-/sqlitecpp.json +++ b/versions/s-/sqlitecpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b16a053ff6df932be1e7b02ad0b34dff2a03cf5", + "version-string": "3.1.1", + "port-version": 2 + }, { "git-tree": "95b41ad9727bd341deba2739968a3d7173c0fb9b", "version-string": "3.1.1", From c39678d76407b555820abd2f41e724cafd055bc9 Mon Sep 17 00:00:00 2001 From: Yuriy O'Donnell <36282596+yuriy-odonnell-epic@users.noreply.github.com> Date: Tue, 19 Jul 2022 00:10:20 +0200 Subject: [PATCH 158/791] [blake3] Add new port (#25787) * [blake3] Add new port Fixes #20023 * Add license * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/blake3/CMakeLists.txt | 41 +++++++++++++++++++++++++++++++++++++ ports/blake3/portfile.cmake | 20 ++++++++++++++++++ ports/blake3/vcpkg.json | 13 ++++++++++++ versions/b-/blake3.json | 9 ++++++++ versions/baseline.json | 4 ++++ 5 files changed, 87 insertions(+) create mode 100644 ports/blake3/CMakeLists.txt create mode 100644 ports/blake3/portfile.cmake create mode 100644 ports/blake3/vcpkg.json create mode 100644 versions/b-/blake3.json diff --git a/ports/blake3/CMakeLists.txt b/ports/blake3/CMakeLists.txt new file mode 100644 index 00000000000000..cc5f37e1fc62eb --- /dev/null +++ b/ports/blake3/CMakeLists.txt @@ -0,0 +1,41 @@ +cmake_minimum_required(VERSION 3.19) + +project(blake3 LANGUAGES C) + +add_library(blake3) + +target_sources(blake3 PRIVATE + c/blake3.c + c/blake3_dispatch.c + c/blake3_portable.c +) + +# This is a bit too exotic to be worth supporting right now +target_compile_definitions(blake3 PRIVATE BLAKE3_NO_AVX512=1) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + target_sources(blake3 PRIVATE + c/blake3_avx2.c + c/blake3_sse2.c + c/blake3_sse41.c + ) + if (NOT MSVC) + set_source_files_properties(c/blake3_avx2.c COMPILE_FLAGS -mavx2) + set_source_files_properties(c/blake3_sse2.c COMPILE_FLAGS -msse2) + set_source_files_properties(c/blake3_sse41.c COMPILE_FLAGS -msse4.1) + endif() +else() + target_compile_definitions(blake3 PRIVATE BLAKE3_NO_SSE2=1 BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1) +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + target_compile_definitions(blake3 PRIVATE BLAKE3_USE_NEON=1) + target_sources(blake3 PRIVATE + c/blake3_neon.c + ) +else() + target_compile_definitions(blake3 PRIVATE BLAKE3_NO_NEON=1) +endif() + +install(TARGETS blake3) +install(FILES c/blake3.h DESTINATION include) diff --git a/ports/blake3/portfile.cmake b/ports/blake3/portfile.cmake new file mode 100644 index 00000000000000..94da21b776a569 --- /dev/null +++ b/ports/blake3/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BLAKE3-team/BLAKE3 + REF 1.3.1 + SHA512 9906673a9eca100a6ad8c369f4c380ac66b59ed055cb8358fe99bb67ebbcc98e24da5860b257136a1f9cc8ece5733b2ac68c55b9be65ae6f2904ffd92ef34ce6 + HEAD_REF main +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json new file mode 100644 index 00000000000000..44c8020227870c --- /dev/null +++ b/ports/blake3/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "blake3", + "version": "1.3.1", + "description": "BLAKE3 cryptographic hash function.", + "homepage": "https://github.com/BLAKE3-team/BLAKE3", + "license": "CC0-1.0 OR Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json new file mode 100644 index 00000000000000..1a9effce0a4e9c --- /dev/null +++ b/versions/b-/blake3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "62a5201ca424389c823b9b4be3d588e1cbb88a58", + "version": "1.3.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index cec80f828fecb9..036396614aa152 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -500,6 +500,10 @@ "baseline": "5.2.2", "port-version": 0 }, + "blake3": { + "baseline": "1.3.1", + "port-version": 0 + }, "blas": { "baseline": "1", "port-version": 1 From cfc61b1e393fe4dbccb1940f35fae429a4a5272a Mon Sep 17 00:00:00 2001 From: John Wason Date: Mon, 18 Jul 2022 18:17:19 -0400 Subject: [PATCH 159/791] [bullet3] Add bullet3 features double-precision and rtti, enable several extras (#25784) * Add bullet3 features double-precision and rtti, enable a few extras * [bullet3] bump port-version, format, x-add-version * [bullet3] bump port-version * Update version database * [bullet3] reduce port-version * Update version database --- ports/bullet3/portfile.cmake | 11 +++++++++-- ports/bullet3/vcpkg.json | 7 +++++++ versions/b-/bullet3.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 4c70019d3061e5..685d44da1d2c8e 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -13,6 +13,9 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES multithreading BULLET2_MULTITHREADING + double-precision USE_DOUBLE_PRECISION + INVERTED_FEATURES + rtti USE_MSVC_DISABLE_RTTI ) vcpkg_cmake_configure( @@ -21,9 +24,13 @@ vcpkg_cmake_configure( -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON -DBUILD_CPU_DEMOS=OFF -DBUILD_BULLET2_DEMOS=OFF + -DBUILD_OPENGL3_DEMOS=OFF -DBUILD_BULLET3=OFF - -DBUILD_EXTRAS=OFF - -DBUILD_UNIT_TESTS=OFF + -DBUILD_EXTRAS=ON + -DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF + -DBUILD_BULLET_ROBOTICS_EXTRA=OFF + -DBUILD_GIMPACTUTILS_EXTRA=OFF + -DBUILD_UNIT_TESTS=OFF -DINSTALL_LIBS=ON ${FEATURE_OPTIONS} ) diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index 50853901d10597..d9a5b050fa5594 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bullet3", "version": "3.22", + "port-version": 1, "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", "license": "Zlib", @@ -15,8 +16,14 @@ } ], "features": { + "double-precision": { + "description": "Use float64 doubles for bullet3" + }, "multithreading": { "description": "Multithreading functionality for bullet3" + }, + "rtti": { + "description": "Enable RTTI on windows" } } } diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 073216c264162a..96aed05e6ae3e5 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f5ea7c8c35304edd8b2eadb5b60b7300a97b772", + "version": "3.22", + "port-version": 1 + }, { "git-tree": "d196c1956b370bd43889ddf5279600092e1af718", "version": "3.22", diff --git a/versions/baseline.json b/versions/baseline.json index 036396614aa152..522e2e7c784fab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1202,7 +1202,7 @@ }, "bullet3": { "baseline": "3.22", - "port-version": 0 + "port-version": 1 }, "bustache": { "baseline": "1.1.0", From 678c0ea99b778c7871e648182d61e1db7cee8892 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Mon, 18 Jul 2022 15:29:08 -0700 Subject: [PATCH 160/791] Revert "[gpgmm] Add gpgmm. Highly experimental. (#25650)" (#25849) This reverts commit 33c8f025390f8682811629b6830d2d66ecedcaa5. --- ports/gpgmm/portfile.cmake | 31 ------------------------------- ports/gpgmm/vcpkg.json | 18 ------------------ versions/baseline.json | 4 ---- versions/g-/gpgmm.json | 9 --------- 4 files changed, 62 deletions(-) delete mode 100644 ports/gpgmm/portfile.cmake delete mode 100644 ports/gpgmm/vcpkg.json delete mode 100644 versions/g-/gpgmm.json diff --git a/ports/gpgmm/portfile.cmake b/ports/gpgmm/portfile.cmake deleted file mode 100644 index 590f937fd73e44..00000000000000 --- a/ports/gpgmm/portfile.cmake +++ /dev/null @@ -1,31 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO intel/gpgmm - REF v0.0.4 - SHA512 2ffc3c8299f2d10cb1c0013cd306ba45781a644fa0aa426ef1dfa616e4b53671461a376f65b7068b1ff8a4a2d1a6f9539664174eb5830ea6a760ef5e5d0fc6b0 - HEAD_REF main -) - -# gpgmm\third_party config requires Git. Make the tool visible. -vcpkg_find_acquire_program(GIT) -get_filename_component(GIT_DIR "${GIT}" DIRECTORY) -vcpkg_add_to_path("${GIT_DIR}") - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DGPGMM_STANDALONE=OFF - -DGPGMM_ENABLE_TESTS=OFF -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gpgmm/vcpkg.json b/ports/gpgmm/vcpkg.json deleted file mode 100644 index 1786fab4056a11..00000000000000 --- a/ports/gpgmm/vcpkg.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "gpgmm", - "version": "0.0.4", - "description": "GPGMM is a General-Purpose GPU Memory Management library. It provides a common set of GPU memory routines optimized for GPUs. The library helps developers manage video memory by implementing the necessary functionality across components based on Vulkan or D3D12", - "homepage": "https://github.com/intel/GPGMM/", - "license": "Apache-2.0", - "supports": "windows & !(arm | uwp)", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 522e2e7c784fab..c85f5429199825 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2664,10 +2664,6 @@ "baseline": "1.14.0", "port-version": 2 }, - "gpgmm": { - "baseline": "0.0.4", - "port-version": 0 - }, "gppanel": { "baseline": "2020-05-20", "port-version": 2 diff --git a/versions/g-/gpgmm.json b/versions/g-/gpgmm.json deleted file mode 100644 index bc2b5d848b4fb3..00000000000000 --- a/versions/g-/gpgmm.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "08e07fe17d9d990b3d2579b33c6851b60faa6c2c", - "version": "0.0.4", - "port-version": 0 - } - ] -} From c81b29af9653d46e0dcdc3d82c0ce0abf3792fcb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:56:27 +0200 Subject: [PATCH 161/791] [pipewire] no absolute paths (#25841) --- ports/pipewire/portfile.cmake | 10 ++++++++++ ports/pipewire/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/pipewire.json | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ports/pipewire/portfile.cmake b/ports/pipewire/portfile.cmake index 11214f58372392..df9531df7fe807 100644 --- a/ports/pipewire/portfile.cmake +++ b/ports/pipewire/portfile.cmake @@ -81,3 +81,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() + +# remove absolute paths +file(GLOB config_files "${CURRENT_PACKAGES_DIR}/share/${PORT}/*.conf") +foreach(file ${config_files}) + vcpkg_replace_string("${file}" "in ${CURRENT_PACKAGES_DIR}/etc/pipewire for system-wide changes\n# or" "") + cmake_path(GET file FILENAME filename) + vcpkg_replace_string("${file}" "# ${CURRENT_PACKAGES_DIR}/etc/pipewire/${filename}.d/ for system-wide changes or in" "") +endforeach() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pipewire/pipewire.conf" "${CURRENT_PACKAGES_DIR}/bin" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/pipewire/minimal.conf" "${CURRENT_PACKAGES_DIR}/bin" "") diff --git a/ports/pipewire/vcpkg.json b/ports/pipewire/vcpkg.json index a45c9c806aea0a..1a759218dd23e1 100644 --- a/ports/pipewire/vcpkg.json +++ b/ports/pipewire/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pipewire", "version": "0.3.52", + "port-version": 1, "description": "Low-latency audio/video router and processor. This port only builds the client library, not the server.", "homepage": "https://pipewire.org", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c85f5429199825..82138e8490f0f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5494,7 +5494,7 @@ }, "pipewire": { "baseline": "0.3.52", - "port-version": 0 + "port-version": 1 }, "pistache": { "baseline": "2021-03-31", diff --git a/versions/p-/pipewire.json b/versions/p-/pipewire.json index 08c3f08d2889bc..1ac99b14f433f8 100644 --- a/versions/p-/pipewire.json +++ b/versions/p-/pipewire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3fc407ec59160e15daff40a26eb60515840763e", + "version": "0.3.52", + "port-version": 1 + }, { "git-tree": "4ec746fd8458f073339bf953335742b2abb0ac53", "version": "0.3.52", From af80626a3d0f82f2392225f41646f01be17e4acb Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 19 Jul 2022 18:56:43 +0200 Subject: [PATCH 162/791] [boinc] Update to 7.20.2 (#25837) Signed-off-by: Vitalii Koshura --- ports/boinc/portfile.cmake | 4 ++-- ports/boinc/vcpkg.json | 2 +- versions/b-/boinc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake index 999fb3a155b018..3c24973819962f 100644 --- a/ports/boinc/portfile.cmake +++ b/ports/boinc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BOINC/boinc - REF client_release/7.20/7.20.1 - SHA512 6b4aa9d288888bec847c21b59f8c6c27ad040e5a8f21e3a0fa39999e548e6bd0504723092acfaaba02090962aa1c6537af48bb32cdfc9b13de7d878d2963b731 + REF client_release/7.20/7.20.2 + SHA512 0309d5585ece96a5d9021058870dce9a96c89ece269650961a9b22d5219529e242a55dc1e466f5364535033198ca5c36496ca23125a9cda0c308bfdb4372abbb HEAD_REF master ) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 8466a0754717e4..a0a2158a41b99a 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boinc", - "version": "7.20.1", + "version": "7.20.2", "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "license": "LGPL-3.0-or-later", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 1a902110f89f4e..983198940746b9 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "862d1c12a219592e79f591bbeb090c5f84736a54", + "version": "7.20.2", + "port-version": 0 + }, { "git-tree": "ab47def2f85314a93479d7238572c83c91ac1845", "version": "7.20.1", diff --git a/versions/baseline.json b/versions/baseline.json index 82138e8490f0f4..df4dec0e66cffb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -525,7 +525,7 @@ "port-version": 4 }, "boinc": { - "baseline": "7.20.1", + "baseline": "7.20.2", "port-version": 0 }, "bond": { From 4b61bb45a5817a13591e856b4976bf0a0ccbf4f1 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:58:14 +0200 Subject: [PATCH 163/791] [dpdk] no absolute paths (#25835) --- ports/dpdk/unofficial-dpdk-config.cmake.in | 11 ++++++++++- ports/dpdk/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/dpdk.json | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/dpdk/unofficial-dpdk-config.cmake.in b/ports/dpdk/unofficial-dpdk-config.cmake.in index 90d33c094aecc8..365ed25b5909b3 100644 --- a/ports/dpdk/unofficial-dpdk-config.cmake.in +++ b/ports/dpdk/unofficial-dpdk-config.cmake.in @@ -11,9 +11,18 @@ if(NOT VCPKG_PREFER_SYSTEM_LIBS) set(path_suffix "") endif() set(backup_env_pkg_config_path "$ENV{PKG_CONFIG_PATH}") + + # Compute the installation prefix relative to this file. + get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") + endif() + # libdpdk.pc and libdpdk-libs.pc are installed to this path set(ENV{PKG_CONFIG_PATH} - "@CURRENT_INSTALLED_DIR@${path_suffix}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" + "${_IMPORT_PREFIX}${path_suffix}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" ) else() unset(backup_env_pkg_config_path) diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json index 77fa337376375e..cdfe57ec94e623 100644 --- a/ports/dpdk/vcpkg.json +++ b/ports/dpdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dpdk", "version-string": "22.03", + "port-version": 1, "description": "A set of libraries and drivers for fast packet processing", "homepage": "https://www.dpdk.org/", "documentation": "https://doc.dpdk.org/guides/index.html", diff --git a/versions/baseline.json b/versions/baseline.json index df4dec0e66cffb..d803533c56134a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1970,7 +1970,7 @@ }, "dpdk": { "baseline": "22.03", - "port-version": 0 + "port-version": 1 }, "draco": { "baseline": "1.5.2", diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json index b24a1af97a8f1d..79c39f544f56d3 100644 --- a/versions/d-/dpdk.json +++ b/versions/d-/dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "215be1cdd87b890d105bc8c5cb3e2e5d9a054038", + "version-string": "22.03", + "port-version": 1 + }, { "git-tree": "17a389722a444ba5834d74a86717b6ee963be519", "version-string": "22.03", From 42adffbfc7fe17cb083ea31a4b270eaa584ce169 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 19 Jul 2022 18:58:50 +0200 Subject: [PATCH 164/791] [gdal] no absolute paths (#25804) * [gdal] no absolute paths * gdal no config --- ports/gdal/portfile.cmake | 4 +++- ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index cfa51dfdcfb787..39c9eda11956b3 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -138,8 +138,10 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) + +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/gdal-config" "${CURRENT_PACKAGES_DIR}/debug/bin/gdal-config") + file(GLOB bin_files "${CURRENT_PACKAGES_DIR}/bin/*") -list(REMOVE_ITEM bin_files "${CURRENT_PACKAGES_DIR}/bin/gdal-config") if(NOT bin_files) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 56cc960fcea9bc..f32f73cbe4ab91 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.5.1", - "port-version": 3, + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index d803533c56134a..7f99c2e3e78006 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2478,7 +2478,7 @@ }, "gdal": { "baseline": "3.5.1", - "port-version": 3 + "port-version": 4 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 0fedc3aa8e23b6..5e23d15edd4f15 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "419767a67a207c3b5401b817d8537acafe257e1b", + "version-semver": "3.5.1", + "port-version": 4 + }, { "git-tree": "a7d7e8b112055c7374cbf2e53172eb1832ddb73b", "version-semver": "3.5.1", From c8e1797c30710e98c7cb2c8d76da0bd2639c16e4 Mon Sep 17 00:00:00 2001 From: Tetsuya Hayashi Date: Wed, 20 Jul 2022 02:00:08 +0900 Subject: [PATCH 165/791] [jsonnet] Update to 0.18.0 (#25800) * [jsonnet] Update to 0.18.0 (#20627) * Update jsonnet to 0.18.0 * update patch files * add 0005-use-upstream-rapidyaml.patch to use system rapidyaml * use system rapidyaml * update version * Added license "Apache-2.0" to vcpkg.json from https://github.com/google/jsonnet/blob/master/LICENSE --- .../0003-use-upstream-nlohmann-json.patch | 4 +- ports/jsonnet/0004-incorporate-md5.patch | 11 +++-- .../jsonnet/0005-use-upstream-rapidyaml.patch | 47 +++++++++++++++++++ ports/jsonnet/001-enable-msvc.patch | 5 +- .../002-fix-dependency-and-install.patch | 10 ++-- ports/jsonnet/portfile.cmake | 8 ++-- ports/jsonnet/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/j-/jsonnet.json | 5 ++ 9 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 ports/jsonnet/0005-use-upstream-rapidyaml.patch diff --git a/ports/jsonnet/0003-use-upstream-nlohmann-json.patch b/ports/jsonnet/0003-use-upstream-nlohmann-json.patch index a2e1105b7c40a0..029fd007a6fa4c 100644 --- a/ports/jsonnet/0003-use-upstream-nlohmann-json.patch +++ b/ports/jsonnet/0003-use-upstream-nlohmann-json.patch @@ -1,5 +1,5 @@ diff --git a/core/vm.cpp b/core/vm.cpp -index 0cf06fa..d65a6d7 100644 +index 4617363..e328df5 100644 --- a/core/vm.cpp +++ b/core/vm.cpp @@ -23,7 +23,7 @@ limitations under the License. @@ -10,4 +10,4 @@ index 0cf06fa..d65a6d7 100644 +#include "nlohmann/json.hpp" #include "md5.h" #include "parser.h" - #include "state.h" + #include "ryml_std.hpp" // include this before any other ryml header diff --git a/ports/jsonnet/0004-incorporate-md5.patch b/ports/jsonnet/0004-incorporate-md5.patch index 830fb8d98db351..c56f1489c99780 100644 --- a/ports/jsonnet/0004-incorporate-md5.patch +++ b/ports/jsonnet/0004-incorporate-md5.patch @@ -1,4 +1,5 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index a152fa9..e8a0efa 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -15,7 +15,8 @@ set(LIBJSONNET_HEADERS @@ -22,20 +23,20 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt if (BUILD_SHARED_BINARIES) add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) -add_dependencies(libjsonnet md5 stdlib) --target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) +-target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) +add_dependencies(libjsonnet stdlib) -+target_link_libraries(libjsonnet nlohmann_json::nlohmann_json) ++target_link_libraries(libjsonnet nlohmann_json::nlohmann_json ryml) file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/../include/libjsonnet.h JSONNET_VERSION_DEF REGEX "[#]define[ \t]+LIB_JSONNET_VERSION[ \t]+") -@@ -54,8 +56,8 @@ endif() +@@ -56,8 +58,8 @@ endif() if (BUILD_STATIC_LIBS) # Static library for jsonnet command-line tool. add_library(libjsonnet_static STATIC ${LIBJSONNET_SOURCE}) - add_dependencies(libjsonnet_static md5 stdlib) -- target_link_libraries(libjsonnet_static md5 nlohmann_json::nlohmann_json) +- target_link_libraries(libjsonnet_static md5 nlohmann_json::nlohmann_json ryml) + add_dependencies(libjsonnet_static stdlib) -+ target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json) ++ target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json ryml) set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") target_include_directories(libjsonnet_static INTERFACE diff --git a/ports/jsonnet/0005-use-upstream-rapidyaml.patch b/ports/jsonnet/0005-use-upstream-rapidyaml.patch new file mode 100644 index 00000000000000..732a3f25478baa --- /dev/null +++ b/ports/jsonnet/0005-use-upstream-rapidyaml.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23a8114..f430146 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,7 @@ option(BUILD_STATIC_LIBS "Build a static libjsonnet." ON) + option(BUILD_SHARED_BINARIES "Link binaries to the shared libjsonnet instead of the static one." OFF) + option(USE_SYSTEM_GTEST "Use system-provided gtest library" OFF) + option(USE_SYSTEM_JSON "Use the system-provided json library" OFF) ++option(USE_SYSTEM_RYML "Use the system-provided rapidyaml library" OFF) + set(GLOBAL_OUTPUT_PATH_SUFFIX "" CACHE STRING + "Output artifacts directory.") + +@@ -104,6 +105,11 @@ if(USE_SYSTEM_JSON) + else() + add_subdirectory(third_party/json) + endif() ++if(USE_SYSTEM_RYML) ++ find_package(ryml CONFIG REQUIRED) ++else() ++ add_subdirectory(third_party/rapidyaml/rapidyaml ryml) ++endif() + + # Look for libraries in global output path. + link_directories(${GLOBAL_OUTPUT_PATH}) +@@ -124,7 +130,6 @@ endif() + add_subdirectory(include) + add_subdirectory(stdlib) + add_subdirectory(third_party/md5) +-add_subdirectory(third_party/rapidyaml/rapidyaml ryml) + add_subdirectory(core) + add_subdirectory(cpp) + add_subdirectory(cmd) +diff --git a/core/vm.cpp b/core/vm.cpp +index e328df5..2cafbb7 100644 +--- a/core/vm.cpp ++++ b/core/vm.cpp +@@ -26,8 +26,8 @@ limitations under the License. + #include "nlohmann/json.hpp" + #include "md5.h" + #include "parser.h" +-#include "ryml_std.hpp" // include this before any other ryml header +-#include "ryml.hpp" ++#include "ryml/ryml_std.hpp" // include this before any other ryml header ++#include "ryml/ryml.hpp" + #include "state.h" + #include "static_analysis.h" + #include "string_utils.h" diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch index d5ec55149a3bdc..cbbcccc5e921bf 100644 --- a/ports/jsonnet/001-enable-msvc.patch +++ b/ports/jsonnet/001-enable-msvc.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 385ea82..ebd12b6 100644 +index 5df20ca..23a8114 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ @@ -40,6 +40,7 @@ index c032f02..d80d2a0 100644 + install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) endif() diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index e62a858..3b7afda 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE @@ -49,7 +50,7 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) +add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) add_dependencies(libjsonnet md5 stdlib) - target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) @@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet PUBLIC_HEADER "${LIB_HEADER}") diff --git a/ports/jsonnet/002-fix-dependency-and-install.patch b/ports/jsonnet/002-fix-dependency-and-install.patch index 51b63134b0fd87..73004735fac9e9 100644 --- a/ports/jsonnet/002-fix-dependency-and-install.patch +++ b/ports/jsonnet/002-fix-dependency-and-install.patch @@ -1,4 +1,5 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 3b7afda..a152fa9 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE @@ -8,8 +9,8 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +if (BUILD_SHARED_BINARIES) add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE}) add_dependencies(libjsonnet md5 stdlib) - target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) -@@ -48,6 +49,7 @@ install(TARGETS libjsonnet + target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json ryml) +@@ -50,6 +51,7 @@ install(TARGETS libjsonnet PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") target_include_directories(libjsonnet INTERFACE $) @@ -17,13 +18,14 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt if (BUILD_STATIC_LIBS) # Static library for jsonnet command-line tool. -@@ -102,3 +104,5 @@ if (BUILD_TESTS) +@@ -106,3 +108,5 @@ if (BUILD_TESTS) add_test(jsonnet_test_snippet ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET}) endif() + +install(FILES ${LIB_HEADER} DESTINATION include) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index eb7686c..326125c 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE @@ -46,7 +48,7 @@ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt if (BUILD_STATIC_LIBS) # Static library for jsonnet command-line tool. -@@ -38,6 +39,7 @@ else() +@@ -42,6 +43,7 @@ else() add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static) endif() diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index f7821c1b470713..363a5a38748483 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -5,17 +5,18 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF v0.17.0 - SHA512 D3EE6947163D8ABCED504FF37ECF365C0311164CBF243D4C635D34944F0831CA9FCE2470ACF00EB9A218F82A2E553B3F885DB9BD21BB9DCEFBD707FA0202925D + REF v0.18.0 + SHA512 08a64a4b132df1519292378cef93deb3c60d21636b2a71bce6c13e29cfd93cab465cad77e11f000fb984c5c75a4ca1c92504654fd2e5201343df767ea0e610d1 HEAD_REF master PATCHES 001-enable-msvc.patch 002-fix-dependency-and-install.patch 0003-use-upstream-nlohmann-json.patch 0004-incorporate-md5.patch + 0005-use-upstream-rapidyaml.patch ) -# see https://github.com/google/jsonnet/blob/v0.17.0/Makefile#L214 +# see https://github.com/google/jsonnet/blob/v0.18.0/Makefile#L220 if(VCPKG_TARGET_IS_WINDOWS) find_program(PWSH_PATH pwsh) vcpkg_execute_required_process( @@ -48,6 +49,7 @@ vcpkg_cmake_configure( -DBUILD_JSONNETFMT=OFF -DBUILD_TESTS=OFF -DUSE_SYSTEM_JSON=ON + -DUSE_SYSTEM_RYML=ON ) vcpkg_cmake_install() diff --git a/ports/jsonnet/vcpkg.json b/ports/jsonnet/vcpkg.json index 92984b1dddcc5c..427e4eb202f9de 100644 --- a/ports/jsonnet/vcpkg.json +++ b/ports/jsonnet/vcpkg.json @@ -1,11 +1,13 @@ { "name": "jsonnet", - "version": "0.17.0", + "version": "0.18.0", "description": "Jsonnet - The data templating language", "homepage": "https://github.com/google/jsonnet", + "license": "Apache-2.0", "supports": "!(windows & !static)", "dependencies": [ "nlohmann-json", + "ryml", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 7f99c2e3e78006..71ac0c1978099c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3137,7 +3137,7 @@ "port-version": 0 }, "jsonnet": { - "baseline": "0.17.0", + "baseline": "0.18.0", "port-version": 0 }, "jwt-cpp": { diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index f3dcfe0c21ac52..601aef6586e119 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ac55d2bf1f121bd14e748bbf55569a49a9015d9", + "version": "0.18.0", + "port-version": 0 + }, { "git-tree": "24a514c5bcece6b71ac13744ec40f92f285fc689", "version": "0.17.0", From ebf637bedb9c32bea2176f4488037875c0e935ba Mon Sep 17 00:00:00 2001 From: Qingnan Duan Date: Wed, 20 Jul 2022 01:00:34 +0800 Subject: [PATCH 166/791] [pybind11] Update to version 2.10.0 (#25377) * Pick latest commit from pybind11 to workaround CMake issues * x-add-version * Bump version to 2.10.0 * x-add-version --- ports/pybind11/portfile.cmake | 4 ++-- ports/pybind11/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pybind11.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 113a679c967faf..120ba5a81ad9c7 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.9.2 - SHA512 c6c18e5f59873adb3692640ade26472abd257607e7bb9fd48cfd1949878811e83d6ac6eb8c8dd926622d52ca4f13e5e6a58e0abaaaa1fa814ee831ea2b515272 + REF v2.10.0 + SHA512 93112ce530a0652b2b4458a137b4a35f2fd8607f82ad96698ef422128d0b53e16e1d06c239ee4643b821acafae09c74eb0f72bc4ee5584aa9fcdaff4d79980d9 HEAD_REF master ) diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index 6c9dcf63d7373b..3936e60049f87a 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pybind11", - "version": "2.9.2", + "version": "2.10.0", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 71ac0c1978099c..7ab081b451a7a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5713,7 +5713,7 @@ "port-version": 0 }, "pybind11": { - "baseline": "2.9.2", + "baseline": "2.10.0", "port-version": 0 }, "pystring": { diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index 9340b71f17e6f1..aca56957479968 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84251d247cc46bde6696ad9043326981370e1a79", + "version": "2.10.0", + "port-version": 0 + }, { "git-tree": "0723f5ac350935e5d68d8087c82883dffa706812", "version": "2.9.2", From 8ff168270bc5977384b008bec6e879e15089d850 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 20 Jul 2022 00:22:51 +0200 Subject: [PATCH 167/791] [marble] Fix copyright location (#25871) * [marble] Fix copyright location * Fix version * version --- ports/marble/portfile.cmake | 13 +++++++------ ports/marble/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/marble.json | 5 +++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ports/marble/portfile.cmake b/ports/marble/portfile.cmake index d24c4c603fa30a..b2ad99a5a51093 100644 --- a/ports/marble/portfile.cmake +++ b/ports/marble/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( PATCHES qtfix.patch ) - + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -21,10 +21,10 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) # Install plugins and data files -file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") -file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") -file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") -file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") +file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") +file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") +file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") +file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins") @@ -56,4 +56,5 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marblewidget-qt5d.dll" "${CURRENT_PAC vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json index 5486e7af729083..06c6ae814225cd 100644 --- a/ports/marble/vcpkg.json +++ b/ports/marble/vcpkg.json @@ -1,6 +1,7 @@ { "name": "marble", "version-string": "22.04.0", + "port-version": 1, "description": "Marble KDE library", "homepage": "https://marble.kde.org", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 7ab081b451a7a1..0114230f450628 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4474,7 +4474,7 @@ }, "marble": { "baseline": "22.04.0", - "port-version": 0 + "port-version": 1 }, "marl": { "baseline": "2022-03-02", diff --git a/versions/m-/marble.json b/versions/m-/marble.json index b7507773fc59a5..c9d010a3da0f33 100644 --- a/versions/m-/marble.json +++ b/versions/m-/marble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1e722f12de290f18b92e662040c499a51d57249", + "version-string": "22.04.0", + "port-version": 1 + }, { "git-tree": "7a6e4d655adaa7043e8b347841b11472c9b36a6a", "version-string": "22.04.0", From fde0f2c9b96a044b6034bc4491f5ddedbf790c16 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Jul 2022 00:05:56 +0200 Subject: [PATCH 168/791] [solid3] fix arm64-osx build (#25344) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [solid3] fix arm64-osx build * Update versions/s-/solid3.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/solid3/no-sse.patch | 19 +++++++++++++++++++ ports/solid3/portfile.cmake | 8 ++++---- ports/solid3/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 2 +- versions/s-/solid3.json | 5 +++++ 5 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 ports/solid3/no-sse.patch diff --git a/ports/solid3/no-sse.patch b/ports/solid3/no-sse.patch new file mode 100644 index 00000000000000..ed2cb1ddbb9ae1 --- /dev/null +++ b/ports/solid3/no-sse.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be43838..fe71394 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,8 +87,12 @@ if(MSVC) + endif(MSVC) + + if(UNIX) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -ffast-math -msse2 -mfpmath=sse") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -Wall -ffast-math -msse2 -mfpmath=sse") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -ffast-math") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -Wall -ffast-math") ++ if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse") ++ endif() + if (DYNAMIC_SOLID) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") diff --git a/ports/solid3/portfile.cmake b/ports/solid3/portfile.cmake index 8cca23adac6e47..d39d15fc1bdefa 100644 --- a/ports/solid3/portfile.cmake +++ b/ports/solid3/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES disable-examples.patch potentially-uninitialized-local-pointer-variable.patch + no-sse.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -15,16 +16,15 @@ else() set(DYNAMIC_SOLID ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DDYNAMIC_SOLID=${DYNAMIC_SOLID} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/solid3) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/solid3) file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/solid3) file(RENAME ${CURRENT_PACKAGES_DIR}/share/solid3/README.md ${CURRENT_PACKAGES_DIR}/share/solid3/copyright) diff --git a/ports/solid3/vcpkg.json b/ports/solid3/vcpkg.json index d8493859d87195..3a45bbb14b1f82 100644 --- a/ports/solid3/vcpkg.json +++ b/ports/solid3/vcpkg.json @@ -1,6 +1,17 @@ { "name": "solid3", - "version-string": "3.5.8", - "port-version": 1, - "description": "Software Library for Interference Detection" + "version": "3.5.8", + "port-version": 2, + "description": "Software Library for Interference Detection", + "license": "GPL-2.0-only OR QPL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0114230f450628..1dacf5f637f458 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6714,7 +6714,7 @@ }, "solid3": { "baseline": "3.5.8", - "port-version": 1 + "port-version": 2 }, "sophus": { "baseline": "2021-09-14", diff --git a/versions/s-/solid3.json b/versions/s-/solid3.json index 5f64fce649c8b1..6ef8f43827bbc9 100644 --- a/versions/s-/solid3.json +++ b/versions/s-/solid3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d02f4f19962318fca6af9450781fcd281af86652", + "version": "3.5.8", + "port-version": 2 + }, { "git-tree": "1f494d1d6f610d9c26444a12f2b9952f7485601d", "version-string": "3.5.8", From 708ed2bb7ed0cffe475247c4d55e45da79c534e8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Jul 2022 00:07:26 +0200 Subject: [PATCH 169/791] [opencv4,dv-processing] fix pkgconfig (#25621) --- ports/dv-processing/portfile.cmake | 6 ++++++ ports/dv-processing/vcpkg.json | 1 + ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/dv-processing.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 7 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake index 39f7a7f9baf451..cf9971f31456e0 100644 --- a/ports/dv-processing/portfile.cmake +++ b/ports/dv-processing/portfile.cmake @@ -36,4 +36,10 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME "dv-processing" CONFIG_PATH "share/dv-proc file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if (VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") +else() + vcpkg_fixup_pkgconfig() +endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json index 937e7332805539..6311f5505fcee1 100644 --- a/ports/dv-processing/vcpkg.json +++ b/ports/dv-processing/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dv-processing", "version": "1.4.0", + "port-version": 1, "description": "Generic algorithms for event cameras.", "homepage": "https://gitlab.com/inivation/dv/dv-processing", "license": "Apache-2.0", diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 36b0ac55333838..0daec248dc9a58 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -381,6 +381,7 @@ vcpkg_cmake_configure( -DOPENCV_DLLVERSION= -DOPENCV_DEBUG_POSTFIX=d -DOPENCV_GENERATE_SETUPVARS=OFF + -DOPENCV_GENERATE_PKGCONFIG=ON # Do not build docs/examples -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index f22f6e99fb333a..42f0340911b355 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 5, + "port-version": 6, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1dacf5f637f458..315910deda4d19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2006,7 +2006,7 @@ }, "dv-processing": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 1 }, "dx": { "baseline": "1.0.1", @@ -5186,7 +5186,7 @@ }, "opencv4": { "baseline": "4.5.5", - "port-version": 5 + "port-version": 6 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json index 1378d9c07e800f..b56c98216033df 100644 --- a/versions/d-/dv-processing.json +++ b/versions/d-/dv-processing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d46e8c68fbd834385ac3fa859b35e72cb5bc8648", + "version": "1.4.0", + "port-version": 1 + }, { "git-tree": "757cc58887fefa1c48349b91bfaab2e3947b65d9", "version": "1.4.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index f2e3e6fb081489..f64142dfa45396 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c929f4a1c447240d07e17d0f105b4a36e3d6b5ce", + "version": "4.5.5", + "port-version": 6 + }, { "git-tree": "26f2ba4a582c93442e82167dece932c3833a2124", "version": "4.5.5", From 1e5e7101481bc2351b70c42c986c556d1be930f6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Jul 2022 00:16:11 +0200 Subject: [PATCH 170/791] [grpc] no absolute paths (#25796) --- ports/grpc/portfile.cmake | 5 +++++ ports/grpc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 9f485ff1913094..c00a1c42b53160 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -89,5 +89,10 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +if (VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +else() + vcpkg_fixup_pkgconfig() +endif() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index a1c7a0d7a907fa..e6ec9df373ceb7 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "grpc", "version-semver": "1.46.3", + "port-version": 1, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 315910deda4d19..9b3aa783728f38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2694,7 +2694,7 @@ }, "grpc": { "baseline": "1.46.3", - "port-version": 0 + "port-version": 1 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index a3968ca625c68f..a0a513fe25453e 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7db8056216ec23b5d48a44eaab6581c3357c1389", + "version-semver": "1.46.3", + "port-version": 1 + }, { "git-tree": "dabbbee8a5b79662990efb664c6975e2ea548599", "version-semver": "1.46.3", From ce9f50f7aca5efa734b73f89434cbc1b44d8759e Mon Sep 17 00:00:00 2001 From: japm48 Date: Thu, 21 Jul 2022 00:17:31 +0200 Subject: [PATCH 171/791] [meson] update to version 0.63 (#25811) * meson: update to version 0.63 * meson: update version file --- ports/vcpkg-tool-meson/portfile.cmake | 2 +- ports/vcpkg-tool-meson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-tool-meson.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake index ea2a7b2293990c..680083a4591628 100644 --- a/ports/vcpkg-tool-meson/portfile.cmake +++ b/ports/vcpkg-tool-meson/portfile.cmake @@ -5,7 +5,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) set(program MESON) -set(program_version 0.62.1) +set(program_version 0.63.0) set(program_name meson) set(search_names meson meson.py) set(interpreter PYTHON3) diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json index 4863acacaa8aef..70c9690af8578c 100644 --- a/ports/vcpkg-tool-meson/vcpkg.json +++ b/ports/vcpkg-tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-tool-meson", - "version": "0.62.1", + "version": "0.63", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9b3aa783728f38..2e1fcc3d16742e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7465,7 +7465,7 @@ "port-version": 0 }, "vcpkg-tool-meson": { - "baseline": "0.62.1", + "baseline": "0.63", "port-version": 0 }, "vcpkg-tool-mozbuild": { diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json index 54a6ffdeed55d2..742ccaecdb36b2 100644 --- a/versions/v-/vcpkg-tool-meson.json +++ b/versions/v-/vcpkg-tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bee0cb6c5edf45133ebc9643b86c9c775ab36cfe", + "version": "0.63", + "port-version": 0 + }, { "git-tree": "e35f24d912749fa1de06cb3cf533028e6f363398", "version": "0.62.1", From 84541b3c07943e6a8d18811fe777e133cd1dc634 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 20 Jul 2022 15:20:39 -0700 Subject: [PATCH 172/791] [brpc] Update to 1.2.0 and fix build error with gcc 11 (#25834) * [brpc] Update to 1.2.0 and fix build error with gcc 11 * x-add-version * update portfile.cmake * x-add-version * add comment * x-add-version Co-authored-by: LilyWangLL --- ports/brpc/brpc-1783.diff | 592 +++++++++++++++++++++++++++++++++ ports/brpc/fix-boost-ptr.patch | 2 +- ports/brpc/fix-build.patch | 142 ++++---- ports/brpc/portfile.cmake | 5 +- ports/brpc/vcpkg.json | 2 +- versions/b-/brpc.json | 5 + versions/baseline.json | 2 +- 7 files changed, 673 insertions(+), 77 deletions(-) create mode 100644 ports/brpc/brpc-1783.diff diff --git a/ports/brpc/brpc-1783.diff b/ports/brpc/brpc-1783.diff new file mode 100644 index 00000000000000..40db5788abaf2d --- /dev/null +++ b/ports/brpc/brpc-1783.diff @@ -0,0 +1,592 @@ +diff --git a/BUILD.bazel b/BUILD.bazel +index 11db84d02..7592a1862 100644 +--- a/BUILD.bazel ++++ b/BUILD.bazel +@@ -56,7 +56,7 @@ config_setting( + + COPTS = [ + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 057695afc..bfc9fe4f0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,7 @@ set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG + if(WITH_MESALINK) + set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DUSE_MESALINK") + endif() +-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DBRPC_REVISION=\\\"${BRPC_REVISION}\\\" -D__STRICT_ANSI__") ++set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__=__unused__ -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DBRPC_REVISION=\\\"${BRPC_REVISION}\\\" -D__STRICT_ANSI__") + set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} ${DEBUG_SYMBOL} ${THRIFT_CPP_FLAG}") + set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer") + set(CMAKE_C_FLAGS "${CMAKE_CPP_FLAGS} -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer") +diff --git a/Makefile b/Makefile +index e2e1a6b2e..da506f7c5 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,10 +20,9 @@ include config.mk + + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-# 3. Removed -Werror: Not block compilation for non-vital warnings, especially when the ++# 2. Removed -Werror: Not block compilation for non-vital warnings, especially when the + # code is tested on newer systems. If the code is used in production, add -Werror back +-CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG -DBRPC_REVISION=\"$(shell ./tools/get_brpc_revision.sh .)\" ++CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DNDEBUG -DBRPC_REVISION=\"$(shell ./tools/get_brpc_revision.sh .)\" + CXXFLAGS=$(CPPFLAGS) -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer -std=c++0x + CFLAGS=$(CPPFLAGS) -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-unused-parameter -fno-omit-frame-pointer + DEBUG_CXXFLAGS = $(filter-out -DNDEBUG,$(CXXFLAGS)) -DUNIT_TEST -DBVAR_NOT_LINK_DEFAULT_VARIABLES +diff --git a/config_brpc.sh b/config_brpc.sh +index 842f100f9..cf04b7260 100755 +--- a/config_brpc.sh ++++ b/config_brpc.sh +@@ -320,6 +320,10 @@ append_to_output "STATIC_LINKINGS=$STATIC_LINKINGS" + append_to_output "DYNAMIC_LINKINGS=$DYNAMIC_LINKINGS" + CPPFLAGS="-DBRPC_WITH_GLOG=$WITH_GLOG -DGFLAGS_NS=$GFLAGS_NS" + ++# Avoid over-optimizations of TLS variables by GCC>=4.8 ++# See: https://github.com/apache/incubator-brpc/issues/1693 ++CPPFLAGS="${CPPFLAGS} -D__const__=__unused__" ++ + if [ ! -z "$DEBUGSYMBOLS" ]; then + CPPFLAGS="${CPPFLAGS} $DEBUGSYMBOLS" + fi +diff --git a/docs/cn/getting_started.md b/docs/cn/getting_started.md +index 2602f5b41..56f80db3b 100644 +--- a/docs/cn/getting_started.md ++++ b/docs/cn/getting_started.md +@@ -290,7 +290,7 @@ GCC7中over-aligned的问题暂时被禁止。 + + 使用其他版本的gcc可能会产生编译警告，请联系我们予以修复。 + +-请在makefile中给cxxflags增加`-D__const__=`选项以避免[gcc4+中的errno问题](thread_local.md). ++请在makefile中给cxxflags增加`-D__const__=__unused__`选项以避免[gcc4+中的errno问题](thread_local.md). + + ## Clang: 3.5-4.0 + +diff --git a/docs/cn/thread_local.md b/docs/cn/thread_local.md +index f8e1a491e..41e024749 100644 +--- a/docs/cn/thread_local.md ++++ b/docs/cn/thread_local.md +@@ -57,9 +57,8 @@ Use *p ... - still the errno of original pthread, undefined b + + 严格地说这个问题不是gcc4导致的，而是glibc给__errno_location的签名不够准确，一个返回thread-local指针的函数依赖于段寄存器（TLS的一般实现方式），这怎么能算const呢？由于我们还未找到覆盖__errno_location的方法，所以这个问题目前实际的解决方法是： + +-**务必在直接或间接使用bthread的项目的gcc编译选项中添加`-D__const__=`，即把`__const__`定义为空，避免gcc4做相关优化。** ++**务必在直接或间接使用bthread的项目的gcc编译选项中添加`-D__const__=__unused__`，即把`__const__`定义为一个无副作用的属性，避免gcc4做相关优化。** + +-把`__const__`定义为空对程序其他部分的影响几乎为0。另外如果你没有**直接**使用errno（即你的项目中没有出现errno），或使用的是gcc +-3.4，即使没有定义`-D__const__=`，程序的正确性也不会受影响，但为了防止未来可能的问题，我们强烈建议加上。 ++把`__const__`定义为`__unused__`对程序其他部分的影响几乎为0。另外如果你没有**直接**使用errno（即你的项目中没有出现errno），或使用的是gcc 3.4，即使没有定义`-D__const__=__unused__`，程序的正确性也不会受影响，但为了防止未来可能的问题，我们强烈建议加上。 + +-需要说明的是，和errno类似，pthread_self也有类似的问题，不过一般pthread_self除了打日志没有其他用途，影响面较小，在`-D__const__=`后pthread_self也会正常。 ++需要说明的是，和errno类似，pthread_self也有类似的问题，不过一般pthread_self除了打日志没有其他用途，影响面较小，在`-D__const__=__unused__`后pthread_self也会正常。 +diff --git a/docs/en/getting_started.md b/docs/en/getting_started.md +index c500f5807..4242f82a0 100644 +--- a/docs/en/getting_started.md ++++ b/docs/en/getting_started.md +@@ -297,7 +297,7 @@ The over-aligned issues in GCC7 is suppressed temporarily now. + + Using other versions of gcc may generate warnings, contact us to fix. + +-Adding `-D__const__=` to cxxflags in your makefiles is a must to avoid [errno issue in gcc4+](thread_local.md). ++Adding `-D__const__=__unused__` to cxxflags in your makefiles is a must to avoid [errno issue in gcc4+](thread_local.md). + + ## Clang: 3.5-4.0 + +diff --git a/example/BUILD b/example/BUILD +index ee2c6ffd0..d688749d8 100644 +--- a/example/BUILD ++++ b/example/BUILD +@@ -16,7 +16,7 @@ + COPTS = [ + "-D__STDC_FORMAT_MACROS", + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/example/asynchronous_echo_c++/CMakeLists.txt b/example/asynchronous_echo_c++/CMakeLists.txt +index 18fec20ee..4a118b19a 100644 +--- a/example/asynchronous_echo_c++/CMakeLists.txt ++++ b/example/asynchronous_echo_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/auto_concurrency_limiter/CMakeLists.txt b/example/auto_concurrency_limiter/CMakeLists.txt +index ef20bf0a7..88b784277 100644 +--- a/example/auto_concurrency_limiter/CMakeLists.txt ++++ b/example/auto_concurrency_limiter/CMakeLists.txt +@@ -70,7 +70,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/backup_request_c++/CMakeLists.txt b/example/backup_request_c++/CMakeLists.txt +index d247bc150..fc39ba3cd 100644 +--- a/example/backup_request_c++/CMakeLists.txt ++++ b/example/backup_request_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/cancel_c++/CMakeLists.txt b/example/cancel_c++/CMakeLists.txt +index 26f2581ba..ea611e03f 100644 +--- a/example/cancel_c++/CMakeLists.txt ++++ b/example/cancel_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/cascade_echo_c++/CMakeLists.txt b/example/cascade_echo_c++/CMakeLists.txt +index 24d9249ae..6ca2e25dc 100644 +--- a/example/cascade_echo_c++/CMakeLists.txt ++++ b/example/cascade_echo_c++/CMakeLists.txt +@@ -80,7 +80,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/dynamic_partition_echo_c++/CMakeLists.txt b/example/dynamic_partition_echo_c++/CMakeLists.txt +index 5a268a6c9..8df3ad62e 100644 +--- a/example/dynamic_partition_echo_c++/CMakeLists.txt ++++ b/example/dynamic_partition_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/echo_c++/CMakeLists.txt b/example/echo_c++/CMakeLists.txt +index 4e6f5231d..d7babd7f7 100644 +--- a/example/echo_c++/CMakeLists.txt ++++ b/example/echo_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/echo_c++/Makefile b/example/echo_c++/Makefile +index 710cc7eda..fddde8cbc 100644 +--- a/example/echo_c++/Makefile ++++ b/example/echo_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH=../.. + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/example/grpc_c++/CMakeLists.txt b/example/grpc_c++/CMakeLists.txt +index 5f9032e1c..49010e963 100644 +--- a/example/grpc_c++/CMakeLists.txt ++++ b/example/grpc_c++/CMakeLists.txt +@@ -75,7 +75,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/http_c++/CMakeLists.txt b/example/http_c++/CMakeLists.txt +index 388b58c2e..34f3050fa 100644 +--- a/example/http_c++/CMakeLists.txt ++++ b/example/http_c++/CMakeLists.txt +@@ -86,7 +86,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/http_c++/Makefile b/example/http_c++/Makefile +index dc9d430f6..515456559 100644 +--- a/example/http_c++/Makefile ++++ b/example/http_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH=../../ + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/example/memcache_c++/CMakeLists.txt b/example/memcache_c++/CMakeLists.txt +index 2554b8295..85b4affcb 100644 +--- a/example/memcache_c++/CMakeLists.txt ++++ b/example/memcache_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/memcache_c++/Makefile b/example/memcache_c++/Makefile +index 2579f68f4..03b3d4cd7 100644 +--- a/example/memcache_c++/Makefile ++++ b/example/memcache_c++/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer + HDRS+=$(BRPC_PATH)/output/include + LIBS+=$(BRPC_PATH)/output/lib + HDRPATHS = $(addprefix -I, $(HDRS)) +diff --git a/example/multi_threaded_echo_c++/CMakeLists.txt b/example/multi_threaded_echo_c++/CMakeLists.txt +index c68010dc1..4a7291c47 100644 +--- a/example/multi_threaded_echo_c++/CMakeLists.txt ++++ b/example/multi_threaded_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/multi_threaded_echo_c++/Makefile b/example/multi_threaded_echo_c++/Makefile +index 558b77c36..cd344f98d 100644 +--- a/example/multi_threaded_echo_c++/Makefile ++++ b/example/multi_threaded_echo_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH=../.. + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/example/multi_threaded_echo_fns_c++/CMakeLists.txt b/example/multi_threaded_echo_fns_c++/CMakeLists.txt +index 148490a05..8345076eb 100644 +--- a/example/multi_threaded_echo_fns_c++/CMakeLists.txt ++++ b/example/multi_threaded_echo_fns_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/nshead_extension_c++/CMakeLists.txt b/example/nshead_extension_c++/CMakeLists.txt +index 72c9b4183..b0b93a23d 100644 +--- a/example/nshead_extension_c++/CMakeLists.txt ++++ b/example/nshead_extension_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/nshead_pb_extension_c++/CMakeLists.txt b/example/nshead_pb_extension_c++/CMakeLists.txt +index 82c055bab..448c7070f 100644 +--- a/example/nshead_pb_extension_c++/CMakeLists.txt ++++ b/example/nshead_pb_extension_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/parallel_echo_c++/CMakeLists.txt b/example/parallel_echo_c++/CMakeLists.txt +index 65b251530..b24bb41f9 100644 +--- a/example/parallel_echo_c++/CMakeLists.txt ++++ b/example/parallel_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/partition_echo_c++/CMakeLists.txt b/example/partition_echo_c++/CMakeLists.txt +index fecdfa0c3..25d98dbe5 100644 +--- a/example/partition_echo_c++/CMakeLists.txt ++++ b/example/partition_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/redis_c++/CMakeLists.txt b/example/redis_c++/CMakeLists.txt +index f1bafece8..a7b008b5a 100644 +--- a/example/redis_c++/CMakeLists.txt ++++ b/example/redis_c++/CMakeLists.txt +@@ -90,7 +90,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/redis_c++/Makefile b/example/redis_c++/Makefile +index 4ba9505f0..7c94e195d 100644 +--- a/example/redis_c++/Makefile ++++ b/example/redis_c++/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer ++CXXFLAGS+=$(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer + HDRS+=$(BRPC_PATH)/output/include + LIBS+=$(BRPC_PATH)/output/lib + HDRPATHS = $(addprefix -I, $(HDRS)) +diff --git a/example/selective_echo_c++/CMakeLists.txt b/example/selective_echo_c++/CMakeLists.txt +index 74135282e..7d65c7759 100644 +--- a/example/selective_echo_c++/CMakeLists.txt ++++ b/example/selective_echo_c++/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/session_data_and_thread_local/CMakeLists.txt b/example/session_data_and_thread_local/CMakeLists.txt +index 120f92e22..28ba03565 100644 +--- a/example/session_data_and_thread_local/CMakeLists.txt ++++ b/example/session_data_and_thread_local/CMakeLists.txt +@@ -85,7 +85,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBRPC_ENABLE_CPU_PROFILER") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") +diff --git a/example/streaming_echo_c++/CMakeLists.txt b/example/streaming_echo_c++/CMakeLists.txt +index 57fe261e7..34e041d77 100644 +--- a/example/streaming_echo_c++/CMakeLists.txt ++++ b/example/streaming_echo_c++/CMakeLists.txt +@@ -81,7 +81,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") ++set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -DNDEBUG -O2 -D__const__=__unused__ -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer") + + if(CMAKE_VERSION VERSION_LESS "3.1.3") + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +diff --git a/example/thrift_extension_c++/Makefile b/example/thrift_extension_c++/Makefile +index 980b2085b..47b381fdb 100644 +--- a/example/thrift_extension_c++/Makefile ++++ b/example/thrift_extension_c++/Makefile +@@ -20,8 +20,7 @@ BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -g -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -g -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + ifeq ($(NEED_GPERFTOOLS), 1) + CXXFLAGS+=-DBRPC_ENABLE_CPU_PROFILER + endif +diff --git a/src/butil/errno.h b/src/butil/errno.h +index 0390a840b..14856eeb6 100644 +--- a/src/butil/errno.h ++++ b/src/butil/errno.h +@@ -22,7 +22,12 @@ + #ifndef BUTIL_BAIDU_ERRNO_H + #define BUTIL_BAIDU_ERRNO_H + +-#define __const__ ++#ifndef __const__ ++// Avoid over-optimizations of TLS variables by GCC>=4.8 ++// See: https://github.com/apache/incubator-brpc/issues/1693 ++#define __const__ __unused__ ++#endif ++ + #include // errno + #include "butil/macros.h" // BAIDU_CONCAT + +diff --git a/test/BUILD.bazel b/test/BUILD.bazel +index c4649ab12..a170eaf8c 100644 +--- a/test/BUILD.bazel ++++ b/test/BUILD.bazel +@@ -24,7 +24,7 @@ config_setting( + COPTS = [ + "-D__STDC_FORMAT_MACROS", + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index f3e0c9bb3..980794f5f 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -52,7 +52,7 @@ else() + endif() + + set(CMAKE_CPP_FLAGS "${DEFINE_CLOCK_GETTIME} -DBRPC_WITH_GLOG=${WITH_GLOG_VAL} -DGFLAGS_NS=${GFLAGS_NS}") +-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES -D__STRICT_ANSI__ -include ${PROJECT_SOURCE_DIR}/test/sstream_workaround.h") ++set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__=__unused__ -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES -D__STRICT_ANSI__ -include ${PROJECT_SOURCE_DIR}/test/sstream_workaround.h") + set(CMAKE_CXX_FLAGS "${CMAKE_CPP_FLAGS} -g -O2 -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer") + use_cxx11() + +diff --git a/test/Makefile b/test/Makefile +index 99f7b4f74..5aa90e8be 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -18,7 +18,7 @@ + NEED_GPERFTOOLS=1 + NEED_GTEST=1 + include ../config.mk +-CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D__const__= -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES --include sstream_workaround.h ++CPPFLAGS+=-DBTHREAD_USE_FAST_PTHREAD_MUTEX -D_GNU_SOURCE -DUSE_SYMBOLIZE -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -DUNIT_TEST -Dprivate=public -Dprotected=public -DBVAR_NOT_LINK_DEFAULT_VARIABLES --include sstream_workaround.h + CXXFLAGS=$(CPPFLAGS) -pipe -Wall -W -fPIC -fstrict-aliasing -Wno-invalid-offsetof -Wno-unused-parameter -fno-omit-frame-pointer -std=c++0x + + #required by butil/crc32.cc to boost performance for 10x +diff --git a/tools/BUILD b/tools/BUILD +index 99f472fda..04b3abbf9 100644 +--- a/tools/BUILD ++++ b/tools/BUILD +@@ -16,7 +16,7 @@ + COPTS = [ + "-D__STDC_FORMAT_MACROS", + "-DBTHREAD_USE_FAST_PTHREAD_MUTEX", +- "-D__const__=", ++ "-D__const__=__unused__", + "-D_GNU_SOURCE", + "-DUSE_SYMBOLIZE", + "-DNO_TCMALLOC", +diff --git a/tools/parallel_http/Makefile b/tools/parallel_http/Makefile +index 5b8664708..a57c5d5f5 100644 +--- a/tools/parallel_http/Makefile ++++ b/tools/parallel_http/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/rpc_press/Makefile b/tools/rpc_press/Makefile +index c1d866d05..8cae3033c 100644 +--- a/tools/rpc_press/Makefile ++++ b/tools/rpc_press/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/rpc_replay/Makefile b/tools/rpc_replay/Makefile +index fcd5eb6f9..8f4eadde8 100644 +--- a/tools/rpc_replay/Makefile ++++ b/tools/rpc_replay/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer -Wno-unused-parameter + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/rpc_view/Makefile b/tools/rpc_view/Makefile +index c654cfd5a..13f026cbe 100644 +--- a/tools/rpc_view/Makefile ++++ b/tools/rpc_view/Makefile +@@ -19,8 +19,7 @@ BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk + # Notes on the flags: + # 1. Added -fno-omit-frame-pointer: perf/tcmalloc-profiler use frame pointers by default +-# 2. Added -D__const__= : Avoid over-optimizations of TLS variables by GCC>=4.8 +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -Wno-unused-parameter -fPIC -fno-omit-frame-pointer + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a +diff --git a/tools/trackme_server/Makefile b/tools/trackme_server/Makefile +index 79e8536d0..5bdd53f86 100644 +--- a/tools/trackme_server/Makefile ++++ b/tools/trackme_server/Makefile +@@ -17,7 +17,7 @@ + + BRPC_PATH = ../../ + include $(BRPC_PATH)/config.mk +-CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -D__const__= -pipe -W -Wall -fPIC -fno-omit-frame-pointer ++CXXFLAGS = $(CPPFLAGS) -std=c++0x -DNDEBUG -O2 -pipe -W -Wall -fPIC -fno-omit-frame-pointer + HDRPATHS = -I$(BRPC_PATH)/output/include $(addprefix -I, $(HDRS)) + LIBPATHS = -L$(BRPC_PATH)/output/lib $(addprefix -L, $(LIBS)) + STATIC_LINKINGS += $(BRPC_PATH)/output/lib/libbrpc.a diff --git a/ports/brpc/fix-boost-ptr.patch b/ports/brpc/fix-boost-ptr.patch index 2650a23dace80d..bd468ee8a0fd3e 100644 --- a/ports/brpc/fix-boost-ptr.patch +++ b/ports/brpc/fix-boost-ptr.patch @@ -1,5 +1,5 @@ diff --git a/src/brpc/policy/thrift_protocol.cpp b/src/brpc/policy/thrift_protocol.cpp -index 634f8f37..21b118b1 100755 +index 9871c01..269cfe1 100644 --- a/src/brpc/policy/thrift_protocol.cpp +++ b/src/brpc/policy/thrift_protocol.cpp @@ -45,8 +45,7 @@ diff --git a/ports/brpc/fix-build.patch b/ports/brpc/fix-build.patch index a39f8030b9ebe7..3b764730d18fac 100644 --- a/ports/brpc/fix-build.patch +++ b/ports/brpc/fix-build.patch @@ -1,8 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 057695af..ed4979f6 100644 +index 5f46dc0..fe12819 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -63,7 +63,8 @@ endif() +@@ -25,7 +25,7 @@ option(WITH_DEBUG_SYMBOLS "With debug symbols" ON) + option(WITH_THRIFT "With thrift framed protocol supported" OFF) + option(WITH_SNAPPY "With snappy" OFF) + option(BUILD_UNIT_TESTS "Whether to build unit tests" OFF) +-option(BUILD_BRPC_TOOLS "Whether to build brpc tools" ON) ++option(BUILD_BRPC_TOOLS "Whether to build brpc tools" OFF) + option(DOWNLOAD_GTEST "Download and build a fresh copy of googletest. Requires Internet access." ON) + + # Enable MACOSX_RPATH. Run "cmake --help-policy CMP0042" for policy details. +@@ -65,7 +65,8 @@ endif() if(WITH_THRIFT) set(THRIFT_CPP_FLAG "-DENABLE_THRIFT_FRAMED_PROTOCOL") @@ -12,7 +21,7 @@ index 057695af..ed4979f6 100644 endif() include(GNUInstallDirs) -@@ -142,18 +143,21 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +@@ -144,11 +145,14 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() endif() @@ -21,7 +30,7 @@ index 057695af..ed4979f6 100644 +get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES) +set(PROTOBUF_LIBRARIES protobuf::libprotobuf) find_package(Threads REQUIRED) -- + -find_path(LEVELDB_INCLUDE_PATH NAMES leveldb/db.h) -find_library(LEVELDB_LIB NAMES leveldb) +find_package(leveldb CONFIG REQUIRED) @@ -30,6 +39,8 @@ index 057695af..ed4979f6 100644 if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB)) message(FATAL_ERROR "Fail to find leveldb") endif() +@@ -163,8 +167,9 @@ if(WITH_SNAPPY) + endif() if(WITH_GLOG) - find_path(GLOG_INCLUDE_PATH NAMES glog/logging.h) @@ -40,7 +51,7 @@ index 057695af..ed4979f6 100644 if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB)) message(FATAL_ERROR "Fail to find glog") endif() -@@ -171,7 +175,7 @@ if(WITH_MESALINK) +@@ -182,7 +187,7 @@ if(WITH_MESALINK) include_directories(${MESALINK_INCLUDE_PATH}) endif() @@ -49,7 +60,7 @@ index 057695af..ed4979f6 100644 if(NOT PROTOC_LIB) message(FATAL_ERROR "Fail to find protoc lib") endif() -@@ -182,7 +186,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +@@ -193,7 +198,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") ) endif() @@ -58,7 +69,7 @@ index 057695af..ed4979f6 100644 include_directories( ${GFLAGS_INCLUDE_PATH} -@@ -197,9 +201,9 @@ set(DYNAMIC_LIB +@@ -208,9 +213,9 @@ set(DYNAMIC_LIB ${LEVELDB_LIB} ${PROTOC_LIB} ${CMAKE_THREAD_LIBS_INIT} @@ -70,18 +81,8 @@ index 057695af..ed4979f6 100644 dl z) -@@ -434,7 +438,9 @@ if(BUILD_UNIT_TESTS) - enable_testing() - add_subdirectory(test) - endif() -+if(BUILD_TOOLS) - add_subdirectory(tools) -+endif() - - file(COPY ${CMAKE_CURRENT_BINARY_DIR}/brpc/ - DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/output/include/brpc/ diff --git a/cmake/FindGFLAGS.cmake b/cmake/FindGFLAGS.cmake -index dfad5fd8..83a167f0 100644 +index dfad5fd..83a167f 100644 --- a/cmake/FindGFLAGS.cmake +++ b/cmake/FindGFLAGS.cmake @@ -15,7 +15,8 @@ @@ -104,82 +105,79 @@ index dfad5fd8..83a167f0 100644 set(GFLAGS_FOUND TRUE) endif(GFLAGS_INCLUDE_PATH AND GFLAGS_LIBRARY) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ee616eb1..35a5b48e 100644 +index 209c0e2..b9434ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -31,45 +31,77 @@ add_dependencies(SOURCES_LIB PROTO_LIB) +@@ -30,17 +30,22 @@ add_dependencies(SOURCES_LIB PROTO_LIB) + # shared library needs POSITION_INDEPENDENT_CODE set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) set_property(TARGET ${BUTIL_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1) - --add_library(brpc-shared SHARED $ -+if (BUILD_SHARED_LIBS) -+add_library(brpc-shared SHARED $ - $ - $) -+else() +- ++if(NOT BUILD_SHARED_LIBS) add_library(brpc-static STATIC $ $ $) + +-if(BRPC_WITH_THRIFT) ++if(WITH_THRIFT) + target_link_libraries(brpc-static thrift) + endif() - --target_link_libraries(brpc-shared ${DYNAMIC_LIB}) ++target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB}) ++if(BRPC_WITH_GLOG) ++ target_link_libraries(brpc-static ${GLOG_LIB}) +endif() -+if (BUILD_SHARED_LIBS) -+target_include_directories(brpc-shared PUBLIC $) -+target_link_libraries(brpc-shared PUBLIC ${DYNAMIC_LIB}) -+else() +target_include_directories(brpc-static PUBLIC $) -+target_link_libraries(brpc-static PUBLIC ${DYNAMIC_LIB}) + SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) +- +endif() - - if(BRPC_WITH_GLOG) -+ if (BUILD_SHARED_LIBS) - target_link_libraries(brpc-shared ${GLOG_LIB}) -+ else() -+ target_link_libraries(brpc-static ${GLOG_LIB}) -+ endif() - endif() - - if(BRPC_WITH_THRIFT) -+ if (BUILD_SHARED_LIBS) - target_link_libraries(brpc-shared thrift) -+ else() - target_link_libraries(brpc-static thrift) -+ endif() ++if(0) + # for protoc-gen-mcpack + set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin) + +@@ -49,35 +54,56 @@ set(protoc_gen_mcpack_SOURCES + ) + + add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) +- ++endif() + if(BUILD_SHARED_LIBS) + add_library(brpc-shared SHARED $ + $ + $) + target_link_libraries(brpc-shared ${DYNAMIC_LIB}) ++ target_include_directories(brpc-shared PUBLIC $) + if(BRPC_WITH_GLOG) + target_link_libraries(brpc-shared ${GLOG_LIB}) + endif() +- if(BRPC_WITH_THRIFT) ++ if(WITH_THRIFT) + target_link_libraries(brpc-shared thrift) + endif() + SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) + + target_link_libraries(protoc-gen-mcpack brpc-shared ${DYNAMIC_LIB} pthread) + +- install(TARGETS brpc-shared ++ install(TARGETS brpc-shared EXPORT unofficial-brpcTargets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + else() +- target_link_libraries(protoc-gen-mcpack brpc-static ${BRPC_PRIVATE_LIBS} pthread) endif() -+if (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES(brpc-static PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) -+else() - SET_TARGET_PROPERTIES(brpc-shared PROPERTIES OUTPUT_NAME brpc CLEAN_DIRECT_OUTPUT 1) -+endif() --# for protoc-gen-mcpack --set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/output/bin) -- --set(protoc_gen_mcpack_SOURCES -- ${PROJECT_SOURCE_DIR}/src/mcpack2pb/generator.cpp -- ) --add_executable(protoc-gen-mcpack ${protoc_gen_mcpack_SOURCES}) --target_link_libraries(protoc-gen-mcpack brpc-shared) -- - #install directory --install(TARGETS brpc-shared -+if (BUILD_SHARED_LIBS) -+install(TARGETS brpc-shared EXPORT unofficial-brpcTargets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - -install(TARGETS brpc-static -+else() ++if(NOT BUILD_SHARED_LIBS) +install(TARGETS brpc-static EXPORT unofficial-brpcTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +endif() -+ +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-brpc-config.cmake" +[[include(CMakeFindDependencyMacro) +find_dependency(OpenSSL) diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index 8aa32069fa6fcf..1f0fd0ced8fb64 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/incubator-brpc - REF 06247c18ed6307613f04c0d2357cb91d0c14131b - SHA512 f31b1ce3bd99dd585686ec540c9713d5d5936b2d58aadfb3f0ef48faeaab1797f2373e14b73578c2f9f8355d1e9d03661e2ed9ed8c4349b4e43e510d2214b5ae + REF 29491107cbf405a494aaf80ee32344ba34e1d7e4 #1.2.0 + SHA512 bd4c67967796592030903041ddb9205e24c9f196e63ebc153e08fbce723d93d27cd4f30f3c2cf904a93cda66ffa9db7d465d6e5fdac27a045ae84afad3dd1dc3 HEAD_REF master PATCHES fix-build.patch fix-boost-ptr.patch + brpc-1783.diff #https://github.com/apache/incubator-brpc/pull/1783 ) vcpkg_cmake_configure( diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 7547db6dadcce9..90560ba2b09a3e 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brpc", - "version": "1.1.0", + "version": "1.2.0", "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "license": "Apache-2.0", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index f2a2c41760e8ba..91270736bb80d6 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d75b4f1f3f1bf6072c3095fe34f29e86c19ec4d5", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "c88bb19658430803981fbfa4ec45432bed88310b", "version": "1.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2e1fcc3d16742e..a8c9bb170f75ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1169,7 +1169,7 @@ "port-version": 2 }, "brpc": { - "baseline": "1.1.0", + "baseline": "1.2.0", "port-version": 0 }, "brunocodutra-metal": { From 7fe8b4a85da849cd5399b3f96acaa3e38b466a4d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Jul 2022 00:29:47 +0200 Subject: [PATCH 173/791] [openscap] no absolute paths (#25838) * [openscap] no absolute paths * format * x-add-version * format * x-add-version Co-authored-by: LilyWangLL --- ports/openscap/portfile.cmake | 21 +++++++++++---------- ports/openscap/vcpkg.json | 7 ++++++- versions/baseline.json | 2 +- versions/o-/openscap.json | 5 +++++ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ports/openscap/portfile.cmake b/ports/openscap/portfile.cmake index db1d5e448e3296..243e30d414e030 100644 --- a/ports/openscap/portfile.cmake +++ b/ports/openscap/portfile.cmake @@ -14,15 +14,15 @@ if ("python" IN_LIST FEATURES) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - docs ENABLE_DOCS - tests ENABLE_TESTS - util ENABLE_OSCAP_UTIL - python ENABLE_PYTHON3 + FEATURES + docs ENABLE_DOCS + tests ENABLE_TESTS + util ENABLE_OSCAP_UTIL + python ENABLE_PYTHON3 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DPYTHON_EXECUTABLE=${PYTHON3} -DENABLE_PERL=OFF @@ -37,11 +37,12 @@ vcpkg_configure_cmake( -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() #Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json index c75a5d80ac2fa6..d6ef5c4bf11312 100644 --- a/ports/openscap/vcpkg.json +++ b/ports/openscap/vcpkg.json @@ -1,9 +1,10 @@ { "name": "openscap", "version": "1.3.1", - "port-version": 2, + "port-version": 3, "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", "homepage": "https://github.com/OpenSCAP/openscap", + "license": "LGPL-2.1-or-later", "dependencies": [ "curl", "glib", @@ -14,6 +15,10 @@ "openssl", "pcre2", "pthread", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index a8c9bb170f75ba..e8d62a5cf2cda9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5246,7 +5246,7 @@ }, "openscap": { "baseline": "1.3.1", - "port-version": 2 + "port-version": 3 }, "openssl": { "baseline": "3.0.5", diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json index a91fbc8afa3a75..0663f8e3295612 100644 --- a/versions/o-/openscap.json +++ b/versions/o-/openscap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f96365cae0ee049b58b5863a0d59ca32782a9fa", + "version": "1.3.1", + "port-version": 3 + }, { "git-tree": "cbc6ed45cdfd68efd53ee939bed2440e2971730f", "version": "1.3.1", From e8791c43c6f61c55c485725db29aa5aea36ff1f8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 21 Jul 2022 00:30:35 +0200 Subject: [PATCH 174/791] [cgal] Update to version 5.4.2 (#25839) * [cgal] Update to version 5.4.2 * vcpkg x-add-version --all * Remove the patch file itself * vcpkg x-add-version --all --- ports/cgal/fix-incorrect-warning.patch | 15 --------------- ports/cgal/portfile.cmake | 5 ++--- ports/cgal/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/cgal.json | 5 +++++ 5 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 ports/cgal/fix-incorrect-warning.patch diff --git a/ports/cgal/fix-incorrect-warning.patch b/ports/cgal/fix-incorrect-warning.patch deleted file mode 100644 index f8d002fab374b7..00000000000000 --- a/ports/cgal/fix-incorrect-warning.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Installation/lib/cmake/CGAL/CGALConfig.cmake b/Installation/lib/cmake/CGAL/CGALConfig.cmake -index 4f3a16b..6edefb1 100644 ---- a/Installation/lib/cmake/CGAL/CGALConfig.cmake -+++ b/Installation/lib/cmake/CGAL/CGALConfig.cmake -@@ -89,7 +89,9 @@ if (NOT CGAL_DATA_DIR) - if (EXISTS "${CMAKE_SOURCE_DIR}/../../data") - set(CGAL_DATA_DIR "${CMAKE_SOURCE_DIR}/../../data") - else() -- message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()") -+ if(CGAL_TEST_SUITE) -+ message(WARNING "CGAL_DATA_DIR cannot be deduced, set the variable CGAL_DATA_DIR to set the default value of CGAL::data_file_path()") -+ endif() - endif() - endif() - endif() diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 34880b2e9c3781..976478c43b30e5 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -4,10 +4,9 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.4.1 - SHA512 2ec6167d8ebf1df121f1ac372d01862f7f3acb043deea4a334e0329976306f9c9e917cdc66b355728d3f99fdb76f5491d96f10fff660716ce27bfd3793380875 + REF v5.4.2 + SHA512 6274f6938b29dabf57f68eda45b80dcb84c29d8ab3febde4b79c2dd70e0a4b7989347804418a66ffe66d63b551f68de2d890cfda56f4681996a00a813a0e9bf7 HEAD_REF master - PATCHES fix-incorrect-warning.patch # https://github.com/CGAL/cgal/pull/6649 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index fce76bdb489223..0764c72539c700 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cgal", - "version": "5.4.1", - "port-version": 1, + "version": "5.4.2", "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", diff --git a/versions/baseline.json b/versions/baseline.json index e8d62a5cf2cda9..0d7033b0547396 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1337,8 +1337,8 @@ "port-version": 2 }, "cgal": { - "baseline": "5.4.1", - "port-version": 1 + "baseline": "5.4.2", + "port-version": 0 }, "cgicc": { "baseline": "3.2.19", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index 7add1957d5374e..c2e38cf62bce21 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "848c2d53e283533691f59e2d7faee6ffd9bbe2f2", + "version": "5.4.2", + "port-version": 0 + }, { "git-tree": "de8aef00f45ff890d5b4ce4aae56afbc559a5fea", "version": "5.4.1", From 645b853ed869bc2c7c170a906a00252085fae4d5 Mon Sep 17 00:00:00 2001 From: ahugeat Date: Thu, 21 Jul 2022 00:39:35 +0200 Subject: [PATCH 175/791] [gamedev-framework] Update to v1.0.0 (#25842) * Update gamedev-framework to v1.0.0 * Update database * Use new vcpkg_cmake commands * Fix portfile format * Update package revision * Try to fix database version * Remove port-version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Protect CMake string Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Fix version database * remove git-tree * update version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/gamedev-framework/portfile.cmake | 17 +++++++++-------- ports/gamedev-framework/vcpkg.json | 11 +++++++++-- versions/baseline.json | 4 ++-- versions/g-/gamedev-framework.json | 5 +++++ 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ports/gamedev-framework/portfile.cmake b/ports/gamedev-framework/portfile.cmake index 1d32d1f967ca53..989a1cf8021ecb 100644 --- a/ports/gamedev-framework/portfile.cmake +++ b/ports/gamedev-framework/portfile.cmake @@ -6,15 +6,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GamedevFramework/gf HEAD_REF master - REF v0.20.0 - SHA512 57b0e87f8713268d7bd4e68fb65f57715af6617582e3ce342a10a66f2ebfeeacdd11e1df0abbd13a2d1d9e6222def94bcf7b522ef5411043668e4c6f0fea1dd7 + REF v1.0.0 + SHA512 daa6808500e4259152b8173d6f289964d2e0807f434ec25a378575a0160de7c739ce8f483b157b734a1d5726720db6a22212ec2ef803ff567a51ed8a6822cfd7 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DGF_VCPKG=ON -DGF_USE_EMBEDDED_LIBS=OFF -DGF_BUILD_GAMES=OFF -DGF_BUILD_EXAMPLES=OFF @@ -26,8 +24,11 @@ vcpkg_configure_cmake( OPTIONS_DEBUG -DGF_DEBUG=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gf TARGET_PATH share/gf) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME gf + CONFIG_PATH lib/cmake/gf +) vcpkg_copy_pdbs() file(REMOVE_RECURSE diff --git a/ports/gamedev-framework/vcpkg.json b/ports/gamedev-framework/vcpkg.json index c00c80c351bb28..0f2d9c0190be2c 100644 --- a/ports/gamedev-framework/vcpkg.json +++ b/ports/gamedev-framework/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gamedev-framework", - "version-semver": "0.20.0", - "port-version": 2, + "version-semver": "1.0.0", "maintainers": [ "Julien Bernard ", "Arthur Hugeat " @@ -30,6 +29,14 @@ "platform": "!linux" }, "stb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0d7033b0547396..53796d499d816c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2449,8 +2449,8 @@ "port-version": 6 }, "gamedev-framework": { - "baseline": "0.20.0", - "port-version": 2 + "baseline": "1.0.0", + "port-version": 0 }, "gamenetworkingsockets": { "baseline": "1.4.1", diff --git a/versions/g-/gamedev-framework.json b/versions/g-/gamedev-framework.json index 13f04015a26deb..83a46775cc1620 100644 --- a/versions/g-/gamedev-framework.json +++ b/versions/g-/gamedev-framework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66a45568c161b8eb5ae64471a466545b96b15818", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "4dbeca9676a469cb84eb1cfc731ae9bbc9110447", "version-semver": "0.20.0", From 917a86aeb3e8926ed955e93671cf70b268ebb67d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 21 Jul 2022 06:40:29 +0800 Subject: [PATCH 176/791] [sqlite3] update to 3.39.1 (#25852) * [sqlite3] update to 3.39.1 * update version --- ports/sqlite3/portfile.cmake | 8 ++++---- ports/sqlite3/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sqlite3.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 30ef7c8550d74e..ce6004647e2a0d 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,10 +1,10 @@ # Be sure to update both of these versions together. -set(SQLITE_VERSION 3370100) -set(PKGCONFIG_VERSION 3.37.1) -set(SQLITE_HASH b59343772dc4c6bb8e05fff6206eeb44861efa52c120c789ce6b733e974cf950657b6ab369aa405d75f45ed9cf1cb8128a76447bc63e9ce9822578d71581a7a3) +set(SQLITE_VERSION 3390100) +set(PKGCONFIG_VERSION 3.39.1) +set(SQLITE_HASH e36f30839e0884d021f05f1220a6cf8956156bb00f1f661dcdbe1771ddeb7836e8348034c5e993194a5f28167affda2add6922b6aff4921854bbe566b2254a84) vcpkg_download_distfile(ARCHIVE - URLS "https://sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip" + URLS "https://sqlite.org/2022/sqlite-amalgamation-${SQLITE_VERSION}.zip" FILENAME "sqlite-amalgamation-${SQLITE_VERSION}.zip" SHA512 ${SQLITE_HASH} ) diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index c53804b7009c50..521bb1d53c35a4 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sqlite3", - "version": "3.37.2", - "port-version": 2, + "version": "3.39.1", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://github.com/sqlite/sqlite", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index 53796d499d816c..02ccce3afa7140 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6833,8 +6833,8 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.37.2", - "port-version": 2 + "baseline": "3.39.1", + "port-version": 0 }, "sqlitecpp": { "baseline": "3.1.1", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index db836a2df92a0e..0c3150d10766e8 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ccab102efea1120dc2140b4c0519676a65c055b6", + "version": "3.39.1", + "port-version": 0 + }, { "git-tree": "8b96d4235bae7daf0cf3f65f66f9c28f9290628a", "version": "3.37.2", From 36bd5e39b735736b26e8839dfa719c0c4c73963b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 21 Jul 2022 00:41:27 +0200 Subject: [PATCH 177/791] [msbuild] don't fail on error messages (#25844) --- scripts/buildsystems/msbuild/vcpkg.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 3f2b63d85e5ca2..3e26f67f947a3c 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -154,7 +154,9 @@ + StandardOutputImportance="High" + IgnoreStandardErrorWarningFormat="true" + CustomWarningRegularExpression="([Ee]rror|[Ww]arning):" /> Date: Thu, 21 Jul 2022 00:41:57 +0200 Subject: [PATCH 178/791] [Protobuf] fix used source dir (#25861) * [protobuf] fix source path * v db --- ports/protobuf/portfile.cmake | 2 +- ports/protobuf/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 7c05a7edca09da..b0ae3a1dc95971 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -33,7 +33,7 @@ if (VCPKG_DOWNLOAD_MODE) endif() vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/cmake" + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dprotobuf_BUILD_SHARED_LIBS=${protobuf_BUILD_SHARED_LIBS} -Dprotobuf_MSVC_STATIC_RUNTIME=${protobuf_MSVC_STATIC_RUNTIME} diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 90901a03f491db..17e32eff174ee7 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "protobuf", "version-semver": "3.21.2", + "port-version": 1, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 02ccce3afa7140..b513f7c60cad21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5662,7 +5662,7 @@ }, "protobuf": { "baseline": "3.21.2", - "port-version": 0 + "port-version": 1 }, "protobuf-c": { "baseline": "1.4.0", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 9cb285b33259ea..c6279bcb1bf33c 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57fe8d3a4fa3bc97f942ce38f103b324f4665685", + "version-semver": "3.21.2", + "port-version": 1 + }, { "git-tree": "8ae2a5d57f7d3bf934e4d773406cd0a323600031", "version-semver": "3.21.2", From ca4b4621a2473a50bb4e199579fb0deff5ac005a Mon Sep 17 00:00:00 2001 From: John Wason Date: Wed, 20 Jul 2022 18:42:37 -0400 Subject: [PATCH 179/791] [ccd] add double-precision option (#25870) * Add double-precision option to ccd * Bump ccd port version * Update version database * format * format * x-add-version * Update ccd.json * add license * x-add-version Co-authored-by: Lily Wang <494550702@qq.com> Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/ccd/portfile.cmake | 23 ++++++++++++++--------- ports/ccd/vcpkg.json | 22 +++++++++++++++++++--- versions/baseline.json | 4 ++-- versions/c-/ccd.json | 5 +++++ 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake index c2c294d56d8cc6..d5055a0aae9ef6 100644 --- a/ports/ccd/portfile.cmake +++ b/ports/ccd/portfile.cmake @@ -14,22 +14,27 @@ vcpkg_from_github( ${STATIC_PATCH} ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + double-precision ENABLE_DOUBLE_PRECISION +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ccd) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/ccd) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/BSD-LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/ccd/vcpkg.json b/ports/ccd/vcpkg.json index 15978fb00201ad..5716257df99f83 100644 --- a/ports/ccd/vcpkg.json +++ b/ports/ccd/vcpkg.json @@ -1,7 +1,23 @@ { "name": "ccd", - "version-string": "2.1-4", - "port-version": 3, + "version": "2.1", + "port-version": 4, "description": "Library for collision detection between two convex shapes", - "homepage": "https://github.com/danfis/libccd" + "homepage": "https://github.com/danfis/libccd", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "double-precision": { + "description": "Use float64 doubles for ccd" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index b513f7c60cad21..0be20d6b15216e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1301,8 +1301,8 @@ "port-version": 2 }, "ccd": { - "baseline": "2.1-4", - "port-version": 3 + "baseline": "2.1", + "port-version": 4 }, "ccfits": { "baseline": "2.5", diff --git a/versions/c-/ccd.json b/versions/c-/ccd.json index 9e383a9c1f34d3..a0ded18913e6f6 100644 --- a/versions/c-/ccd.json +++ b/versions/c-/ccd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6cd46396151b69680100934c824c290c7057379", + "version": "2.1", + "port-version": 4 + }, { "git-tree": "8e6fc55567d05873ba6f78c3c33363a0fd9a1549", "version-string": "2.1-4", From 429328f80af14dc2cb64fffc8dcd2d080376bd9d Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 21 Jul 2022 06:43:00 +0800 Subject: [PATCH 180/791] update to 2.6.1 (#25878) --- ports/onednn/portfile.cmake | 4 ++-- ports/onednn/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/o-/onednn.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index f254c4e3750ba6..08909454fb8930 100644 --- a/ports/onednn/portfile.cmake +++ b/ports/onednn/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN - REF v2.4.3 - SHA512 6a597be1b6b50d252e346a96d3c9b4771e9d8e8fc495a09b638ea296d53e71d51ea2e2be04cc20de1bca17215a7a7e5f22a1808628bcdf98180def2d91b2c9e3 + REF 58be3660fb57c4c4a3d306730e849237d1271572 #2.6.1 + SHA512 8fc51655d0ecdb5b137d04c6b3ee01959d9505e0d7ee74cab872447b5873f214d38db55edf4040a56d4455557ec2c0707097337c6e276dbaf1c9c6e48b95a820 HEAD_REF master ) diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index b06a952641a0f3..d53c66bbe3df22 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,9 +1,9 @@ { "name": "onednn", - "version-semver": "2.4.3", - "port-version": 1, + "version-semver": "2.6.1", "description": "oneAPI Deep Neural Network Library (oneDNN)", "homepage": "https://github.com/oneapi-src/oneDNN", + "license": "Apache-2.0", "supports": "x64 & !uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 0be20d6b15216e..de6b0bbfc2409c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5105,8 +5105,8 @@ "port-version": 3 }, "onednn": { - "baseline": "2.4.3", - "port-version": 1 + "baseline": "2.6.1", + "port-version": 0 }, "oniguruma": { "baseline": "6.9.7.1", diff --git a/versions/o-/onednn.json b/versions/o-/onednn.json index f21847d63ccfc3..d161a6f6968e68 100644 --- a/versions/o-/onednn.json +++ b/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfdcc802e353e844674f70e5a5d6c0726524d5c7", + "version-semver": "2.6.1", + "port-version": 0 + }, { "git-tree": "0ac578f6078a2120900435434f0df8c96d4a7a54", "version-semver": "2.4.3", From a425267b97b8688417ab952c620365ac8cc7f6db Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 21 Jul 2022 06:43:31 +0800 Subject: [PATCH 181/791] [concurrencpp] fix supports (#25884) * fix supports * update --- ports/concurrencpp/portfile.cmake | 4 +++- ports/concurrencpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/concurrencpp.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/concurrencpp/portfile.cmake b/ports/concurrencpp/portfile.cmake index 64231d30bc2679..c6097bdf7d2968 100644 --- a/ports/concurrencpp/portfile.cmake +++ b/ports/concurrencpp/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO David-Haim/concurrencpp @@ -18,4 +20,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.4) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrencpp RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/concurrencpp/vcpkg.json b/ports/concurrencpp/vcpkg.json index 85ab61dc319bab..741c9b56b3572d 100644 --- a/ports/concurrencpp/vcpkg.json +++ b/ports/concurrencpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "concurrencpp", "version": "0.1.4", + "port-version": 1, "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", "homepage": "https://github.com/David-Haim/concurrencpp/", "license": "MIT", - "supports": "(windows & static) | linux | osx", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index de6b0bbfc2409c..03ee62ce757175 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1542,7 +1542,7 @@ }, "concurrencpp": { "baseline": "0.1.4", - "port-version": 0 + "port-version": 1 }, "concurrentqueue": { "baseline": "1.0.3", diff --git a/versions/c-/concurrencpp.json b/versions/c-/concurrencpp.json index 9f314987f74748..a940f9f9e38d75 100644 --- a/versions/c-/concurrencpp.json +++ b/versions/c-/concurrencpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecae9e070ec807384d676e49c413118174487f6a", + "version": "0.1.4", + "port-version": 1 + }, { "git-tree": "180b2c3ae47ddd4832fd3d6f8359728a6eda1094", "version": "0.1.4", From b2a22ff59ab523788a26980f7d38a4e5d4fedb8f Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 21 Jul 2022 06:44:03 +0800 Subject: [PATCH 182/791] [ogre-next] Update to 2.3.1 (#25889) --- ports/ogre-next/portfile.cmake | 6 +++--- ports/ogre-next/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/ogre-next.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/ogre-next/portfile.cmake b/ports/ogre-next/portfile.cmake index 5766b5d9c692df..266c930c2bdbe6 100644 --- a/ports/ogre-next/portfile.cmake +++ b/ports/ogre-next/portfile.cmake @@ -10,8 +10,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre-next - REF 10b56694f33fd6ead1c501eb90379bcac671d841 #v2.3.0 - SHA512 b2f1c55655582b2844b7c10cce965cc5268829a0702b09abcfe04fba8db00ad032f605d683c88811f77f9b7b4fb8a1095079f1a1c96bbe9fd022621f4ff4cf81 + REF e4c5f0f6d36c07af594e3ef143d017bda1581442 #v2.3.1 + SHA512 263a50b64defa7345a109a068cc17c347a696f83f64abc071256bb46571ed6b2ef94ee3480d90938cdb7f745d36a4c4890d82677d357c62c9a2956eae8d4ac15 HEAD_REF master PATCHES toolchain_fixes.patch @@ -113,7 +113,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json index 7a6a81bd94281b..bc4fe07bb429e2 100644 --- a/ports/ogre-next/vcpkg.json +++ b/ports/ogre-next/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ogre-next", - "version": "2.3.0", + "version": "2.3.1", "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", "homepage": "https://github.com/OGRECave/ogre-next", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 03ee62ce757175..8b13a36a803a65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5089,7 +5089,7 @@ "port-version": 8 }, "ogre-next": { - "baseline": "2.3.0", + "baseline": "2.3.1", "port-version": 0 }, "ois": { diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index 40f6f7475f653b..535b7c4dd24688 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41790e82daaddc561ebaf5ea9f589bd2e148e31a", + "version": "2.3.1", + "port-version": 0 + }, { "git-tree": "0b1cca4f491d535e198fc79195bf357811b4122a", "version": "2.3.0", From 8408dd9e1e55b0a9231411e4a3439254d41e8ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 22 Jul 2022 16:43:26 +0000 Subject: [PATCH 183/791] [vcpkg baseline][opencv4] Fix hash check (#25922) * [vcpkg baseline][opencv4] Fix hash check * version --- ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 0daec248dc9a58..be4e0ecb78b0b4 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( REPO opencv/opencv REF ${OPENCV_VERSION} SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 + FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES 0001-disable-downloading.patch diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 42f0340911b355..90a10987d54583 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.5", - "port-version": 6, + "port-version": 7, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8b13a36a803a65..eed48b0fc30a21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5186,7 +5186,7 @@ }, "opencv4": { "baseline": "4.5.5", - "port-version": 6 + "port-version": 7 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index f64142dfa45396..3c14a9620c9bba 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e165720af85f0da853cf0a4ac9eb5cb20804d13", + "version": "4.5.5", + "port-version": 7 + }, { "git-tree": "c929f4a1c447240d07e17d0f105b4a36e3d6b5ce", "version": "4.5.5", From 5ae6b81722efb931f788a77b4b2d8e7449a9135d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 22 Jul 2022 10:48:15 -0700 Subject: [PATCH 184/791] Update vcpkg-tool to 2022-07-21 (#25920) Full build was https://dev.azure.com/vcpkg/public/_build/results?buildId=75481&view=results --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index c194dc610ad7ab..931e04c0a5aed2 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-07-14' +$versionDate = '2022-07-21' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 607030c770750a..55a7750bbfdc5a 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-07-14" +vcpkgToolReleaseTag="2022-07-21" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="f89d0abbc2b385ccf7a8548fb7e612007f092891fa7feaa6a7090fdee8877d8f3f08c580c6866c42bcaed9bf7263eab214c511709fc7972d321c136fcb5a6920" + vcpkgToolReleaseSha="96a90380c086c50047fcaf19c48fc025e78e2c408fc06d44fad1e4d08a2309619ec36afcf5e5029c0574ce179f25b796537e3499b0909338a2a848e16fff2e6a" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="f54d1739e52177a528221eed7e1bca365c8e4bad0c9dbfe925089bf9b57f50563d39ac44aafaae33ec553b8388b98ec6af0ed3bdde8ee23e2233578a2ce3df8b" + vcpkgToolReleaseSha="2221e135b4551943ad4a23a5aa19c44a2c1d843437f9eb3f30ce8bb3aa4a61abe7059527b13a4118060aacf874aa87896f840106abd382409db5440e1eedc460" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="df734af8160ed3d67d40f6f9bb721a6fc5a735fda99efaba2588400a5fd681a1e3d15d13b316d7ccba5506d90d1086e60608b2e67e137a702bea3679cb3d1663" + vcpkgToolReleaseSha="1bcda61ffcf03069b45cc501c369d23caeab14288bd1971a61213342f8bbfd042e13e85c816b05912b51d1ca0f4fe03811f547ab7bd0d7fbc60b2f700fd1400a" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="eebdedb2743476342ea578c360cdc35c869680139c7e0a841a453dd856b2f8b50f951b6c807d4b783e3c46c94f36d66fb498316d3039d6c9b79613553c564612" + vcpkgToolReleaseSha="6677a4d214c07195032d3e2ccbd7c6a627cef0d2c1d5b206149bcc7320a328ee0856ec5fb439d51f313a37e53399634968ff7450b38329e989b158f6e34c5e2c" fi # Do the download or build. From bded84c6a18533bd0e8876a9ae1636a0fa394747 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 23 Jul 2022 01:53:47 +0800 Subject: [PATCH 185/791] [xlnt] Add missing include (#25925) * fix missing include * update --- ports/xlnt/fix-missing-include.patch | 12 ++++++++++++ ports/xlnt/portfile.cmake | 20 ++++++++++---------- ports/xlnt/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/x-/xlnt.json | 5 +++++ 5 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 ports/xlnt/fix-missing-include.patch diff --git a/ports/xlnt/fix-missing-include.patch b/ports/xlnt/fix-missing-include.patch new file mode 100644 index 00000000000000..ac2396d1c20b6b --- /dev/null +++ b/ports/xlnt/fix-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/source/detail/number_format/number_formatter.cpp b/source/detail/number_format/number_formatter.cpp +index b116fd0..653da0e 100644 +--- a/source/detail/number_format/number_formatter.cpp ++++ b/source/detail/number_format/number_formatter.cpp +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake index 3ad72194a91dd8..1839b1d6767187 100644 --- a/ports/xlnt/portfile.cmake +++ b/ports/xlnt/portfile.cmake @@ -11,8 +11,9 @@ vcpkg_from_github( SHA512 414d691b372934326dc0da134eb7752c27c3223b6e92b433494d0758ca657f43b66894ad54ac97a8410387a2531a573c81572daa6a0434fa023e8e29ca74331c HEAD_REF master PATCHES - "fix-not-found-include.patch" + fix-not-found-include.patch ${win_patch} + fix-missing-include.patch ) file(REMOVE "${SOURCE_PATH}/third-party/libstudxml/version") @@ -22,20 +23,19 @@ else() set(STATIC ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTESTS=OFF -DSAMPLES=OFF -DBENCHMARKS=OFF -DSTATIC=${STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xlnt) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xlnt) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/xlnt/vcpkg.json b/ports/xlnt/vcpkg.json index eb2275878f6ccd..e5e25bf2fd4581 100644 --- a/ports/xlnt/vcpkg.json +++ b/ports/xlnt/vcpkg.json @@ -1,7 +1,18 @@ { "name": "xlnt", "version": "1.5.0", - "port-version": 3, + "port-version": 4, "description": "Cross-platform user-friendly xlsx library for C++14", - "homepage": "https://github.com/tfussell/xlnt" + "homepage": "https://github.com/tfussell/xlnt", + "license": "MIT OR BSD-3-Clause OR BSD-2-Clause OR LGPL-3.0-only OR BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index eed48b0fc30a21..41ae9bbce6e979 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7710,7 +7710,7 @@ }, "xlnt": { "baseline": "1.5.0", - "port-version": 3 + "port-version": 4 }, "xlsxio": { "baseline": "2021-03-24", diff --git a/versions/x-/xlnt.json b/versions/x-/xlnt.json index cda2e706dbbc4d..567f54e4e9100c 100644 --- a/versions/x-/xlnt.json +++ b/versions/x-/xlnt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e7ad7529f9ff8b7e9c59824230548f77b491cae", + "version": "1.5.0", + "port-version": 4 + }, { "git-tree": "225346f8b24e3d09ad6b63b928ed2e6f1cfed4d4", "version": "1.5.0", From e347f741793cc93eed158f4379b7a3fe1cab0348 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 23 Jul 2022 01:54:34 +0800 Subject: [PATCH 186/791] [glib] update to 2.72.3 (#25853) * [glib] update to 2.72.3 * update version * add patch * overwrite version * patch name * version * update patch * version --- ports/glib/libintl.patch | 23 ++++++++++++----------- ports/glib/portfile.cmake | 6 +++--- ports/glib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/glib.json | 5 +++++ 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch index c21c279426b04e..8462893d52dbb8 100644 --- a/ports/glib/libintl.patch +++ b/ports/glib/libintl.patch @@ -1,18 +1,18 @@ diff --git a/meson.build b/meson.build -index c418f50b1..e7158c036 100644 +index 7773f56..171d193 100644 --- a/meson.build +++ b/meson.build -@@ -2048,42 +2048,10 @@ endif +@@ -2089,42 +2089,10 @@ endif # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. libintl_deps = [] --if cc.has_function('ngettext', args : osx_ldflags) +-if cc.has_function('ngettext') - have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') -else - # First just find the bare library. - libintl = cc.find_library('intl', required : false) - # The bare library probably won't link without help if it's static. -- if libintl.found() and not cc.has_function('ngettext', args : osx_ldflags, dependencies : libintl) +- if libintl.found() and not cc.has_function('ngettext', dependencies : libintl) - libintl_iconv = cc.find_library('iconv', required : false) - # libintl supports different threading APIs, which may not - # require additional flags, but it defaults to using pthreads if @@ -22,10 +22,10 @@ index c418f50b1..e7158c036 100644 - # also defining the macros with the -pthread flag. - libintl_pthread = cc.find_library('pthread', required : false) - # Try linking with just libiconv. -- if libintl_iconv.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv]) +- if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv]) - libintl_deps += [libintl_iconv] - # Then also try linking with pthreads. -- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', args : osx_ldflags, dependencies : [libintl, libintl_iconv, libintl_pthread]) +- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv, libintl_pthread]) - libintl_deps += [libintl_iconv, libintl_pthread] - else - libintl = disabler() @@ -37,14 +37,15 @@ index c418f50b1..e7158c036 100644 - have_bind_textdomain_codeset = true # proxy-libintl supports it - else - libintl_deps = [libintl] + libintl_deps -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, -+libintl = dependency('Intl', method:'cmake', required : true) -+libintl_deps += [libintl] -+have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', args : osx_ldflags, - dependencies : libintl_deps) +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', +- dependencies : libintl_deps) - endif -endif - ++libintl = dependency('Intl', method:'cmake', required : true) ++libintl_deps += [libintl] ++have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', ++ dependencies : libintl_deps) glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) # We require gettext to always be present diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 945b2783b2a224..bbf1fa66a3c57a 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -4,14 +4,14 @@ if (VCPKG_TARGET_IS_WINDOWS) #remove if merged: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1655 endif() -set(GLIB_MAJOR_MINOR 2.70) -set(GLIB_PATCH 5) +set(GLIB_MAJOR_MINOR 2.72) +set(GLIB_PATCH 3) vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/glib REF "${GLIB_MAJOR_MINOR}.${GLIB_PATCH}" - SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98 + SHA512 805100bdd240122e1a74b432d7be7458af5b3b0507d46ed9cb0ce2ed6facf6e7d927b1d869831c9ba21b4a40a6667989ff69fc4f661bd044cb08932184804e79 PATCHES use-libiconv-on-windows.patch libintl.patch diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index b431aa6e45c863..4fae9631896a0b 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.70.5", - "port-version": 2, + "version": "2.72.3", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 41ae9bbce6e979..995182f4c13f4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2585,8 +2585,8 @@ "port-version": 0 }, "glib": { - "baseline": "2.70.5", - "port-version": 2 + "baseline": "2.72.3", + "port-version": 0 }, "glibmm": { "baseline": "2.70.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index d1eb2e214466d5..263cbaaecbdf06 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abff8e76676673462462f949844d3369d93be61d", + "version": "2.72.3", + "port-version": 0 + }, { "git-tree": "3fc7533aba85394460293d7ba61abc3170323f1d", "version": "2.70.5", From 824c4324736156720645819abe4d48b4e740a1cd Mon Sep 17 00:00:00 2001 From: Dennis Date: Fri, 22 Jul 2022 19:58:10 +0200 Subject: [PATCH 187/791] [grpc] Update to 1.48.0 (#25914) * grpc: Update to 1.48.0 * grpc: Adjust line-ending of patches * grpc: Change line ending of some patches back to CRLF --- ports/grpc/00001-fix-uwp.patch | 22 ++++++------- ports/grpc/00004-link-gdi32-on-windows.patch | 8 ++--- ports/grpc/00009-use-system-upb.patch | 25 +++++++++++--- ports/grpc/00011-fix-csharp_plugin.patch | 33 ------------------- ports/grpc/00012-fix-use-cxx17.patch | 16 ++++----- ports/grpc/00014-pkgconfig-upbdefs.patch | 6 ++-- .../grpc/00015-disable-download-archive.patch | 12 +++++++ ports/grpc/portfile.cmake | 6 ++-- ports/grpc/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/g-/grpc.json | 5 +++ 11 files changed, 69 insertions(+), 71 deletions(-) delete mode 100644 ports/grpc/00011-fix-csharp_plugin.patch create mode 100644 ports/grpc/00015-disable-download-archive.patch diff --git a/ports/grpc/00001-fix-uwp.patch b/ports/grpc/00001-fix-uwp.patch index a7f353d7039e3f..2aea0afd765e2d 100644 --- a/ports/grpc/00001-fix-uwp.patch +++ b/ports/grpc/00001-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7a97604..4967c4f 100644 +index 25990a5d8a..4bec4e1e72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -215,6 +215,9 @@ if(UNIX) +@@ -219,6 +219,9 @@ if(UNIX) endif() if(WIN32) set(_gRPC_PLATFORM_WINDOWS ON) @@ -11,8 +11,8 @@ index 7a97604..4967c4f 100644 + endif() endif() - # Use C99 standard -@@ -259,6 +262,9 @@ if(MSVC) + # Use C11 standard +@@ -263,6 +266,9 @@ if(MSVC) set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4267") # TODO(jtattermusch): needed to build boringssl with VS2017, revisit later set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4987 /wd4774 /wd4819 /wd4996 /wd4619") @@ -21,8 +21,8 @@ index 7a97604..4967c4f 100644 + endif() # Silences thousands of trucation warnings set(_gRPC_C_CXX_FLAGS "${_gRPC_C_CXX_FLAGS} /wd4503") - endif() -@@ -336,6 +342,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) + # Tell MSVC to build grpc using utf-8 +@@ -430,6 +436,10 @@ file(MAKE_DIRECTORY ${_gRPC_PROTO_GENS_DIR}) # ``.proto`` files # function(protobuf_generate_grpc_cpp) @@ -33,7 +33,7 @@ index 7a97604..4967c4f 100644 if(NOT ARGN) message(SEND_ERROR "Error: PROTOBUF_GENERATE_GRPC_CPP() called without any proto files") return() -@@ -408,6 +418,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) +@@ -552,6 +562,7 @@ if (gRPC_BUILD_GRPC_RUBY_PLUGIN) list(APPEND _gRPC_PLUGIN_LIST grpc_ruby_plugin) endif () @@ -41,16 +41,16 @@ index 7a97604..4967c4f 100644 add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) -@@ -424,6 +435,7 @@ add_custom_target(tools_cxx +@@ -567,6 +578,7 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) +endif() - protobuf_generate_grpc_cpp( - src/proto/grpc/channelz/channelz.proto + protobuf_generate_grpc_cpp_with_import_path_correction( + src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto diff --git a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc -index 5d2bdc1..e9870c2 100644 +index 5d2bdc14de..e9870c2656 100644 --- a/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc +++ b/src/core/lib/security/credentials/alts/check_gcp_environment_windows.cc @@ -39,6 +39,7 @@ bool check_bios_data(const char*) { return false; } diff --git a/ports/grpc/00004-link-gdi32-on-windows.patch b/ports/grpc/00004-link-gdi32-on-windows.patch index 0d1abe7f819ba6..54b55c60b89d65 100644 --- a/ports/grpc/00004-link-gdi32-on-windows.patch +++ b/ports/grpc/00004-link-gdi32-on-windows.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 14514b7..497470c 100644 +index 25990a5d8a..8a632d2289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -323,7 +323,7 @@ include(cmake/xxhash.cmake) - include(cmake/zlib.cmake) +@@ -404,7 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) + endif() if(WIN32) - set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) endif() - # Create directory for generated .proto files + # Create directory for proto source files diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch index 0d23ab3cf13a9e..1cfa17d97a3162 100644 --- a/ports/grpc/00009-use-system-upb.patch +++ b/ports/grpc/00009-use-system-upb.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a7e591f083..e16e70a224 100644 +index 25990a5d8a..9a24f7c6cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") @@ -12,16 +12,31 @@ index a7e591f083..e16e70a224 100644 set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package") set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") -@@ -1369,7 +1372,7 @@ target_link_libraries(gpr +@@ -1570,6 +1573,7 @@ target_link_libraries(gpr absl::synchronization absl::time absl::optional -- upb + ${_gRPC_UPB_LIBRARIES} ) if(_gRPC_PLATFORM_ANDROID) target_link_libraries(gpr -@@ -3957,6 +3960,7 @@ endif() +@@ -2361,7 +2365,6 @@ target_link_libraries(grpc + gpr + ${_gRPC_SSL_LIBRARIES} + address_sorting +- upb + ) + if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) + target_link_libraries(grpc "-framework CoreFoundation") +@@ -2927,7 +2930,6 @@ target_link_libraries(grpc_unsecure + absl::utility + gpr + address_sorting +- upb + ) + if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) + target_link_libraries(grpc_unsecure "-framework CoreFoundation") +@@ -4181,6 +4183,7 @@ endif() endif() @@ -29,7 +44,7 @@ index a7e591f083..e16e70a224 100644 add_library(upb third_party/upb/third_party/utf8_range/naive.c third_party/upb/third_party/utf8_range/range2-neon.c -@@ -4018,7 +4022,7 @@ if(gRPC_INSTALL) +@@ -4242,7 +4245,7 @@ if(gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() diff --git a/ports/grpc/00011-fix-csharp_plugin.patch b/ports/grpc/00011-fix-csharp_plugin.patch deleted file mode 100644 index fb258f9006d109..00000000000000 --- a/ports/grpc/00011-fix-csharp_plugin.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ae77375eae..ad8815d2f9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1960,10 +1960,14 @@ endif() - - if(gRPC_BUILD_CSHARP_EXT) - --add_library(grpc_csharp_ext SHARED -+add_library(grpc_csharp_ext - src/csharp/ext/grpc_csharp_ext.c - ) - -+if (WIN32 AND BUILD_SHARED_LIBS) -+ target_compile_definitions(grpc_csharp_ext PUBLIC GPR_WINDOWS) -+endif() -+ - set_target_properties(grpc_csharp_ext PROPERTIES - VERSION ${gRPC_CORE_VERSION} - SOVERSION ${gRPC_CORE_SOVERSION} -@@ -1977,6 +1981,12 @@ if(WIN32 AND MSVC) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grpc_csharp_ext.pdb - DESTINATION ${gRPC_INSTALL_LIBDIR} OPTIONAL - ) -+ -+ install(TARGETS grpc_csharp_ext -+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} -+ ) - endif() - endif() - diff --git a/ports/grpc/00012-fix-use-cxx17.patch b/ports/grpc/00012-fix-use-cxx17.patch index 7ff404a8e9cbe2..57af77625726b6 100644 --- a/ports/grpc/00012-fix-use-cxx17.patch +++ b/ports/grpc/00012-fix-use-cxx17.patch @@ -1,16 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c07732..54b4b23 100644 +index 25990a5d8a..ba8df92858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -321,6 +321,11 @@ include(cmake/ssl.cmake) - include(cmake/upb.cmake) - include(cmake/xxhash.cmake) +@@ -326,6 +326,11 @@ include(cmake/xxhash.cmake) include(cmake/zlib.cmake) -+ + include(cmake/download_archive.cmake) + +if (ABSL_USE_CXX17) + message(STATUS "Found absl uses CXX17, enable CXX17 feature.") + set(CMAKE_CXX_STANDARD 17) +endif() - - if(WIN32) - set(_gRPC_BASELIB_LIBRARIES wsock32 ws2_32 crypt32 gdi32) ++ + # Setup external proto library at third_party/envoy-api with 2 download URLs + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api) + # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index 99425b779d4968..8ba4dd52061ff3 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54b4b23..83fab3b 100644 +index 25990a5d8a..4c7831cba5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -17276,7 +17276,7 @@ generate_pkgconfig( +@@ -20398,7 +20398,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant" + "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" + "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz" "" diff --git a/ports/grpc/00015-disable-download-archive.patch b/ports/grpc/00015-disable-download-archive.patch new file mode 100644 index 00000000000000..b28bc72a7c9103 --- /dev/null +++ b/ports/grpc/00015-disable-download-archive.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/download_archive.cmake b/cmake/download_archive.cmake +index 820aafafb7..a59b785c7e 100644 +--- a/cmake/download_archive.cmake ++++ b/cmake/download_archive.cmake +@@ -19,6 +19,7 @@ file(MAKE_DIRECTORY ${_download_archive_TEMPORARY_DIR}) + # Note that strip_prefix strips the directory path prefix of the extracted + # archive content, and it may strip multiple directories. + function(download_archive destination url hash strip_prefix) ++ return() + # Fetch and validate + set(_TEMPORARY_FILE ${_download_archive_TEMPORARY_DIR}/${strip_prefix}.tar.gz) + message(STATUS "Downloading from ${url}, if failed, please try configuring again") diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index c00a1c42b53160..6a05289b31c00d 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.46.3 - SHA512 e80322b65c6f8d64dc91bce9f612119191e8d329cac2fbc5da6dad9a2a7ccaa7a501470ed483e555c3ba596e8aff796fbda2747f09e9c4329aed3de4d9b6b666 + REF v1.48.0 + SHA512 558c659b325eb2f64f6caf78c0701eaaf3d9ae35f6d25ccd69b8995d5b82b98ca1a7ef9f497a0a1dab5914d2328c044c108373152426a15045d0c978b27f3503 HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -15,10 +15,10 @@ vcpkg_from_github( 00004-link-gdi32-on-windows.patch 00005-fix-uwp-error.patch 00009-use-system-upb.patch - 00011-fix-csharp_plugin.patch snprintf.patch 00012-fix-use-cxx17.patch 00014-pkgconfig-upbdefs.patch + 00015-disable-download-archive.patch ) if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index e6ec9df373ceb7..f0997d69738c73 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "grpc", - "version-semver": "1.46.3", - "port-version": 1, + "version-semver": "1.48.0", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 995182f4c13f4f..bf683176ee7aa3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2693,8 +2693,8 @@ "port-version": 0 }, "grpc": { - "baseline": "1.46.3", - "port-version": 1 + "baseline": "1.48.0", + "port-version": 0 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index a0a513fe25453e..f64c4ebc7f90e6 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef80a11383e8ff6bd068d50e620ea681cea3a22e", + "version-semver": "1.48.0", + "port-version": 0 + }, { "git-tree": "7db8056216ec23b5d48a44eaab6581c3357c1389", "version-semver": "1.46.3", From f3aaee3cda52e3918f96a9e7679354147f98d73a Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 22 Jul 2022 13:58:36 -0400 Subject: [PATCH 188/791] [z3] Update to v4.9.1 (#25911) * [z3] Update to v4.9.1 * Update version --- ports/z3/portfile.cmake | 4 ++-- ports/z3/remove-flag-overrides.patch | 2 +- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 0e8dc4b0ba1d4f..b9d724e051a79c 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.8.16 - SHA512 385f6e1ee075b9eadb5aad338657a81f518eef382b99ce623448a630b79f5d414ebccfd1bb5e959626f0b82ef54a5f20326814ae988b5688d51578de6fb69615 + REF z3-4.9.1 + SHA512 0c44e10d039c3bf16591a7b94e3a3209bc334635106ac7ae4afda95541d13d4fc39214646662683c26b4874846e0d83813215e189ce5422d13f8ce7c2ac4db51 HEAD_REF master PATCHES fix-install-path.patch diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index ddba89dd606a72..ebf6c028d49139 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -7,6 +7,6 @@ index 477410ba8..fcca03917 100644 cmake_minimum_required(VERSION 3.4) -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.8.16.0 LANGUAGES CXX) + project(Z3 VERSION 4.9.1.0 LANGUAGES CXX) ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index f5f59bfbd18940..10cd07298ae717 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.8.16", + "version": "4.9.1", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index bf683176ee7aa3..f0fdb254e3cd35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7809,7 +7809,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.8.16", + "baseline": "4.9.1", "port-version": 0 }, "z85": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index ae108bc45470c6..53c388f2b59e51 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c934af0db69ef3b1bacc4bf5a72b5d901aaf1136", + "version": "4.9.1", + "port-version": 0 + }, { "git-tree": "a1217f07ef4a8f918f5b61a01057a4ee70f92422", "version": "4.8.16", From 4b7ccac6c39e48682f0874e38f22a2091b87d383 Mon Sep 17 00:00:00 2001 From: IronsDu Date: Sat, 23 Jul 2022 01:59:01 +0800 Subject: [PATCH 189/791] [brynet] Upgrade to 1.12.1 (#25910) * Upgrade brynet version to v1.12.1 * Upgrade brynet version to v1.12.1 --- ports/brynet/portfile.cmake | 4 ++-- ports/brynet/vcpkg.json | 2 +- versions/b-/brynet.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake index fc3865a37f2361..b8c48d53120f17 100644 --- a/ports/brynet/portfile.cmake +++ b/ports/brynet/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IronsDu/brynet - REF 4d162460372b2385cea121da0403f55582b4e39b # v1.11.2 - SHA512 656e8e0bdf44e2fb9f17c622d517cafc5ff965402ccab4b96e6f4663e715396a962df0ebb2baaec871336e27c0129ceb47b80352bfcd28cdff731d46aad08d8a + REF 4739b5409ce1c9df055ae77f76fb055ca58b34da # v1.12.1 + SHA512 66f06cd6de9e516df7cadeb3b525ca74a8a9747840149686250e54dd4d8c044f6031fcefe9ca392f939f68fda821f6bcebd3a797ca1da11d34405d0a87ebae88 HEAD_REF master ) diff --git a/ports/brynet/vcpkg.json b/ports/brynet/vcpkg.json index 026f2d895488b2..a6d8ef4509ff4a 100644 --- a/ports/brynet/vcpkg.json +++ b/ports/brynet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "brynet", - "version": "1.11.2", + "version": "1.12.1", "description": "A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket.", "homepage": "https://github.com/IronsDu/brynet" } diff --git a/versions/b-/brynet.json b/versions/b-/brynet.json index 1d9da2e43ac310..858625aeb9e5fc 100644 --- a/versions/b-/brynet.json +++ b/versions/b-/brynet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eb954fee71dc1764d7261d36c185f42ee9c6378", + "version": "1.12.1", + "port-version": 0 + }, { "git-tree": "3a4cea82b4e937b478bd400d4a975dde33b3f741", "version": "1.11.2", diff --git a/versions/baseline.json b/versions/baseline.json index f0fdb254e3cd35..1709f7ed9e4c43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1177,7 +1177,7 @@ "port-version": 0 }, "brynet": { - "baseline": "1.11.2", + "baseline": "1.12.1", "port-version": 0 }, "bshoshany-thread-pool": { From ee51cc23468d183cc685aae33dc2ad3ce91fec8d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 23 Jul 2022 02:07:51 +0800 Subject: [PATCH 190/791] [DCMTK] update to 3.6.7 (#25887) * [DCMTK] update to 3.6.7 * update version * Add license * update version --- ports/dcmtk/portfile.cmake | 5 ++--- ports/dcmtk/vcpkg.json | 5 +++-- versions/baseline.json | 4 ++-- versions/d-/dcmtk.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 7e792dfed6126b..1444a40ab24572 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DCMTK/dcmtk - REF 6cb30bd7fb42190e0188afbd8cb961c62a6fb9c9 # DCMTK-3.6.6 - SHA512 3fbd524bc0b9dced2cdddca850c88d8785ca5f333c5f1598ffbffb8e5c33d11eebdce9ed935245048ac45a7ccd7bd9e4ca79eaacf752cba64a5534b76e5efcdb + REF a137f1aff4e1df3fbefe53ee8b160973c74c96dd # DCMTK-3.6.7 + SHA512 dd41b38ef5d02ac2bf4071e1c27814e03357bc6a51eef59daf47a86d024d7fcbaaa1a71df8600fb8180f8b6537d45d6bf48a00730c1fa9d147778f36ff3e425a HEAD_REF master PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch ) @@ -21,7 +21,6 @@ vcpkg_cmake_configure( -DDCMTK_WITH_ICONV=OFF -DDCMTK_FORCE_FPIC_ON_UNIX=ON -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF - -DDCMTK_ENABLE_BUILTIN_DICTIONARY=ON -DDCMTK_ENABLE_PRIVATE_TAGS=ON -DBUILD_APPS=OFF -DDCMTK_ENABLE_CXX11=ON diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 8f0d893d0c87ca..00553a1cf6b9fd 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dcmtk", - "version": "3.6.6", - "port-version": 3, + "version": "3.6.7", "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.", + "homepage": "https://github.com/DCMTK/dcmtk", + "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng", "supports": "!arm", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 1709f7ed9e4c43..6b96166389f34f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1857,8 +1857,8 @@ "port-version": 1 }, "dcmtk": { - "baseline": "3.6.6", - "port-version": 3 + "baseline": "3.6.7", + "port-version": 0 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index a75be29323c158..d335fccb178a5c 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df20e5c0215de121a9137a9047fabbde17bab8f7", + "version": "3.6.7", + "port-version": 0 + }, { "git-tree": "ce25087f7df7d83c796eee09b4457e7aa70848ad", "version": "3.6.6", From e8bbe813151e45077fa70887b1f87ccce514701a Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 22 Jul 2022 14:08:04 -0400 Subject: [PATCH 191/791] [mbedtls] Update to v2.28.1 (#25894) * [mbedtls] Update to v2.28.1 Latest release of LTS version 2.28 * Update version --- ports/mbedtls/portfile.cmake | 4 ++-- ports/mbedtls/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mbedtls.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/mbedtls/portfile.cmake b/ports/mbedtls/portfile.cmake index 1f65fff5ba4eb0..e2aff063c9b9a2 100644 --- a/ports/mbedtls/portfile.cmake +++ b/ports/mbedtls/portfile.cmake @@ -3,8 +3,8 @@ set(VCPKG_LIBRARY_LINKAGE static) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ARMmbed/mbedtls - REF 8b3f26a5ac38d4fdccbc5c5366229f3e01dafcc0 # mbedtls-2.28.0 - SHA512 a5d2694ae87347be7ebf5c32b86d7bb809cc696b549947efb3d12d41d5f726d4f7caed3cc6ee3f3c9b9e46b3c42c4ce8a5f9741b1b0a3c644b6ae615d2f4c55a + REF v2.28.1 + SHA512 b71d052acfb83daff11e0182f32b0ad0af7c59d2b74bd19f270531a3da9ed3ce1d3adcaf756e161bf05a10fe1b6b7753e360e9dbb5b7b123f09201b1202ef689 HEAD_REF mbedtls-2.28 PATCHES enable-pthread.patch diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json index 93c0e9b222b4fa..b0eb96bb46ea7e 100644 --- a/ports/mbedtls/vcpkg.json +++ b/ports/mbedtls/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mbedtls", - "version": "2.28.0", + "version": "2.28.1", "description": "An open source, portable, easy to use, readable and flexible SSL library", "homepage": "https://github.com/ARMmbed/mbedtls", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6b96166389f34f..807bb06d3904e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4509,7 +4509,7 @@ "port-version": 0 }, "mbedtls": { - "baseline": "2.28.0", + "baseline": "2.28.1", "port-version": 0 }, "mcpp": { diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index 440fc362ea25de..161576939ba269 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fd876a24f60e3034438c6793627be091ab6426", + "version": "2.28.1", + "port-version": 0 + }, { "git-tree": "50e6870207f6a1f0b1e2197978b4403de775eac2", "version": "2.28.0", From 00323023d2da4f95e6396c096ad61d6353401c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Soares?= Date: Fri, 22 Jul 2022 17:52:15 -0300 Subject: [PATCH 192/791] [opentelemetry-cpp] update version to 1.4.1 (#25873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [opentelemetry-cpp] update opentelemetry-cpp to v1.4.1 * enable logs and metrics preview * update versions database * update azure-core-tracing-opentelemetry-cpp to use opentelemetry-cpp 1.4.1 * azure-core-tracing-opentelemetry-cpp: remove hard depdency on opentelemetry version instead of using 1.4.1 * Nitpick on using identical patch file. Co-authored-by: João Soares Co-authored-by: Billy Robert O'Neal III --- .../3844.patch | 22 +++++++++++++++++++ .../portfile.cmake | 2 ++ .../vcpkg.json | 1 + ports/opentelemetry-cpp/portfile.cmake | 10 +++++---- ports/opentelemetry-cpp/vcpkg.json | 2 +- .../azure-core-tracing-opentelemetry-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- versions/o-/opentelemetry-cpp.json | 5 +++++ 8 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 ports/azure-core-tracing-opentelemetry-cpp/3844.patch diff --git a/ports/azure-core-tracing-opentelemetry-cpp/3844.patch b/ports/azure-core-tracing-opentelemetry-cpp/3844.patch new file mode 100644 index 00000000000000..39874cc5af0c82 --- /dev/null +++ b/ports/azure-core-tracing-opentelemetry-cpp/3844.patch @@ -0,0 +1,22 @@ +From e1fd9ed9f476fc94f4143df6ba8b683113af33ed Mon Sep 17 00:00:00 2001 +From: Larry Osterman +Date: Fri, 22 Jul 2022 11:37:48 -0700 +Subject: [PATCH] Removed hard dependency on opentelemetry version + +--- + sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +index bf3077e676..6d0dc15151 100644 +--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt ++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +@@ -36,7 +36,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) + find_package(azure-core-cpp REQUIRED) + endif() + endif() +- find_package(opentelemetry-cpp "1.3.0" CONFIG REQUIRED) ++ find_package(opentelemetry-cpp CONFIG REQUIRED) + + set( + AZURE_CORE_OPENTELEMETRY_HEADER diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake index a906a376879a30..e0a091319d1047 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake +++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO Azure/azure-sdk-for-cpp REF azure-core-tracing-opentelemetry_1.0.0-beta.2 SHA512 a0697ed440a08f3814013adf476c2a1333b462a2eb96bac18c47939c54686396639935568e229dad6bbbae06f54c324da82544634c6384a2c1498f9959836b6d + PATCHES + "3844.patch" # https://github.com/Azure/azure-sdk-for-cpp/pull/3844 "Removed hard dependency on opentelemetry version" ) vcpkg_cmake_configure( diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json index 137ef7272fec05..1afd086ae4e4ff 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json +++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-core-tracing-opentelemetry-cpp", "version-semver": "1.0.0-beta.2", + "port-version": 1, "description": [ "Microsoft Azure Core Tracing OpenTelemetry SDK for C++", "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs." diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index b8dcab966d1123..a6c80c10b412a2 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/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.3.0 - SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836 + REF v1.4.1 + SHA512 090cd8e7283bddaf0bc44b202586fbb0648be9c35965f93dddbdc988fe64c20157f2a4926605f449a76429cc502eff580bc74d50418b29cb7a0a8ab832a7d249 HEAD_REF main ) @@ -29,11 +29,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. if(WITH_OTLP) - set(OTEL_PROTO_VERSION "0.11.0") + set(OTEL_PROTO_VERSION "0.17.0") vcpkg_download_distfile(ARCHIVE URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" - SHA512 ff6c207fe9cc2b6a344439ab5323b3225cf532358d52caf0afee27d9b4cd89195f6da6b6e383fe94de52f60c772df8b477c1ea943db67a217063c71587b7bb92 + SHA512 b61d7fe7d6e1b5943d45ab9d17c22fe36c0f7a8312f668aea2b6685aa0f5c98aaa41e76659057310ec1f061d36ad9e66993be177039121f62f73858a6749d3d9 ) vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party) @@ -46,6 +46,8 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DWITH_EXAMPLES=OFF + -DWITH_METRICS_PREVIEW=ON + -DWITH_LOGS_PREVIEW=ON ${FEATURE_OPTIONS} ) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 659a02dd7068ca..ba7db3c99c145e 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.3.0", + "version-semver": "1.4.1", "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json index 09861ff933cda4..819909b76e1ec9 100644 --- a/versions/a-/azure-core-tracing-opentelemetry-cpp.json +++ b/versions/a-/azure-core-tracing-opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0228c8ec49e7dbde7c7044c915945425ce5092d", + "version-semver": "1.0.0-beta.2", + "port-version": 1 + }, { "git-tree": "4113db6be129830ea748465ca56fcb75e6ef4a31", "version-semver": "1.0.0-beta.2", diff --git a/versions/baseline.json b/versions/baseline.json index 807bb06d3904e0..8f3154fe9f40f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -330,7 +330,7 @@ }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.2", - "port-version": 0 + "port-version": 1 }, "azure-identity-cpp": { "baseline": "1.3.0", @@ -5269,7 +5269,7 @@ "port-version": 4 }, "opentelemetry-cpp": { - "baseline": "1.3.0", + "baseline": "1.4.1", "port-version": 0 }, "opentracing": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 64778c37162557..6fab8f927c29a2 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "614e2f4d01b0a003fe4c6df695eb669b41627736", + "version-semver": "1.4.1", + "port-version": 0 + }, { "git-tree": "0ab7ef25acedde2552479fda46f92716afa53c98", "version-semver": "1.3.0", From f85bc5ebab4527218f30540799d6ecb30d841f60 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 22 Jul 2022 22:55:45 +0200 Subject: [PATCH 193/791] [protobuf] (3.)21.3 (#25909) * [protobuf] update to 21.3 * v db Co-authored-by: Billy Robert O'Neal III --- ports/protobuf/compile_options.patch | 48 ++++++++++++++++++++++++++++ ports/protobuf/portfile.cmake | 7 ++-- ports/protobuf/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/p-/protobuf.json | 5 +++ 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 ports/protobuf/compile_options.patch diff --git a/ports/protobuf/compile_options.patch b/ports/protobuf/compile_options.patch new file mode 100644 index 00000000000000..8cf5417740f27e --- /dev/null +++ b/ports/protobuf/compile_options.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04cb3303a..608c580be 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -242,12 +242,12 @@ endif (protobuf_BUILD_SHARED_LIBS) + if (MSVC) + if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") + # Build with multiple processes +- add_definitions(/MP) ++ add_compile_options(/MP) + endif() + # Set source file and execution character sets to UTF-8 +- add_definitions(/utf-8) ++ add_compile_options(/utf-8) + # MSVC warning suppressions +- add_definitions( ++ add_compile_options( + /wd4065 # switch statement contains 'default' but no 'case' labels + /wd4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data + /wd4251 # 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2' +@@ -262,23 +262,17 @@ if (MSVC) + /wd4996 # The compiler encountered a deprecated declaration. + ) + # Allow big object +- add_definitions(/bigobj) ++ add_compile_options(/bigobj) + string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR}) + string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR}) + string(REPLACE "." "," protobuf_RC_FILEVERSION "${protobuf_VERSION}") + configure_file(${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in extract_includes.bat) + + # Suppress linker warnings about files with no symbols defined. +- set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221") ++ string(APPEND CMAKE_STATIC_LINKER_FLAGS " /ignore:4221") + +- if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +- # Configure Resource Compiler +- enable_language(RC) +- # use English language (0x409) in resource compiler +- set(rc_flags "/l0x409") +- # fix rc.exe invocations because of usage of add_definitions() +- set(CMAKE_RC_COMPILE_OBJECT " ${rc_flags} /fo ") +- endif() ++ # use English language (0x409) in resource compiler ++ string(APPEND CMAKE_RC_FLAGS " -l0x409") + + # Generate the version.rc file used elsewhere. + configure_file(${protobuf_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index b0ae3a1dc95971..06c1fb170cae55 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -1,14 +1,15 @@ -set(version 3.21.2) +set(version 3.21.3) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF 839b18b1ba42639fedecfd751102afcc5736b5d4 #v3.21.2 - SHA512 41503e70094ea6a8355c3ef16cfd998b38edb99f3d98e27be197583d42933a6805566e3efc7311af7453bb3d40d51eb589c67324676a31ec86b3ce80000bcb98 + REF b1eb1260fce7308081822413a0cba77365e7a6ab #v3.21.3 + SHA512 71bdd8e997fdb7d3f8ef6f4f5ac79a69b84283f8e7962809b64aab6778ec6f7051c52af8b1501ec78c63edfe668af4bed43bfc132e17baa8d8e465c0d5a5d770 HEAD_REF master PATCHES fix-static-build.patch fix-default-proto-file-path.patch + compile_options.patch ) string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 17e32eff174ee7..5daa0d9bd9b7c3 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "protobuf", - "version-semver": "3.21.2", - "port-version": 1, + "version": "3.21.3", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 8f3154fe9f40f2..e968597f1f75d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5661,8 +5661,8 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.21.2", - "port-version": 1 + "baseline": "3.21.3", + "port-version": 0 }, "protobuf-c": { "baseline": "1.4.0", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index c6279bcb1bf33c..fa0f24b2719ab5 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ed82c1c5eef7b766d472f71c5ccebcff30cb7bd", + "version": "3.21.3", + "port-version": 0 + }, { "git-tree": "57fe8d3a4fa3bc97f942ce38f103b324f4665685", "version-semver": "3.21.2", From 0a253d9d7a8af51b2b587b937519bbdf19d19fe7 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Fri, 22 Jul 2022 23:35:15 +0200 Subject: [PATCH 194/791] [rbdl-orb] Merging rbdl and rbdl-orb ports (#25695) * merge port rbdl-orb and rbdl * vcpkg x-add-version rbdl * readded rbdl-orb port and empty it reffering to rbdl * vcpkg x-add-version --all --- ports/rbdl-orb/portfile.cmake | 46 +------------------ ports/rbdl-orb/vcpkg.json | 16 ++----- ...ections_exceeded_in_object_file_patch.diff | 15 ------ ports/rbdl/portfile.cmake | 34 +++++++++----- ports/rbdl/vcpkg.json | 11 +++-- versions/baseline.json | 8 ++-- versions/r-/rbdl-orb.json | 5 ++ versions/r-/rbdl.json | 5 ++ 8 files changed, 48 insertions(+), 92 deletions(-) delete mode 100644 ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake index 17c84126836d06..9aefc82414d125 100644 --- a/ports/rbdl-orb/portfile.cmake +++ b/ports/rbdl-orb/portfile.cmake @@ -1,45 +1 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl/copyright") - message(FATAL_ERROR "${PORT} conflict with rbdl, please remove rbdl before install ${PORT}.") -endif() - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ORB-HD/rbdl-orb - REF a2e5428729b636c6232c3b90e4ddac80f7d42b1a - SHA512 2a10b3a7ac4e49b0ac5e7204f419a132bef7431c3ba55a72a8d10f9fea1972419682367bda32506b8daf58fc65405c7f3b7fe11fe661fc3dc6c98a3206cf1253 - HEAD_REF master -) - -vcpkg_from_github( - OUT_SOURCE_PATH PARSER_SOURCE_PATH - REPO ORB-HD/URDF_Parser - REF 8fcc3174743cf3e7561ffb6625524f8133161df4 - SHA512 6cba22e98f23e74fd7c1dcb356d88b5e24c61913dc900e584ed313b1fcce5d6832ceafcf15a3ea7a56714ab82d3cd7d9f4350d3d242614561c836bd4735e3f4f -) -if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") - file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") - file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DRBDL_BUILD_STATIC=${RBDL_STATIC} - -DRBDL_BUILD_ADDON_LUAMODEL=ON - -DRBDL_BUILD_ADDON_GEOMETRY=ON - -DRBDL_BUILD_ADDON_URDFREADER=ON - -DRBDL_BUILD_EXECUTABLES=OFF - -DRBDL_VCPKG_BUILD=ON -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) -vcpkg_fixup_pkgconfig() - -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json index 0b96b7d6f91a0e..acbe19c1df15ba 100644 --- a/ports/rbdl-orb/vcpkg.json +++ b/ports/rbdl-orb/vcpkg.json @@ -1,20 +1,10 @@ { "name": "rbdl-orb", - "version": "3.1.2", - "port-version": 1, + "version": "3.2.0", + "port-version": 2, "description": "Rigid Body Dynamics Library - ORB", "homepage": "https://github.com/orb-hd/rbdl-orb", "dependencies": [ - "boost", - "eigen3", - "lua", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } + "rbdl" ] } diff --git a/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff b/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff deleted file mode 100644 index 8aaf4d38439248..00000000000000 --- a/ports/rbdl/001_x64_number_of_sections_exceeded_in_object_file_patch.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2db532da..42c004380 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,6 +112,10 @@ SET ( RBDL_SOURCES - src/Kinematics.cc - ) - -+IF (MSVC) -+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") -+ENDIF (MSVC) -+ - IF (MSVC AND NOT RBDL_BUILD_STATIC) - MESSAGE (FATAL_ERROR, "Compiling RBDL as a DLL currently not supported. Please enable RBDL_BUILD_STATIC.") - ENDIF (MSVC AND NOT RBDL_BUILD_STATIC) diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index 750e4c6754af4c..946c4873d1cdcd 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -1,23 +1,33 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl-orb/copyright") - message(FATAL_ERROR "${PORT} conflict with rbdl-orb, please remove rbdl-orb before install ${PORT}.") -endif() - string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO rbdl/rbdl - REF v2.6.0 - SHA512 7b5fd03c0090277f295a28a1ff0542cd8cff76dda4379b3edc61ca3d868bf77d8b4882f81865fdffd0cf756c613fe55238b29a83bc163fc32aa94aa9d5781480 - HEAD_REF master - PATCHES 001_x64_number_of_sections_exceeded_in_object_file_patch.diff + OUT_SOURCE_PATH SOURCE_PATH + REPO rbdl/rbdl + REF 6e92742d469efaf59ec2503882693b621f41eca8 + SHA512 d266732fe50a4cd5c55f9ff838649157e48994744f39d9eda9feee640dd400a5bb35ca620386ca65c9f1cdcb1adc923c34809dcb025bd6fc052baa9df57a4a6f + HEAD_REF master ) +vcpkg_from_github( + OUT_SOURCE_PATH PARSER_SOURCE_PATH + REPO ORB-HD/URDF_Parser + REF 8fcc3174743cf3e7561ffb6625524f8133161df4 + SHA512 6cba22e98f23e74fd7c1dcb356d88b5e24c61913dc900e584ed313b1fcce5d6832ceafcf15a3ea7a56714ab82d3cd7d9f4350d3d242614561c836bd4735e3f4f +) +if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") + file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRBDL_BUILD_STATIC=${RBDL_STATIC} + -DRBDL_BUILD_ADDON_LUAMODEL=ON + -DRBDL_BUILD_ADDON_GEOMETRY=ON + -DRBDL_BUILD_ADDON_URDFREADER=ON + -DRBDL_BUILD_EXECUTABLES=OFF + -DRBDL_VCPKG_BUILD=ON ) vcpkg_cmake_install() @@ -25,7 +35,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index 9bc73197e3fbc1..60096879240bc1 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,15 +1,20 @@ { "name": "rbdl", - "version": "2.6.0", - "port-version": 3, + "version": "3.2.0", + "port-version": 4, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", - "license": "Zlib", "dependencies": [ + "boost", "eigen3", + "lua", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index e968597f1f75d4..59195ceda3b671 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6197,12 +6197,12 @@ "port-version": 3 }, "rbdl": { - "baseline": "2.6.0", - "port-version": 3 + "baseline": "3.2.0", + "port-version": 4 }, "rbdl-orb": { - "baseline": "3.1.2", - "port-version": 1 + "baseline": "3.2.0", + "port-version": 2 }, "re2": { "baseline": "2021-11-01", diff --git a/versions/r-/rbdl-orb.json b/versions/r-/rbdl-orb.json index ad446aa6e7e6c9..7efcfecd998086 100644 --- a/versions/r-/rbdl-orb.json +++ b/versions/r-/rbdl-orb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43ffd107db5a63e5c663a98259e3bdcb932fca10", + "version": "3.2.0", + "port-version": 2 + }, { "git-tree": "8471512e28002dc4d68bac4b43769172c22db5dd", "version": "3.1.2", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index b229336aa065fa..1a4a35f2236120 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70c51c8d79d0dab6a483d160024c6bc68a8169c3", + "version": "3.2.0", + "port-version": 4 + }, { "git-tree": "9d0f94e12844bb594f54986246e876569cfca0c1", "version": "2.6.0", From 31211e0bcec59c92607c8f39d11eb64e2c67c2c4 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 22 Jul 2022 14:38:14 -0700 Subject: [PATCH 195/791] [google-cloud-cpp] update to latest release (v2.0.1) (#25898) Co-authored-by: Billy Robert O'Neal III --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 34d936afeecc1d..377d9834576dbb 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v2.0.0 - SHA512 9843c6b739c556be27e5e355b915ffdfa946a9e0a139da8b3a03a8c0abe6beb9088cfc0ba5c6fce1e32acbbce8384ffe59a752213c4bcec4c65a5b3ca8a9baf1 + REF v2.0.1 + SHA512 3e9315ac18d1c06b8d38ac20b389d858b83dbd6058bb697a9f4d7d0e35ae31d9d79856239380c78ea77714c576675ba361b59213d995ff5ce33f11c74647b715 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 73364ce702e3e4..4a38570c4af6ef 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.0.0", + "version": "2.0.1", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 59195ceda3b671..cbebf48ba13c35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2637,7 +2637,7 @@ "port-version": 0 }, "google-cloud-cpp": { - "baseline": "2.0.0", + "baseline": "2.0.1", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 93391e88896b26..0c7b0fd5b39db1 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80997c40db6cb1d4e51f77875f75bf3a8046680f", + "version": "2.0.1", + "port-version": 0 + }, { "git-tree": "71a72e78da707ee567b96bc835cf25cd8e8eb975", "version": "2.0.0", From a84a8437c962c5b59d219a4d1b39b8bf14987504 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 23 Jul 2022 05:38:57 +0800 Subject: [PATCH 196/791] [libmysql] Add target include directories (#25886) Co-authored-by: Cheney-Wang --- .../Add-target-include-directories.patch | 20 +++++++++++++++++++ ports/libmysql/portfile.cmake | 4 +++- ports/libmysql/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libmysql.json | 5 +++++ 5 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 ports/libmysql/Add-target-include-directories.patch diff --git a/ports/libmysql/Add-target-include-directories.patch b/ports/libmysql/Add-target-include-directories.patch new file mode 100644 index 00000000000000..87b0ba6406cec8 --- /dev/null +++ b/ports/libmysql/Add-target-include-directories.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index 88b53e7..f49e44d 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -179,6 +179,7 @@ MACRO(MERGE_LIBRARIES_SHARED) + ADD_VERSION_INFO(${TARGET} SHARED SRC) + ENDIF() + ADD_LIBRARY(${TARGET} SHARED ${SRC}) ++ TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $) + + IF(ARG_EXCLUDE_FROM_ALL) + IF(NOT ARG_SKIP_INSTALL) +@@ -274,6 +275,7 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES) + SET(SOURCE_FILE + ${CMAKE_BINARY_DIR}/archive_output_directory/${TARGET}_depends.c) + ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE}) ++ TARGET_INCLUDE_DIRECTORIES(${TARGET} INTERFACE $) + + IF(ARG_EXCLUDE_FROM_ALL) + IF(NOT ARG_SKIP_INSTALL) diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 5e331113133827..c41a172658c5e5 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -19,16 +19,18 @@ vcpkg_from_github( export-cmake-targets.patch 004-added-limits-include.patch openssl.patch + Add-target-include-directories.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") -set(STACK_DIRECTION) +set(STACK_DIRECTION "") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(STACK_DIRECTION -DSTACK_DIRECTION=-1) endif() #Skip the version check for Visual Studio +set(FORCE_UNSUPPORTED_COMPILER "") if(VCPKG_TARGET_IS_WINDOWS) set(FORCE_UNSUPPORTED_COMPILER 1) endif() diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index 56880427eabe88..6a03029650e985 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 6, + "port-version": 7, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", + "license": "GPL-2.0-or-later", "supports": "!(windows & x86) & !uwp", "dependencies": [ "boost-algorithm", diff --git a/versions/baseline.json b/versions/baseline.json index cbebf48ba13c35..c1667bb73f931f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3874,7 +3874,7 @@ }, "libmysql": { "baseline": "8.0.20", - "port-version": 6 + "port-version": 7 }, "libnice": { "baseline": "0.1.18", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index c1a4d97c6ff376..f8c22e4e5ddf4a 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bde440f72e606ffbfcfba3393813261aa91e5c05", + "version": "8.0.20", + "port-version": 7 + }, { "git-tree": "2bc452d4f5cd5392799424e1bb920175f979dd84", "version": "8.0.20", From f93ba152d55e1d243160e690bc302ffe8638358e Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 22 Jul 2022 23:39:50 +0200 Subject: [PATCH 197/791] [nrf-ble-driver] Remove possible conflicting files (#25900) * Fix possible conflicting license file * version * update license * format * version * UWP can't handle drivers * version --- ports/nrf-ble-driver/portfile.cmake | 43 ++++++++++++++++------------- ports/nrf-ble-driver/vcpkg.json | 18 +++++++++--- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/n-/nrf-ble-driver.json | 5 ++++ 5 files changed, 44 insertions(+), 26 deletions(-) diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake index 22ae9c4af8c11d..0033cae693d616 100644 --- a/ports/nrf-ble-driver/portfile.cmake +++ b/ports/nrf-ble-driver/portfile.cmake @@ -19,34 +19,39 @@ vcpkg_from_github( # Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH. # Git should always be available as it is downloaded during the bootstrap phase. # Append instead of prepend to $PATH to honor the user's git executable as a general rule. -find_program(GIT NAMES git git.cmd) -get_filename_component(GIT_EXE_DIRPATH "${GIT}" DIRECTORY) -set(ENV{PATH} "$ENV{PATH};${GIT_EXE_DIRPATH}") - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DDISABLE_EXAMPLES= -DDISABLE_TESTS= -DNRF_BLE_DRIVER_VERSION=4.1.2 -DCONNECTIVITY_VERSION=4.1.2 +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_EXE_PATH "${GIT}" DIRECTORY) +vcpkg_add_to_path("${GIT_EXE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_EXAMPLES=ON + -DDISABLE_TESTS=ON + -DNRF_BLE_DRIVER_VERSION=4.1.2 + -DCONNECTIVITY_VERSION=4.1.2 + MAYBE_UNUSED_VARIABLES + DISABLE_EXAMPLES + DISABLE_TESTS ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() # Copy hex files into shared folder for package foreach(HEX_DIR IN ITEMS "sd_api_v2" "sd_api_v3" "sd_api_v5" "sd_api_v6") set(TARGET_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/hex/${HEX_DIR}") - file(MAKE_DIRECTORY ${TARGET_DIRECTORY}) - file(INSTALL "${SOURCE_PATH}/hex/${HEX_DIR}" DESTINATION ${TARGET_DIRECTORY}/..) + file(MAKE_DIRECTORY "${TARGET_DIRECTORY}") + file(INSTALL "${SOURCE_PATH}/hex/${HEX_DIR}" DESTINATION "${TARGET_DIRECTORY}/..") endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) -file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nrf-ble-driver/vcpkg.json b/ports/nrf-ble-driver/vcpkg.json index 07176c46608bd9..1e196e9befe9eb 100644 --- a/ports/nrf-ble-driver/vcpkg.json +++ b/ports/nrf-ble-driver/vcpkg.json @@ -1,12 +1,22 @@ { "name": "nrf-ble-driver", - "version-string": "4.1.2", - "port-version": 1, + "version": "4.1.2", + "port-version": 2, "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.", + "homepage": "https://github.com/NordicSemiconductor/pc-ble-driver", + "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ "asio", - "catch2", "cli11", - "spdlog" + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1eee524f6844a2..3a8e162ca2446f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -698,8 +698,6 @@ nativefiledialog:x64-uwp=fail ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail -nrf-ble-driver:arm-uwp=fail -nrf-ble-driver:x64-uwp=fail numactl:arm64-windows=fail numactl:arm-uwp=fail numactl:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index c1667bb73f931f..444d01fb03eaef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4966,7 +4966,7 @@ }, "nrf-ble-driver": { "baseline": "4.1.2", - "port-version": 1 + "port-version": 2 }, "nspr": { "baseline": "4.33", diff --git a/versions/n-/nrf-ble-driver.json b/versions/n-/nrf-ble-driver.json index e01064548fe8a9..6e6d7e6091bef7 100644 --- a/versions/n-/nrf-ble-driver.json +++ b/versions/n-/nrf-ble-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82619c9f6f7860cb053b79c1091a39e0483b7d85", + "version": "4.1.2", + "port-version": 2 + }, { "git-tree": "f0f55511374a869316d374399923f94dc25c4150", "version-string": "4.1.2", From 6a501349b7ef8666ba856d17526d93d200f48af9 Mon Sep 17 00:00:00 2001 From: Jonathan Sweemer Date: Tue, 26 Jul 2022 03:23:19 +0900 Subject: [PATCH 198/791] [quantlib] update to v1.27 (#25932) --- ports/quantlib/portfile.cmake | 4 ++-- ports/quantlib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/q-/quantlib.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 36504190ac9910..5599b6f771ab71 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.26 - SHA512 597dcb4aa3e2701bea758c7b0c62ca0b303a16eda5f324b349ba4e8cc011f6a256fb26d5c42f2bb432da06df1c7b5ec208195e1104e620b69d2a7e8265fd6470 + REF QuantLib-v1.27 + SHA512 c763e7083e1e832d39adb507cc6b34b1ad0a0b7f2b7ffe390428f93fb1df84fcbbf43bcb31dd2f2381da2ac563c88a10fbd932ea5155bd43c604025960039b58 HEAD_REF master ) diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index 27dc4edad10cde..b668af29fb9d98 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "quantlib", - "version": "1.26", - "port-version": 1, + "version": "1.27", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 444d01fb03eaef..5ecd07f3c0f1d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6105,8 +6105,8 @@ "port-version": 1 }, "quantlib": { - "baseline": "1.26", - "port-version": 1 + "baseline": "1.27", + "port-version": 0 }, "quaternions": { "baseline": "1.0.0", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index a3498ea8713bd4..14ea49faa86f1b 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b757843f94ec0950f693324ea419498a12e415f", + "version": "1.27", + "port-version": 0 + }, { "git-tree": "f5eb0f25fa5fdff2d0fd4b5cc1f1bb2e98033b59", "version": "1.26", From 8d5dae7131858ea8a1a40afc04180fd27106e7e4 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 25 Jul 2022 20:42:00 +0200 Subject: [PATCH 199/791] asio-grpc: Update to 2.0.0 (#25952) --- ports/asio-grpc/portfile.cmake | 4 ++-- ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index da91236eed534f..f714d1d212484f 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc - REF v1.7.0 - SHA512 2a9c583678026e1eed4b2128ecf7bb18dff9a39e26de9a29f035cd7c6c838edc5d95015319407d493b09fd650de8b1b7b0bed1b92ba88d40f69d806adf6a0af1 + REF v2.0.0 + SHA512 3ae5e52c790b4c5eec819eecfe5687321d629213de57475a62dd80efc1db367685d4eb976f4387e25c4e891169d34c0ecd56f5d011866f84b40fe3a19ea4809d HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index dedf1caf92f47d..36420e17e3bf54 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "1.7.0", + "version": "2.0.0", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "license": "Apache-2.0", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 7a213c144e09b7..1f37282e31418b 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4cbd771c2f7eb1d18b71df82696cb23292370fe", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "3f73fa275b5f4d19d244b7212b8c7ae61135fc95", "version": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5ecd07f3c0f1d7..ccc172eb6e4f43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -189,7 +189,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "1.7.0", + "baseline": "2.0.0", "port-version": 0 }, "asiosdk": { From 6def72be5a2807be3b5f838f713ee792edf264c8 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 25 Jul 2022 20:42:34 +0200 Subject: [PATCH 200/791] [cgal] update to 5.5 (#25956) * [cgal] upgrade to 5.5 * vcpkg x-add-version --all --- ports/cgal/portfile.cmake | 4 ++-- ports/cgal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cgal.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 976478c43b30e5..32ef646978f3aa 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.4.2 - SHA512 6274f6938b29dabf57f68eda45b80dcb84c29d8ab3febde4b79c2dd70e0a4b7989347804418a66ffe66d63b551f68de2d890cfda56f4681996a00a813a0e9bf7 + REF v5.5 + SHA512 d689b0d4e04ff0a4297939dc0d4c001de88e811583b73fe6173f46b38d51f31f336a09a66c47cf79a1511942a4f5cf4df5d57871deec926bec71183c63b3d2f1 HEAD_REF master ) diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index 0764c72539c700..3f1dd69539df53 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cgal", - "version": "5.4.2", + "version": "5.5", "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", diff --git a/versions/baseline.json b/versions/baseline.json index ccc172eb6e4f43..7aa62b82764992 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1337,7 +1337,7 @@ "port-version": 2 }, "cgal": { - "baseline": "5.4.2", + "baseline": "5.5", "port-version": 0 }, "cgicc": { diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index c2e38cf62bce21..b61a078011d6a9 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cbf69841400a6d51bc3db55b35524a22efcafd1", + "version": "5.5", + "port-version": 0 + }, { "git-tree": "848c2d53e283533691f59e2d7faee6ffd9bbe2f2", "version": "5.4.2", From 4b5b820053373f198b5603606aec33ac250da5f7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 20:45:46 +0200 Subject: [PATCH 201/791] [harfbuzz] update to 5.0.1 (#25961) * [harfbuzz] update to 5.0.1 * v db --- ports/harfbuzz/fix-win32-build.patch | 13 +++++++++++++ ports/harfbuzz/portfile.cmake | 6 ++++-- ports/harfbuzz/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/h-/harfbuzz.json | 5 +++++ 5 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 ports/harfbuzz/fix-win32-build.patch diff --git a/ports/harfbuzz/fix-win32-build.patch b/ports/harfbuzz/fix-win32-build.patch new file mode 100644 index 00000000000000..e4ad0003eda57b --- /dev/null +++ b/ports/harfbuzz/fix-win32-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index e336037a2..a7c501b78 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -473,7 +473,7 @@ defs_list = [harfbuzz_def] + version = '0.@0@.0'.format(hb_version_int) + + extra_hb_cpp_args = [] +-if cpp.get_id() == 'msvc' ++if cpp.get_argument_syntax() == 'msvc' + if get_option('default_library') != 'static' + extra_hb_cpp_args += '-DHB_DLL_EXPORT' + endif diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 6e618698bbfbf1..4d44a10ad48edb 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 4.2.0 - SHA512 2aff1e6a41d6186b71f2915296c46c0b2ffc67371e1f05c13a62c237ff7a84d7d78d414d7a395e1616a2861c83c4792ef5936a492713780564b994d18e2d3e38 + REF 5.0.1 + SHA512 9d05b97dfce248634b6b3ff69fac5cc344f0c8265bf05595b74b0b060049dba082d358184662b8ea045cd51c3d07e7c4a4804513052094566b777c33ec5af89c HEAD_REF master + PATCHES + fix-win32-build.patch ) if("icu" IN_LIST FEATURES) diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 948366a2fcce4e..e6d81578895644 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "harfbuzz", - "version": "4.2.0", - "port-version": 1, + "version": "5.0.1", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index 7aa62b82764992..1ca453e385e571 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2781,8 +2781,8 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "4.2.0", - "port-version": 1 + "baseline": "5.0.1", + "port-version": 0 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 7de0c7f954906c..e36e45408780fd 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfe57115dd9a78a72cbbaadf756e83bbbff449ed", + "version": "5.0.1", + "port-version": 0 + }, { "git-tree": "aa86b69179481aee3a47cb7452a7058a65e6da0c", "version": "4.2.0", From d73287bbc13f09ca89e11bfc62740f2e537a32cb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 25 Jul 2022 21:10:23 +0200 Subject: [PATCH 202/791] [fluidsynth] Update to 2.2.8, improvements (#25951) * Update to 2.2.8 * Fix generated pc file * Repair 'sndfile' feature control * Reintegrate gentables into main build * Update versions --- ports/fluidsynth/fix-dependencies.patch | 10 +++- ...parate-gentables.patch => gentables.patch} | 48 +++++++++++-------- ports/fluidsynth/portfile.cmake | 34 ++++--------- ports/fluidsynth/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/f-/fluidsynth.json | 5 ++ 6 files changed, 56 insertions(+), 49 deletions(-) rename ports/fluidsynth/{separate-gentables.patch => gentables.patch} (55%) diff --git a/ports/fluidsynth/fix-dependencies.patch b/ports/fluidsynth/fix-dependencies.patch index fd2e94824a2bd9..583045c28a2a3c 100644 --- a/ports/fluidsynth/fix-dependencies.patch +++ b/ports/fluidsynth/fix-dependencies.patch @@ -9,7 +9,15 @@ index e4ea71c..df37028 100644 - pkg_check_modules ( GLIB REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) + pkg_check_modules ( GLIB IMPORTED_TARGET REQUIRED glib-2.0>=2.6.5 gthread-2.0>=2.6.5 ) list( APPEND PC_REQUIRES_PRIV "glib-2.0" "gthread-2.0") -+ set(GLIB_LIBRARIES PkgConfig::GLIB) ++ set(GLIB_LIBRARIES PkgConfig::GLIB) # To carry libs with absolute paths, https://gitlab.kitware.com/cmake/cmake/-/issues/16154 if ( GLIB_glib-2.0_VERSION AND GLIB_glib-2.0_VERSION VERSION_LESS "2.26.0" ) message ( WARNING "Your version of glib is very old. This may cause problems with fluidsynth's sample cache on Windows. Consider updating to glib 2.26 or newer!" ) +@@ -865,6 +866,7 @@ endif () + if ( CMAKE_VERSION VERSION_EQUAL "3.12.0" OR CMAKE_VERSION VERSION_GREATER "3.12.0" ) + # retrieve all the private libs we depend on + get_target_property ( LIBS_PRIVATE libfluidsynth INTERFACE_LINK_LIBRARIES) ++ list(FILTER LIBS_PRIVATE EXCLUDE REGEX "^PkgConfig::") # already in 'Requires.private' + # make a copy + set ( LIBS_PRIVATE_WITH_PATH ${LIBS_PRIVATE} ) + diff --git a/ports/fluidsynth/separate-gentables.patch b/ports/fluidsynth/gentables.patch similarity index 55% rename from ports/fluidsynth/separate-gentables.patch rename to ports/fluidsynth/gentables.patch index 3c018110a78d2b..a7adc2ec700dad 100644 --- a/ports/fluidsynth/separate-gentables.patch +++ b/ports/fluidsynth/gentables.patch @@ -1,43 +1,51 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e913cb2..570207e 100644 +index 2803ca8..49f3505 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -268,6 +268,9 @@ generate_product_version( - ) - endif ( WIN32 ) - -+find_program(GENTABLES make_tables REQUIRED) -+execute_process(COMMAND ${GENTABLES} "${CMAKE_BINARY_DIR}/") -+ - add_library ( libfluidsynth-OBJ OBJECT - ${config_SOURCES} - ${fluid_alsa_SOURCES} -@@ -413,6 +416,7 @@ else ( MACOSX_FRAMEWORK ) +@@ -419,6 +419,10 @@ else ( MACOSX_FRAMEWORK ) install ( FILES ${public_main_HEADER} DESTINATION ${INCLUDE_INSTALL_DIR} ) endif ( MACOSX_FRAMEWORK ) -+if (0) ++option(VCPKG_BUILD_MAKE_TABLES "Build `make_tables`" OFF) ++if(VCPKG_BUILD_MAKE_TABLES) ++ add_subdirectory(gentables) ++elseif(0) # ******* Auto Generated Lookup Tables ****** include(ExternalProject) -@@ -435,3 +439,4 @@ ExternalProject_Add(gentables +@@ -440,4 +444,11 @@ ExternalProject_Add(gentables + "${CMAKE_COMMAND}" --build "${GENTAB_BDIR}" INSTALL_COMMAND ${GENTAB_BDIR}/make_tables.exe "${CMAKE_BINARY_DIR}/" ) - add_dependencies(libfluidsynth-OBJ gentables) +endif() ++if(TARGET make_tables AND NOT CMAKE_CROSSCOMPILING) ++ set(GENTABLES make_tables) ++else() ++ find_program(GENTABLES make_tables REQUIRED) ++endif() ++add_custom_target(gentables COMMAND "${GENTABLES}" "${CMAKE_BINARY_DIR}/") + add_dependencies(libfluidsynth-OBJ gentables) diff --git a/src/gentables/CMakeLists.txt b/src/gentables/CMakeLists.txt -index 638f299..e834e34 100644 +index 638f299..19dd9e6 100644 --- a/src/gentables/CMakeLists.txt +++ b/src/gentables/CMakeLists.txt -@@ -15,7 +15,6 @@ project (gentables C) +@@ -12,6 +12,7 @@ unset(ENV{LDFLAGS}) + + project (gentables C) + ++if (0) set ( CMAKE_BUILD_TYPE Debug ) # hardcode ".exe" as suffix to the binary, else in case of cross-platform cross-compiling the calling cmake will not know the suffix used here and fail to find the binary --set ( CMAKE_EXECUTABLE_SUFFIX ".exe" ) - +@@ -20,6 +21,7 @@ set ( CMAKE_EXECUTABLE_SUFFIX ".exe" ) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}) -@@ -34,3 +33,5 @@ if ( WIN32 ) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}) ++endif() + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) + +@@ -34,3 +36,5 @@ if ( WIN32 ) else ( WIN32 ) target_link_libraries (make_tables "m") endif () diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index e94e1852f6ca78..85c52605057136 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -1,38 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FluidSynth/fluidsynth - REF 8b00644751578ba67b709a827cbe5133d849d339 #v2.2.6 - SHA512 37361c6fdbb54eba78e59f03c9ca702129f0fb522721dfb4e744fdc9a8721e665728fa5606bc68c2fb2ce971b4829cfc472f0a7cd72ce3fe14b3a335b098f7ec + REF v2.2.8 + SHA512 8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535 HEAD_REF master PATCHES fix-dependencies.patch - separate-gentables.patch + gentables.patch ) -if ("buildtools" IN_LIST FEATURES) - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/src/gentables" - LOGFILE_BASE configure-tools - ) - - vcpkg_cmake_build( - LOGFILE_BASE install-tools - TARGET install - ) - - vcpkg_copy_tools(TOOL_NAMES make_tables AUTO_CLEAN) - - vcpkg_add_to_path(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -endif() - vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + buildtools VCPKG_BUILD_MAKE_TABLES sndfile enable-libsndfile ) set(feature_list dbus jack libinstpatch midishare opensles oboe oss sdl2 pulseaudio readline lash systemd dart) -vcpkg_list(SET FEATURE_OPTIONS) foreach(_feature IN LISTS feature_list) list(APPEND FEATURE_OPTIONS -Denable-${_feature}:BOOL=OFF) endforeach() @@ -54,12 +38,11 @@ list(APPEND FEATURE_OPTIONS -DCOREMIDI_FOUND=${VCPKG_TARGET_IS_OSX}) list(APPEND FEATURE_OPTIONS -Denable-alsa=${VCPKG_TARGET_IS_LINUX}) list(APPEND FEATURE_OPTIONS -DALSA_FOUND=${VCPKG_TARGET_IS_LINUX}) -vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") - vcpkg_find_acquire_program(PKGCONFIG) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + "-DVCPKG_HOST_TRIPLET=${HOST_TRIPLET}" ${FEATURE_OPTIONS} -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} -DLIB_INSTALL_DIR=lib @@ -76,8 +59,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -# Copy fluidsynth.exe to tools dir -vcpkg_copy_tools(TOOL_NAMES fluidsynth AUTO_CLEAN) +set(tools fluidsynth) +if("buildtools" IN_LIST FEATURES) + list(APPEND tools make_tables) +endif() +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) # Remove unnecessary files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index 499513780e9266..edeeda41677875 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fluidsynth", - "version": "2.2.6", - "port-version": 2, + "version": "2.2.8", "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", "license": "LGPL-2.1-or-later", @@ -13,6 +12,7 @@ { "name": "fluidsynth", "host": true, + "default-features": false, "features": [ "buildtools" ] diff --git a/versions/baseline.json b/versions/baseline.json index 1ca453e385e571..f5b6358e026ca4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2305,8 +2305,8 @@ "port-version": 2 }, "fluidsynth": { - "baseline": "2.2.6", - "port-version": 2 + "baseline": "2.2.8", + "port-version": 0 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 334e47e9e1eff3..ab783ec5bcbf7d 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9629205f0ca376ee2139ec80c48229f5723eecf", + "version": "2.2.8", + "port-version": 0 + }, { "git-tree": "ad0fa73283950f13ecfff01deb0688c30a57c330", "version": "2.2.6", From 8d9d56652f9af906de2b5cd760b8ab376d03ce19 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 25 Jul 2022 12:12:59 -0700 Subject: [PATCH 203/791] [libhv] update to 1.2.6 (#25971) * [libhv] update to 1.2.6 * update portfile.cmake * x-add-version --- ports/libhv/fix-find_package.patch | 24 ----------------- ...t_cmake.patch => fix-include_header.patch} | 26 +++++-------------- ports/libhv/portfile.cmake | 17 +++--------- ports/libhv/vcpkg.json | 3 +-- versions/baseline.json | 4 +-- versions/l-/libhv.json | 5 ++++ 6 files changed, 17 insertions(+), 62 deletions(-) delete mode 100644 ports/libhv/fix-find_package.patch rename ports/libhv/{fix-export_cmake.patch => fix-include_header.patch} (52%) diff --git a/ports/libhv/fix-find_package.patch b/ports/libhv/fix-find_package.patch deleted file mode 100644 index 6ec8b70783ac2c..00000000000000 --- a/ports/libhv/fix-find_package.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd9d1c3..e707884 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,7 +112,10 @@ endif() - - if(WITH_OPENSSL) - add_definitions(-DWITH_OPENSSL) -- set(LIBS ${LIBS} ssl crypto) -+ find_package(OpenSSL REQUIRED) -+ if(OpenSSL_FOUND) -+ set(LIBS ${LIBS} OpenSSL::SSL OpenSSL::Crypto) -+ endif() - endif() - - if(WITH_GNUTLS) -@@ -197,6 +200,7 @@ if(BUILD_STATIC) - add_library(hv_static STATIC ${LIBHV_SRCS}) - target_compile_definitions(hv_static PRIVATE HV_STATICLIB) - target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}) -+ target_link_libraries(hv_static ${LIBS}) - install(TARGETS hv_static DESTINATION lib) - add_custom_target(libhv_static DEPENDS hv_static) - endif() diff --git a/ports/libhv/fix-export_cmake.patch b/ports/libhv/fix-include_header.patch similarity index 52% rename from ports/libhv/fix-export_cmake.patch rename to ports/libhv/fix-include_header.patch index 23f71cf651b41c..8f15c6d63b68ec 100644 --- a/ports/libhv/fix-export_cmake.patch +++ b/ports/libhv/fix-include_header.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f478fb4..1e3556a 100644 +index 59e9b41..f0a162e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -196,9 +196,10 @@ list_source_directories(LIBHV_SRCS ${LIBHV_SRCDIRS}) +@@ -215,7 +215,7 @@ list_source_directories(LIBHV_SRCS ${LIBHV_SRCDIRS}) if(BUILD_SHARED) add_library(hv SHARED ${LIBHV_SRCS}) target_compile_definitions(hv PRIVATE HV_DYNAMICLIB) @@ -10,27 +10,13 @@ index f478fb4..1e3556a 100644 + target_include_directories(hv PRIVATE ${LIBHV_SRCDIRS} INTERFACE $) target_link_libraries(hv ${LIBS}) install(TARGETS hv -+ EXPORT libhvConfig - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) -@@ -208,14 +209,17 @@ endif() + EXPORT libhvConfig +@@ -228,7 +228,7 @@ endif() if(BUILD_STATIC) add_library(hv_static STATIC ${LIBHV_SRCS}) target_compile_definitions(hv_static PRIVATE HV_STATICLIB) - target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS}) + target_include_directories(hv_static PRIVATE ${LIBHV_SRCDIRS} INTERFACE $) target_link_libraries(hv_static ${LIBS}) -- install(TARGETS hv_static DESTINATION lib) -+ install(TARGETS hv_static -+ EXPORT libhvConfig -+ ARCHIVE DESTINATION lib) - add_custom_target(libhv_static DEPENDS hv_static) - endif() - - file(INSTALL ${LIBHV_HEADERS} DESTINATION include/hv) - install(FILES ${LIBHV_HEADERS} DESTINATION include/hv) -+install(EXPORT libhvConfig DESTINATION lib/cmake/libhv) - - if(BUILD_SHARED) - set(HV_LIBRARIES hv CACHE INTERNAL "link hv libraries") + install(TARGETS hv_static + EXPORT libhvConfig diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake index 4325455fda3cce..e41aa827fd7ccc 100644 --- a/ports/libhv/portfile.cmake +++ b/ports/libhv/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ithewei/libhv - REF v1.2.4 - SHA512 5732800970180294DCEB329F25D22B1A7178739A2A5A2CE32E030F4FD38055A6298797D26E7FF5525AC662059FF0AAEDB8ABC200E0BA9E4EEBEB5846FB53F4D0 + REF 8d14d1a6cd4accbda9e081716a59395b523303f6 #v1.2.6 + SHA512 d40063f2b2f8191965fd4434b80a17f505819a20fd63aefa63c08663d0acc82d086338f0382ab70289dff0417a8ec922f993d36c4007a1a13c7ce34d71018f83 HEAD_REF master PATCHES - fix-find_package.patch - fix-export_cmake.patch #Sync up the upstream changes + fix-include_header.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -34,13 +33,3 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libhv) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hv.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/bin/hv.dll") -endif() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/hv.dll") -endif() diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json index ed0479840ab6ee..01450d3cdce36e 100644 --- a/ports/libhv/vcpkg.json +++ b/ports/libhv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libhv", - "version": "1.2.4", - "port-version": 2, + "version": "1.2.6", "description": "Libhv is a C/C++ network library similar to libevent/libuv.", "homepage": "https://github.com/ithewei/libhv", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f5b6358e026ca4..86f2d216615b98 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3705,8 +3705,8 @@ "port-version": 0 }, "libhv": { - "baseline": "1.2.4", - "port-version": 2 + "baseline": "1.2.6", + "port-version": 0 }, "libhydrogen": { "baseline": "2022-06-21", diff --git a/versions/l-/libhv.json b/versions/l-/libhv.json index 88a9f22e05387e..eb9947bc1d1ed5 100644 --- a/versions/l-/libhv.json +++ b/versions/l-/libhv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e382c63e132653ac3e2062b4fa0d182242c4da3a", + "version": "1.2.6", + "port-version": 0 + }, { "git-tree": "3533f306ae38ad29c619656d006ae9536bfcdcb4", "version": "1.2.4", From a6c5c0140d81efbaabd30fe574f538eb93e40e34 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 26 Jul 2022 03:14:29 +0800 Subject: [PATCH 204/791] [daw-json-link] update to v3.0.4 (#25966) * fix missing include * update * update to v3.0.4 * update to v3.0.4 --- ports/daw-json-link/portfile.cmake | 4 ++-- ports/daw-json-link/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/daw-json-link.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index 885418a0f8b182..c3da5a9a77ea65 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link - REF 76ef0c71a308bf2286b7ac34df4883b14017d02c #v3.0.0 - SHA512 d416f17af7b9d8adf7a7fafdec6b3f8c17275ca778dc5bc71748c3b705ac248c0a51ae02ae9b6b7a1aecd00d814c44d77849be1784d02476a4aaaa680f9db830 + REF 6275cd9dadfed96e1b21e552657680ea9fce24cb #v3.0.4 + SHA512 7ba326480047b1cfc3cf40114d2793e368d5bc8e90a4e690f17fbac1066e6a89b2c031bef19abab9199b83314dff327651b67f73654e306b17b070b85c50a0f6 HEAD_REF master ) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index 13376e52faba65..62ebae40d1ec8a 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-json-link", - "version": "3.0.0", + "version": "3.0.4", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 86f2d216615b98..25bbc82025f414 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1833,7 +1833,7 @@ "port-version": 0 }, "daw-json-link": { - "baseline": "3.0.0", + "baseline": "3.0.4", "port-version": 0 }, "daw-utf-range": { diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 77d074a66e9aab..84775c81e540e2 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "512359aae4c09860c5ec50624d01ba0d0f21d2a2", + "version": "3.0.4", + "port-version": 0 + }, { "git-tree": "8bcb9a264b390f98488474d1172379e2494f509b", "version": "3.0.0", From 1aa8ac7a051eeccb87a4701fe84fd4c4564374bc Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 21:19:03 +0200 Subject: [PATCH 205/791] [fftw3] fix bigobj compiler option (#25972) * fix bigobj in fftw3 * v db --- ports/fftw3/bigobj.patch | 13 +++++++++++++ ports/fftw3/portfile.cmake | 1 + ports/fftw3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/fftw3/bigobj.patch diff --git a/ports/fftw3/bigobj.patch b/ports/fftw3/bigobj.patch new file mode 100644 index 00000000000000..1ca38658874c0d --- /dev/null +++ b/ports/fftw3/bigobj.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 64db20b6a..ce438a379 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -315,7 +315,7 @@ endif () + add_library (${fftw3_lib} ${SOURCEFILES}) + target_include_directories (${fftw3_lib} INTERFACE $) + if (MSVC AND NOT (CMAKE_C_COMPILER_ID STREQUAL "Intel")) +- target_compile_definitions (${fftw3_lib} PRIVATE /bigobj) ++ target_compile_options (${fftw3_lib} PRIVATE "/bigobj") + endif () + if (HAVE_SSE) + target_compile_options (${fftw3_lib} PRIVATE ${SSE_FLAG}) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 7d3c75f1900fbb..e6a50f1d31e64f 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( patch_targets.patch fftw3_arch_fix.patch aligned_malloc.patch + bigobj.patch ) vcpkg_check_features( diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 99fe9ed0905eee..a119ec907f4dc5 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 3, + "port-version": 4, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 25bbc82025f414..b83904208110d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2254,7 +2254,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 3 + "port-version": 4 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 27f1fec620b346..fe03ab2db49ef7 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ab09732ff55a9c0ff0fadd66623f38773338649", + "version": "3.3.10", + "port-version": 4 + }, { "git-tree": "2bd307eb2dafcd4938d16fc484fbbb731228f4c3", "version": "3.3.10", From 49868fd55286891258fa3e2795ddf05ecb414720 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 25 Jul 2022 21:23:04 +0200 Subject: [PATCH 206/791] [vcpkg-cmake] Update parallel vcpkg_cmake_configure (#21507) * Revise generator selection If the host is x86, assume that msbuild is requested for windows. If msbuild is requested and suitable, use it. Else if a particular generator is requested, use it. Else if ninja is available, use it. Else on non-windows host, use "Unix Makefiles". * Revise ninja_host detection * Revise parallel configure detection * Consolidate ninja path setup * Update documentation * Use portable chdir * [ms-gltf] Use new generator selection * Update versions --- docs/maintainers/vcpkg_cmake_configure.md | 9 ++-- ports/ms-gltf/portfile.cmake | 7 +-- ports/ms-gltf/vcpkg.json | 1 + ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 50 +++++++++---------- scripts/cmake/vcpkg_configure_cmake.cmake | 5 +- versions/baseline.json | 4 +- versions/m-/ms-gltf.json | 5 ++ versions/v-/vcpkg-cmake.json | 5 ++ 9 files changed, 48 insertions(+), 40 deletions(-) diff --git a/docs/maintainers/vcpkg_cmake_configure.md b/docs/maintainers/vcpkg_cmake_configure.md index 4918dc9a7ad886..4ad2ad178e20f6 100644 --- a/docs/maintainers/vcpkg_cmake_configure.md +++ b/docs/maintainers/vcpkg_cmake_configure.md @@ -55,16 +55,17 @@ Disables passing `/utf-8` when using the [built-in Windows toolchain][VCPKG_CHAI This is needed for libraries that set their own source code's character set when targeting MSVC. See the [MSVC documentation for `/utf-8`](https://docs.microsoft.com/cpp/build/reference/utf-8-set-source-and-executable-character-sets-to-utf-8) for more information. ### WINDOWS_USE_MSBUILD -Use MSBuild instead of [Ninja][ninja] when targeting a Windows platform. +Use MSBuild instead of another generator when targeting a Windows platform. By default vcpkg prefers to use Ninja as the CMake Generator for all platforms. However, there are edge cases where MSBuild has different behavior than Ninja. This flag should only be passed if the project requires MSBuild to build correctly. +This flag has no effect for MinGW targets. ### GENERATOR Specifies the Generator to use. -This is useful if the project-specific buildsystem has been wrapped in a CMake script that won't perform an actual build. If used for this purpose, it should be set to `"Ninja"`. - -This should not be passed alongside [`WINDOWS_USE_MSBUILD`](#windows_use_msbuild). +By default vcpkg prefers to use Ninja as the CMake Generator for all platforms, +or "Unix Makefiles" for non-Windows platforms when Ninja is not available. +This parameter can be used for edge cases where project-specific buildsystems depend on a particular generator. ### LOGFILE_BASE An alternate root name for the configure logs. diff --git a/ports/ms-gltf/portfile.cmake b/ports/ms-gltf/portfile.cmake index d0051a25a35670..2066ac67284144 100644 --- a/ports/ms-gltf/portfile.cmake +++ b/ports/ms-gltf/portfile.cmake @@ -23,14 +23,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # note: Platform-native buildsystem will be more helpful to launch/debug the tests/samples. # note: The PDB file path is making Ninja fails to install. # For Windows, we rely on /MP. The other platforms should be able to build with PREFER_NINJA. -set(WINDOWS_USE_MSBUILD) -if(VCPKG_TARGET_IS_WINDOWS) - set(WINDOWS_USE_MSBUILD "WINDOWS_USE_MSBUILD") -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - ${WINDOWS_USE_MSBUILD} + WINDOWS_USE_MSBUILD OPTIONS ${FEATURE_OPTIONS} ) diff --git a/ports/ms-gltf/vcpkg.json b/ports/ms-gltf/vcpkg.json index 53e59a81d7a0af..d5e7ac83e00bfa 100644 --- a/ports/ms-gltf/vcpkg.json +++ b/ports/ms-gltf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ms-gltf", "version-date": "2022-06-28", + "port-version": 1, "description": "glTF-SDK is a C++ Software Development Kit for glTF", "homepage": "https://github.com/microsoft/glTF-SDK", "license": "MIT", diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index bf449abfa07a97..6ffadbbcee966b 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-07-02", + "version-date": "2022-07-18", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 37b29d6725c815..723fd2ecf81311 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -60,22 +60,28 @@ function(vcpkg_cmake_configure) endif() endif() - set(ninja_can_be_used ON) # Ninja as generator - set(ninja_host ON) # Ninja as parallel configurator - - if(host_architecture STREQUAL "x86") + set(ninja_host ON) # Ninja availability + if(host_architecture STREQUAL "x86" OR DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) # Prebuilt ninja binaries are only provided for x64 hosts - set(ninja_can_be_used OFF) - set(ninja_host OFF) + find_program(NINJA NAMES ninja ninja-build) + if(NOT NINJA) + set(ninja_host OFF) + set(arg_DISABLE_PARALLEL_CONFIGURE ON) + set(arg_WINDOWS_USE_MSBUILD ON) + endif() endif() - set(generator "Ninja") - if(DEFINED arg_GENERATOR) - set(generator "${arg_GENERATOR}") - elseif(arg_WINDOWS_USE_MSBUILD OR NOT ninja_can_be_used) - set(generator "") - set(arch "") + set(generator "") + set(architecture_options "") + if(arg_WINDOWS_USE_MSBUILD AND VCPKG_HOST_IS_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) + vcpkg_list(APPEND architecture_options "-A${arch}") + elseif(DEFINED arg_GENERATOR) + set(generator "${arg_GENERATOR}") + elseif(ninja_host) + set(generator "Ninja") + elseif(NOT VCPKG_HOST_IS_WINDOWS) + set(generator "Unix Makefiles") endif() if(NOT generator) @@ -86,12 +92,13 @@ function(vcpkg_cmake_configure) "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") endif() - # If we use Ninja, make sure it's on PATH - if(generator STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) + if(generator STREQUAL "Ninja") vcpkg_find_acquire_program(NINJA) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") + # If we use Ninja, it must be on PATH for CMake's ExternalProject, + # cf. https://gitlab.kitware.com/cmake/cmake/-/issues/23355. get_filename_component(ninja_path "${NINJA}" DIRECTORY) vcpkg_add_to_path("${ninja_path}") - vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") endif() set(build_dir_release "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") @@ -172,10 +179,6 @@ function(vcpkg_cmake_configure) "-DVCPKG_MANIFEST_INSTALL=OFF" ) - if(DEFINED arch AND NOT arch STREQUAL "") - vcpkg_list(APPEND arg_OPTIONS "-A${arch}") - endif() - # Sets configuration variables for macOS builds foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) if(DEFINED VCPKG_${config_var}) @@ -197,25 +200,22 @@ function(vcpkg_cmake_configure) vcpkg_list(SET rel_command "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" -G "${generator}" + ${architecture_options} "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) vcpkg_list(SET dbg_command "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" -G "${generator}" + ${architecture_options} "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) - if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) + if(NOT arg_DISABLE_PARALLEL_CONFIGURE) vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") vcpkg_find_acquire_program(NINJA) - if(NOT DEFINED ninja_path) - # if ninja_path was defined above, we've already done this - get_filename_component(ninja_path "${NINJA}" DIRECTORY) - vcpkg_add_to_path("${ninja_path}") - endif() #parallelize the configure step set(ninja_configure_contents diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index c33ba403c9c4ac..be0215f9398688 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -7,11 +7,12 @@ function(z_vcpkg_configure_cmake_both_or_neither_set var1 var2) endif() endfunction() function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) - set(line "build ${whereat}/CMakeCache.txt: CreateProcess\n process = cmd /c \"cd ${whereat} &&") + set(line "build ${whereat}/CMakeCache.txt: CreateProcess\n") + string(APPEND line " process = \"${CMAKE_COMMAND}\" -E chdir \"${whereat}\"") foreach(arg IN LISTS "${build_type}_command") string(APPEND line " \"${arg}\"") endforeach() - set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) + set("${out_var}" "${${out_var}}${line}\n\n" PARENT_SCOPE) endfunction() function(z_vcpkg_get_visual_studio_generator) diff --git a/versions/baseline.json b/versions/baseline.json index b83904208110d9..0e5dae463fa7b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4742,7 +4742,7 @@ }, "ms-gltf": { "baseline": "2022-06-28", - "port-version": 0 + "port-version": 1 }, "ms-gsl": { "baseline": "4.0.0", @@ -7421,7 +7421,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-07-02", + "baseline": "2022-07-18", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/m-/ms-gltf.json b/versions/m-/ms-gltf.json index 87af4d87f9e0e5..82b9a8bda8d6f1 100644 --- a/versions/m-/ms-gltf.json +++ b/versions/m-/ms-gltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b189e4d23ebe85437573b386d94b06b3f9fb6238", + "version-date": "2022-06-28", + "port-version": 1 + }, { "git-tree": "a9a91635168ea77faa39adb73b27483797fa8967", "version-date": "2022-06-28", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index daad9b9265debe..a329f1d02a5aa2 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7b618b7782f3c841d7fd2d84a6ba3619815362a", + "version-date": "2022-07-18", + "port-version": 0 + }, { "git-tree": "94abbd71a7fe495e883b13c077312f6d419cbc41", "version-date": "2022-07-02", From cad740263883436a9d4c6753ceaecedf3ec58cd4 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 25 Jul 2022 12:52:00 -0700 Subject: [PATCH 207/791] [directx-dxc, directxtk12] update port for July 2022 release and native ARM64 support (#25827) * [directx-dxc] update port for July 2022 release and native ARM64 support * Update baseline * Update directxtk12 port for hotfix * Update baseline * Update directx-dxc.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/directx-dxc/portfile.cmake | 34 +++++++++++++++++++------------- ports/directx-dxc/vcpkg.json | 4 ++-- ports/directxtk12/portfile.cmake | 4 ++-- ports/directxtk12/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/directx-dxc.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ 7 files changed, 37 insertions(+), 21 deletions(-) diff --git a/ports/directx-dxc/portfile.cmake b/ports/directx-dxc/portfile.cmake index 5c735aa6bc460a..22251e30dc5358 100644 --- a/ports/directx-dxc/portfile.cmake +++ b/ports/directx-dxc/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.6.2112/dxc_2021_12_08.zip" - FILENAME "dxc_2021_12_08.zip" - SHA512 e9b36e896c1d47b39b648adbecf44da7f8543216fd1df539760f0c591907aea081ea6bfc59eb927073aaa1451110c5dc63003546509ff84c9e4445488df97c27 + URLS "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2207/dxc_2022_07_18.zip" + FILENAME "dxc_2022_07_18.zip" + SHA512 b34d770ed9299e6a9ade12cd8d9add28f50e41abdfcdbc7e272568d7f78fe5a8f2bbe5f905839981b97d34b52e1fa627ceacd55743f2cf71e39861418b11ae3b ) vcpkg_download_distfile( LICENSE_TXT - URLS "https://raw.githubusercontent.com/microsoft/DirectXShaderCompiler/v1.6.2112/LICENSE.TXT" - FILENAME "LICENSE.v1.6.2112" + URLS "https://raw.githubusercontent.com/microsoft/DirectXShaderCompiler/v1.7.2207/LICENSE.TXT" + FILENAME "LICENSE.v1.7.2207" SHA512 7589f152ebc3296dca1c73609a2a23a911b8fc0029731268a6151710014d82005a868c85c8249219f060f64ab1ddecdddff5ed6ea34ff509f63ea3e42bbbf47e ) @@ -19,24 +19,30 @@ vcpkg_extract_source_archive_ex( NO_REMOVE_ONE_LEVEL ) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(DXC_ARCH arm64) +else() + set(DXC_ARCH x64) +endif() + file(INSTALL "${PACKAGE_PATH}/inc/d3d12shader.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") file(INSTALL "${PACKAGE_PATH}/inc/dxcapi.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(INSTALL "${PACKAGE_PATH}/lib/x64/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${PACKAGE_PATH}/lib/x64/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +file(INSTALL "${PACKAGE_PATH}/lib/${DXC_ARCH}/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/lib/${DXC_ARCH}/dxcompiler.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -file(COPY "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") -file(COPY "${PACKAGE_PATH}/bin/x64/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") -file(COPY "${PACKAGE_PATH}/bin/x64/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") file(INSTALL - "${PACKAGE_PATH}/bin/x64/dxc.exe" - "${PACKAGE_PATH}/bin/x64/dxcompiler.dll" - "${PACKAGE_PATH}/bin/x64/dxil.dll" + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxc.exe" + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxcompiler.dll" + "${PACKAGE_PATH}/bin/${DXC_ARCH}/dxil.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directx-dxc/vcpkg.json b/ports/directx-dxc/vcpkg.json index 67feec1ab2dd90..3f86fd8a38c4d1 100644 --- a/ports/directx-dxc/vcpkg.json +++ b/ports/directx-dxc/vcpkg.json @@ -1,9 +1,9 @@ { "name": "directx-dxc", - "version-date": "2021-12-08", + "version-date": "2022-07-18", "description": "DirectX Shader Compiler (LLVM/Clang)", "homepage": "https://github.com/microsoft/DirectXShaderCompiler", "documentation": "https://github.com/microsoft/DirectXShaderCompiler/wiki", "license": null, - "supports": "windows & x64 & !uwp & !staticcrt" + "supports": "windows & (x64 | arm64) & !uwp & !staticcrt" } diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 8524ce3fbbde7f..a53e3d9e5c7ca6 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF jun2022b - SHA512 b72080d83ff894fcf5b9efd4f90715fc4a7d457150e1561a3093188d5533e4e856146f83277a5ddee8d7a84a193484cf9d13165a6a7ffb8ada931cf1ccb31eb3 + REF jun2022c + SHA512 48c923920634c74fd0e9a40d29a01d8a6afe321cb3e41145f76bdcc63320a5bb1552a52550b975dbd7d238c576bf75e3e7d5024f347e2cce80495f05313a1a94 HEAD_REF main ) diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 7a0613d49e5c0b..b82bf8ff1e503d 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2022-06-15", + "version-date": "2022-07-19", "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/versions/baseline.json b/versions/baseline.json index 0e5dae463fa7b8..126364cd3d5335 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1885,7 +1885,7 @@ "port-version": 3 }, "directx-dxc": { - "baseline": "2021-12-08", + "baseline": "2022-07-18", "port-version": 0 }, "directx-headers": { @@ -1913,7 +1913,7 @@ "port-version": 0 }, "directxtk12": { - "baseline": "2022-06-15", + "baseline": "2022-07-19", "port-version": 0 }, "dirent": { diff --git a/versions/d-/directx-dxc.json b/versions/d-/directx-dxc.json index 227c7bf95c5432..5af87edbbef4b7 100644 --- a/versions/d-/directx-dxc.json +++ b/versions/d-/directx-dxc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a28201604813ea41d43456d40bdbea61af0db69", + "version-date": "2022-07-18", + "port-version": 0 + }, { "git-tree": "6f2dfd1c848d67e0f36d83b8a6e7078b96d82df1", "version-date": "2021-12-08", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 0eb3cf42a035d9..7a427e9172b019 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "406076922dc0aec8b45b0024e00b0718fd6eb65f", + "version-date": "2022-07-19", + "port-version": 0 + }, { "git-tree": "12033a288a049744a73de4d48c55210ba7201310", "version-date": "2022-06-15", From d052cd6113dbbede9ebc615f1aca5be112a78420 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 22:26:12 +0200 Subject: [PATCH 208/791] [vcpkg script] Normalize PATH so that insertion of msys paths always works (#25848) * Normalize PATH so that insertion of msys paths always works This is required if the PATH variable has been modified and doesn't follow the normal windows style * make it better * switch path manipulations. vcpkg wrapper dir needs to come first. --- scripts/cmake/vcpkg_configure_make.cmake | 42 ++++++++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 17a6d456c82664..971e56e329c01c 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -229,15 +229,43 @@ function(vcpkg_configure_make) debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") endif() if(CMAKE_HOST_WIN32) - set(append_env) + vcpkg_list(SET add_to_env) if(arg_USE_WRAPPERS) - set(append_env ";${MSYS_ROOT}/usr/share/automake-1.16") - string(APPEND append_env ";${SCRIPTS}/buildsystems/make_wrapper") # Other required wrappers are also located there + vcpkg_list(APPEND add_to_env "${SCRIPTS}/buildsystems/make_wrapper") # Other required wrappers are also located there + vcpkg_list(APPEND add_to_env "${MSYS_ROOT}/usr/share/automake-1.16") endif() - # This inserts msys before system32 (which masks sort.exe and find.exe) but after MSVC (which avoids masking link.exe) - string(REPLACE ";$ENV{SystemRoot}\\System32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}") - string(REPLACE ";$ENV{SystemRoot}\\system32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") - set(ENV{PATH} "${NEWPATH}") + cmake_path(CONVERT "$ENV{PATH}" TO_CMAKE_PATH_LIST path_list NORMALIZE) + cmake_path(CONVERT "$ENV{SystemRoot}" TO_CMAKE_PATH_LIST system_root NORMALIZE) + file(REAL_PATH "${system_root}" system_root) + + message(DEBUG "path_list:${path_list}") # Just to have --trace-expand output + + set(find_system_dirs + "${system_root}/system32" + "${system_root}/System32" + "${system_root}/system32/" + "${system_root}/System32/") + + string(TOUPPER "${find_system_dirs}" find_system_dirs_upper) + + set(index "-1") + foreach(system_dir IN LISTS find_system_dirs find_system_dirs_upper) + list(FIND path_list "${system_dir}" index) + if(NOT index EQUAL "-1") + break() + endif() + endforeach() + + if(index GREATER_EQUAL "0") + vcpkg_list(INSERT path_list "${index}" ${add_to_env} "${MSYS_ROOT}/usr/bin") + else() + message(WARNING "Unable to find system32 dir in the PATH variable! Appending required msys paths!") + vcpkg_list(APPEND path_list ${add_to_env} "${MSYS_ROOT}/usr/bin") + endif() + + cmake_path(CONVERT "${path_list}" TO_NATIVE_PATH_LIST native_path_list) + set(ENV{PATH} "${native_path_list}") + set(bash_executable "${MSYS_ROOT}/usr/bin/bash.exe") endif() From f7da57f9e14444784570b24d70fe930caf2f39ac Mon Sep 17 00:00:00 2001 From: Augustin Popa Date: Mon, 25 Jul 2022 13:45:37 -0700 Subject: [PATCH 209/791] [docs] Fixed typos and updated out-of-date information in the FAQ (#25400) * Fixed typos and updated out-of-date information in the FAQ * Further minor updates to faq.md based on feedback * Fixed minor typo in faq.md --- docs/about/faq.md | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/docs/about/faq.md b/docs/about/faq.md index d2ff600b22805c..0e9b8ddef0e0f7 100644 --- a/docs/about/faq.md +++ b/docs/about/faq.md @@ -5,8 +5,10 @@ Yes! Start out by reading our [contribution guidelines](https://github.com/Micro If you want to contribute but don't have a particular library in mind then take a look at the list of [new port requests](https://github.com/Microsoft/vcpkg/issues?q=is%3Aissue+is%3Aopen+label%3Acategory%3Anew-port). -## Can Vcpkg create pre-built binary packages? What is the binary format used by Vcpkg? -Yes! See the [`export` command](../users/buildsystems/export-command.md). +## Can vcpkg create pre-built binary packages? What is the binary format used by vcpkg? +Yes! See the [`export` command](../users/buildsystems/export-command.md) if you wish to produce binaries for exporting into other environments. + +Alternatively, if your goal is to preserve binaries produced by `vcpkg install` operations for later re-use, see the [Binary Caching feature](../users/binarycaching.md) ## How do I update libraries? The `vcpkg update` command lists all packages which are out-of-sync with your current portfiles. To update a package, follow the instructions in the command. @@ -19,31 +21,43 @@ We recommend cloning directly from [GitHub](https://github.com/microsoft/vcpkg) ## Can I build a private library with this tool? Yes. Follow [our packaging zlib Example](../examples/packaging-zipfiles.md) for creating a portfile using a fake URL. Then, either pre-seed the `downloads\` folder with a zip containing your private sources or replace the normal calls to `vcpkg_download_distfile` and `vcpkg_extract_source_archive` with functions that unpack your source code. +You can take this further by publishing your private libraries into a registry. See the article on [Creating Registries](../maintainers/registries.md). A registry is a catalog of ports, similar to the one provided with vcpkg that contains open source libraries. + ## Can I use a prebuilt private library with this tool? Yes. The `portfile.cmake` for a library is fundamentally a script that places the headers and binaries into the correct arrangement in the `${CURRENT_PACKAGES_DIR}`, so to pull in prebuilt binaries you can write a portfile which directly downloads and arranges the files. To see an example of this, look at [`ports\opengl\portfile.cmake`](https://github.com/microsoft/vcpkg/blob/master/ports/opengl/portfile.cmake) which simply copies files out of the Windows SDK. -## Which platforms I can target with Vcpkg? -We currently target Windows Desktop (x86 and x64) as well as the Universal Windows Platform (x86, x64, and ARM). See `vcpkg help triplet` for the current list. +## Which platforms can I target with vcpkg? +Our built-in, CI-tested triplets are: +* Windows Desktop (x86, x64, x64-static, arm64) +* Universal Windows Platform (x64, and ARM) +* Mac OS X (x64-static) +* Linux (x64-static) + +However, there is an even larger number of community triplets available with more platforms and architectures, including for iOS, Android, MinGW, WebAssembly, freeBSD, and openBSD. + +You can also define your own triplets depending on your needs. + +See `vcpkg help triplet` for the current list. -## Does Vcpkg run on Linux/OSX? -Yes! We continuously test on OSX and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! +## Does vcpkg run on Linux/OS X? +Yes! We continuously test on OS X and Ubuntu 16.04, however we know users have been successful with Arch, Fedora, and FreeBSD. If you have trouble with your favorite Linux distribution, let us know in an issue and we'd be happy to help! ## How do I update vcpkg? Execute `git pull` to get the latest sources, then run `bootstrap-vcpkg.bat` (Windows) or `./bootstrap-vcpkg.sh` (Unix) to update vcpkg. ## How do I use different versions of a library on one machine? -Within a single instance of Vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in Vcpkg correspond to the `X-dev` or `X-devel` packages. +Within a single instance of vcpkg (e.g. one set of `installed\`, `packages\`, `ports\` and so forth), you can only have one version of a library installed (otherwise, the headers would conflict with each other!). For those with experience with system-wide package managers, packages in vcpkg correspond to the `X-dev` or `X-devel` packages. -To use different versions of a library for different projects, we recommend making separate instances of Vcpkg and using the [per-project integration mechanisms](../users/buildsystems/integration.md). The versions of each library are specified by the files in `ports\`, so they are easily manipulated using standard `git` commands. This makes it very easy to roll back the entire set of libraries to a consistent set of older versions which all work with each other. If you need to then pin a specific library forward, that is as easy as checking out the appropriate version of `ports\\`. +To use different versions of a library for different projects, we recommend making separate instances of vcpkg and using the [per-project integration mechanisms](../users/buildsystems/integration.md). The versions of each library are specified by the files in `ports\`, so they are easily manipulated using standard `git` commands. This makes it very easy to roll back the entire set of libraries to a consistent set of older versions which all work with each other. If you need to then pin a specific library forward, that is as easy as checking out the appropriate version of `ports\\`. If your application is very sensitive to the versions of libraries, we recommend checking in the specific set of portfiles you need into your source control along with your project sources and using the `--vcpkg-root` option to redirect the working directory of `vcpkg.exe`. -## How does Vcpkg protect my privacy? +## How does vcpkg protect my privacy? See the [Privacy document](privacy.md) for all information regarding privacy. -## Can I use my own CMake toolchain file with Vcpkg's toolchain file? +## Can I use my own CMake toolchain file with vcpkg's toolchain file? Yes. If you already have a CMake toolchain file, you will need to include our toolchain file at the end of yours. This should be as simple as an `include(\scripts\buildsystems\vcpkg.cmake)` directive. Alternatively, you could copy the contents of our `scripts\buildsystems\vcpkg.cmake` into the end of your existing toolchain file. ## Can I use my own/specific flags for rebuilding libs? @@ -51,11 +65,11 @@ Yes. In the current version, there is not yet a standardized global way to chang By saving the changes to the portfile (and checking them in), you'll get the same results even if you're rebuilding from scratch in the future and forgot what exact settings you used. -## Can I get Vcpkg integration for custom configurations? +## Can I get vcpkg integration for custom configurations? -Yes. While Vcpkg will only produce the standard "Release" and "Debug" configurations when building a library, you can get integration support for your projects' custom configurations, in addition to your project's standard configurations. +Yes. While vcpkg will only produce the standard "Release" and "Debug" configurations when building a library, you can get integration support for your projects' custom configurations, in addition to your project's standard configurations. -First of all, Vcpkg will automatically assume any custom configuration starting with "Release" (resp. "Debug") as a configuration that is compatible with the standard "Release" (resp. "Debug") configuration and will act accordingly. +First of all, vcpkg will automatically assume any custom configuration starting with "Release" (resp. "Debug") as a configuration that is compatible with the standard "Release" (resp. "Debug") configuration and will act accordingly. For other configurations, you only need to override the MSBuild `$(VcpkgConfiguration)` macro in your project file (.vcxproj) to declare the compatibility between your configuration, and the target standard configuration. Unfortunately, due to the sequential nature of MSBuild, you'll need to add those settings much higher in your vcxproj so that it is declared before the Vcpk integration is loaded. It is recommend that the `$(VcpkgConfiguration)` macro is added to the "Globals" PropertyGroup. @@ -82,13 +96,13 @@ A lower level mechanism to achieve the same as the `vcpkg integrate project` NuG You can save some disk space by completely removing the `packages\`, `buildtrees\`, and `downloads\` folders. -## How is CMake used internally by Vcpkg? +## How is CMake used internally by vcpkg? Vcpkg uses CMake internally as a build scripting language. This is because CMake is already an extremely common build system for cross-platform open source libraries and is becoming very popular for C++ projects in general. It is easy to acquire on Windows, does not require system-wide installation, and legible for unfamiliar users. -## Will Vcpkg support downloading compiled binaries from a public or private server? +## Will vcpkg support downloading compiled binaries from a public or private server? We would like to eventually support downloading precompiled binaries, similar to other system package managers. -In a corporate scenario, we currently recommend building the libraries once and distributing the entire vcpkg root directory to everyone else on the project through some raw file transport such as a network share or HTTP host. See the [`export` command](../users/buildsystems/export-command.md). +In a corporate scenario, we currently recommend building the libraries once and using the [Binary Caching](../users/binarycaching.md) feature to re-use binaries across different machines and for local development vs. CI scenarios. ## What Visual C++ toolsets are supported? We support Visual Studio 2015 Update 3 and above. From 6b67ad7e48c11efda8cf593e4cabae21fa984f19 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:00:13 +0200 Subject: [PATCH 210/791] [crashpad] use vcpkg_cmake_get_vars (#25864) * [crashpad] use vcpkg_cmake_get_vars * v db * disable uwp for crashpad. * v db --- ports/crashpad/portfile.cmake | 23 ++++++++++------------- ports/crashpad/vcpkg.json | 8 ++++++-- versions/baseline.json | 2 +- versions/c-/crashpad.json | 5 +++++ 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index a8b5c6b710c779..f1d39295cc21f8 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -66,23 +66,20 @@ set(OPTIONS_REL "") if(CMAKE_HOST_WIN32) # Load toolchains - if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - endif() - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") - - foreach(_VAR CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS - CMAKE_C_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELEASE) - string(STRIP "${${_VAR}}" ${_VAR}) - endforeach() + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") set(OPTIONS_DBG "${OPTIONS_DBG} \ - extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}\" \ - extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}\"") + extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_DEBUG}\" \ + extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_DEBUG}\" \ + extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG}\" \ + extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG}\"") set(OPTIONS_REL "${OPTIONS_REL} \ - extra_cflags_c=\"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELEASE}\" \ - extra_cflags_cc=\"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}\"") + extra_cflags_c=\"${VCPKG_COMBINED_C_FLAGS_RELEASE}\" \ + extra_cflags_cc=\"${VCPKG_COMBINED_CXX_FLAGS_RELEASE}\" \ + extra_ldflags=\"${VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE}\" \ + extra_arflags=\"${VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE}\"") set(DISABLE_WHOLE_PROGRAM_OPTIMIZATION "\ extra_cflags=\"/GL-\" \ diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 13c15178c1d41c..171b990505932c 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,15 +1,19 @@ { "name": "crashpad", "version-date": "2022-04-16", - "port-version": 1, + "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." ], "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md", "license": "Apache-2.0", - "supports": "osx | windows", + "supports": "osx | (windows & !uwp)", "dependencies": [ + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, { "name": "vcpkg-tool-gn", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 126364cd3d5335..16821979ad0bfe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1702,7 +1702,7 @@ }, "crashpad": { "baseline": "2022-04-16", - "port-version": 1 + "port-version": 2 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index b24546a8ec836c..e6f7c633756dbe 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52ddbe860d52d69d2c0f80001528f9edf961e58b", + "version-date": "2022-04-16", + "port-version": 2 + }, { "git-tree": "aa3803e8f14e1a0467a2aa509403d9fc8c56e159", "version-date": "2022-04-16", From 4ad8fc2a830382165cd2aed0cd31d6249e507999 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:39:36 +0200 Subject: [PATCH 211/791] [Minizip] enable clang-cl builds (#25960) * minizip enable clang-cl builds * v db * update scripts in port * v db --- ports/minizip/0004-define.patch | 13 +++++++++++++ ports/minizip/portfile.cmake | 18 +++++++++--------- ports/minizip/vcpkg.json | 10 +++++++++- versions/baseline.json | 2 +- versions/m-/minizip.json | 5 +++++ 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 ports/minizip/0004-define.patch diff --git a/ports/minizip/0004-define.patch b/ports/minizip/0004-define.patch new file mode 100644 index 00000000000000..f7bf5ff6f0883d --- /dev/null +++ b/ports/minizip/0004-define.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c +index 274f39eb1..9736fbb0f 100644 +--- a/contrib/minizip/iowin32.c ++++ b/contrib/minizip/iowin32.c +@@ -27,7 +27,7 @@ + + + // see Include/shared/winapifamily.h in the Windows Kit +-#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API))) ++#if defined(WINAPI_FAMILY_ONE_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API))) + #if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) + #define IOWIN32_USING_WINRT_API 1 + #endif diff --git a/ports/minizip/portfile.cmake b/ports/minizip/portfile.cmake index 5e5a56e38ad1c6..006df5863b4fc3 100644 --- a/ports/minizip/portfile.cmake +++ b/ports/minizip/portfile.cmake @@ -10,18 +10,18 @@ vcpkg_from_github( 0001-remove-ifndef-NOUNCRYPT.patch 0002-add-declaration-for-mkdir.patch 0003-no-io64.patch + 0004-define.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS bzip2 ENABLE_BZIP2 ) -configure_file(${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in ${SOURCE_PATH}/cmake/minizipConfig.cmake.in COPYONLY) -configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/minizipConfig.cmake.in" "${SOURCE_PATH}/cmake/minizipConfig.cmake.in" COPYONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DDISABLE_INSTALL_TOOLS=${VCPKG_TARGET_IS_IOS} @@ -29,10 +29,10 @@ vcpkg_configure_cmake( -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/minizip) +vcpkg_cmake_config_fixup() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/minizip") if ("bzip2" IN_LIST FEATURES) file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/minizip/*.h") @@ -43,4 +43,4 @@ if ("bzip2" IN_LIST FEATURES) endforeach() endif() -file(INSTALL ${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/contrib/minizip/MiniZip64_info.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minizip/vcpkg.json b/ports/minizip/vcpkg.json index c8bc8dbb6d4518..31a55ac100e6bb 100644 --- a/ports/minizip/vcpkg.json +++ b/ports/minizip/vcpkg.json @@ -1,11 +1,19 @@ { "name": "minizip", "version-semver": "1.2.11", - "port-version": 10, + "port-version": 11, "description": "Zip compression library", "homepage": "https://github.com/madler/zlib", "supports": "!uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 16821979ad0bfe..541d6f05d3c55e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4622,7 +4622,7 @@ }, "minizip": { "baseline": "1.2.11", - "port-version": 10 + "port-version": 11 }, "minizip-ng": { "baseline": "3.0.5", diff --git a/versions/m-/minizip.json b/versions/m-/minizip.json index 5931b7c3204379..9c1239b4e68bcf 100644 --- a/versions/m-/minizip.json +++ b/versions/m-/minizip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "528703ed8d2b78aeaa55695765535efafa24540b", + "version-semver": "1.2.11", + "port-version": 11 + }, { "git-tree": "c3bec48dc73b936a25a26a9ec1941aac9e39fcf1", "version-semver": "1.2.11", From 4b03e5c3d5cab44d20feefa358e11f16069f40ca Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 25 Jul 2022 23:40:29 +0200 Subject: [PATCH 212/791] [libspatialindex] mingw support (#25882) --- ports/libspatialindex/mingw.patch | 12 ++++++++++++ ports/libspatialindex/portfile.cmake | 1 + ports/libspatialindex/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libspatialindex.json | 5 +++++ 5 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 ports/libspatialindex/mingw.patch diff --git a/ports/libspatialindex/mingw.patch b/ports/libspatialindex/mingw.patch new file mode 100644 index 00000000000000..28c1c2904e02e0 --- /dev/null +++ b/ports/libspatialindex/mingw.patch @@ -0,0 +1,12 @@ +diff --color -ur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2022-07-19 15:21:35.950966519 +0200 ++++ b/src/CMakeLists.txt 2022-07-19 15:21:50.251002371 +0200 +@@ -208,7 +208,7 @@ + PROPERTIES VERSION "${SIDX_LIB_VERSION}" + SOVERSION "${SIDX_LIB_SOVERSION}" ) + +-if(WIN32) ++if(MSVC) + target_compile_options(${SIDX_LIB_NAME} PRIVATE "/wd4068") + target_compile_options(${SIDX_C_LIB_NAME} PRIVATE "/wd4068") + diff --git a/ports/libspatialindex/portfile.cmake b/ports/libspatialindex/portfile.cmake index 17d89d36c5ab7a..8c97489433bec3 100644 --- a/ports/libspatialindex/portfile.cmake +++ b/ports/libspatialindex/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES static.patch + mingw.patch ) vcpkg_configure_cmake( diff --git a/ports/libspatialindex/vcpkg.json b/ports/libspatialindex/vcpkg.json index 9caadda04f8a65..8b968ca9a51b54 100644 --- a/ports/libspatialindex/vcpkg.json +++ b/ports/libspatialindex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libspatialindex", "version": "1.9.3", + "port-version": 1, "description": "C++ implementation of R*-tree, an MVR-tree and a TPR-tree with C API.", "homepage": "http://libspatialindex.github.com", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 541d6f05d3c55e..d4628e1a42e2f3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4090,7 +4090,7 @@ }, "libspatialindex": { "baseline": "1.9.3", - "port-version": 0 + "port-version": 1 }, "libspatialite": { "baseline": "5.0.1", diff --git a/versions/l-/libspatialindex.json b/versions/l-/libspatialindex.json index 9f034e9d08a700..fc9887f64d443d 100644 --- a/versions/l-/libspatialindex.json +++ b/versions/l-/libspatialindex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48179f2e21bb0918129f0f2d02cacb39f88ab347", + "version": "1.9.3", + "port-version": 1 + }, { "git-tree": "2e1fceafc0be5ea8fd1b2961104f46a5e29c9a6c", "version": "1.9.3", From 09d4f8ec9ccf9c415a97dc835c379f475c5db7ee Mon Sep 17 00:00:00 2001 From: Yuriy O'Donnell <36282596+yuriy-odonnell-epic@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:54:59 +0200 Subject: [PATCH 213/791] [blake3] Add assembly implementations (#25921) * [blake3] Extend build script to support assembly implementations * [blake3] Add AVX512 assembly implementation --- ports/blake3/CMakeLists.txt | 36 ++++++++++++++++++++++++++++++------ ports/blake3/vcpkg.json | 1 + versions/b-/blake3.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/ports/blake3/CMakeLists.txt b/ports/blake3/CMakeLists.txt index cc5f37e1fc62eb..1ef6c3893f272e 100644 --- a/ports/blake3/CMakeLists.txt +++ b/ports/blake3/CMakeLists.txt @@ -10,22 +10,46 @@ target_sources(blake3 PRIVATE c/blake3_portable.c ) -# This is a bit too exotic to be worth supporting right now -target_compile_definitions(blake3 PRIVATE BLAKE3_NO_AVX512=1) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + target_compile_definitions(blake3 PRIVATE BLAKE3_NO_AVX512=1) target_sources(blake3 PRIVATE c/blake3_avx2.c c/blake3_sse2.c c/blake3_sse41.c ) - if (NOT MSVC) + if(NOT MSVC) set_source_files_properties(c/blake3_avx2.c COMPILE_FLAGS -mavx2) set_source_files_properties(c/blake3_sse2.c COMPILE_FLAGS -msse2) set_source_files_properties(c/blake3_sse41.c COMPILE_FLAGS -msse4.1) endif() +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + if(WIN32 AND MSVC) + enable_language(ASM_MASM) + target_sources(blake3 PRIVATE + c/blake3_avx2_x86-64_windows_msvc.asm + c/blake3_sse2_x86-64_windows_msvc.asm + c/blake3_sse41_x86-64_windows_msvc.asm + c/blake3_avx512_x86-64_windows_msvc.asm + ) + elseif(WIN32 AND NOT MSVC) + enable_language(ASM) + target_sources(blake3 PRIVATE + c/blake3_avx2_x86-64_windows_gnu.S + c/blake3_sse2_x86-64_windows_gnu.S + c/blake3_sse41_x86-64_windows_gnu.S + c/blake3_avx512_x86-64_windows_gnu.S + ) + else() + enable_language(ASM) + target_sources(blake3 PRIVATE + c/blake3_avx2_x86-64_unix.S + c/blake3_sse2_x86-64_unix.S + c/blake3_sse41_x86-64_unix.S + c/blake3_avx512_x86-64_unix.S + ) + endif() else() - target_compile_definitions(blake3 PRIVATE BLAKE3_NO_SSE2=1 BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1) + target_compile_definitions(blake3 PRIVATE BLAKE3_NO_SSE2=1 BLAKE3_NO_SSE41=1 BLAKE3_NO_AVX2=1 BLAKE3_NO_AVX512=1) endif() if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") diff --git a/ports/blake3/vcpkg.json b/ports/blake3/vcpkg.json index 44c8020227870c..1c2d1b03ce4664 100644 --- a/ports/blake3/vcpkg.json +++ b/ports/blake3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "blake3", "version": "1.3.1", + "port-version": 1, "description": "BLAKE3 cryptographic hash function.", "homepage": "https://github.com/BLAKE3-team/BLAKE3", "license": "CC0-1.0 OR Apache-2.0", diff --git a/versions/b-/blake3.json b/versions/b-/blake3.json index 1a9effce0a4e9c..71f6cb45e6e7a8 100644 --- a/versions/b-/blake3.json +++ b/versions/b-/blake3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78cffdc59cdb9f1c75dffa671578203d0a79fa42", + "version": "1.3.1", + "port-version": 1 + }, { "git-tree": "62a5201ca424389c823b9b4be3d588e1cbb88a58", "version": "1.3.1", diff --git a/versions/baseline.json b/versions/baseline.json index d4628e1a42e2f3..2e39787bd51b41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -502,7 +502,7 @@ }, "blake3": { "baseline": "1.3.1", - "port-version": 0 + "port-version": 1 }, "blas": { "baseline": "1", From 38884e02f562c2bfe07955dfec4b8eeb2f4c076e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 25 Jul 2022 21:55:37 +0000 Subject: [PATCH 214/791] [triton] Fix build, add feature boost (#25924) * [triton] Fix build, add feature boost * version --- ports/triton/portfile.cmake | 10 +++++----- ports/triton/vcpkg.json | 9 ++++++++- versions/baseline.json | 2 +- versions/t-/triton.json | 5 +++++ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ports/triton/portfile.cmake b/ports/triton/portfile.cmake index 3786b0a24837cb..e542d25bce1254 100644 --- a/ports/triton/portfile.cmake +++ b/ports/triton/portfile.cmake @@ -15,14 +15,15 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "python" PYTHON_BINDINGS + "boost" BOOST_INTERFACE ) -set(ADDITIONAL_OPTIONS ) +set(ADDITIONAL_OPTIONS "") if(PYTHON_BINDINGS) vcpkg_find_acquire_program(PYTHON3) list(APPEND ADDITIONAL_OPTIONS - -DPYTHON_EXECUTABLE=${PYTHON3} - ) + "-DPYTHON_EXECUTABLE=${PYTHON3}" + ) endif() vcpkg_cmake_configure( @@ -46,8 +47,7 @@ vcpkg_fixup_pkgconfig() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) # Remove duplicate files -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/triton/vcpkg.json b/ports/triton/vcpkg.json index d23ab93a2ac4f7..df49b5d398a2b4 100644 --- a/ports/triton/vcpkg.json +++ b/ports/triton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "triton", "version": "0.9", - "port-version": 3, + "port-version": 4, "description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.", "homepage": "https://github.com/JonathanSalwan/Triton", "license": "Apache-2.0", @@ -27,6 +27,13 @@ "z3" ], "features": { + "boost": { + "description": "Use Boost as multiprecision library", + "dependencies": [ + "boost-multiprecision", + "boost-numeric-conversion" + ] + }, "python": { "description": "Build Triton with Python bindings", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2e39787bd51b41..bea1f0ff82700d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7238,7 +7238,7 @@ }, "triton": { "baseline": "0.9", - "port-version": 3 + "port-version": 4 }, "trompeloeil": { "baseline": "41", diff --git a/versions/t-/triton.json b/versions/t-/triton.json index 4390795e49c0e8..a47de6a992b6e2 100644 --- a/versions/t-/triton.json +++ b/versions/t-/triton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b86390804efe4afb7989e40a4cf84ad7877e85a", + "version": "0.9", + "port-version": 4 + }, { "git-tree": "dd0d283c09ee98abf32a81d0833e81a9e5222028", "version": "0.9", From 4335dc2edfb9088dede33adaf884372b53e910cb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:58:07 +0200 Subject: [PATCH 215/791] [pugixml] fix dllexport for clang-cl (#25962) * pugixml fix export macros for !cl * v db --- ports/pugixml/dllexport.patch | 18 ++++++++++++++++++ ports/pugixml/portfile.cmake | 2 ++ ports/pugixml/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/pugixml.json | 5 +++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ports/pugixml/dllexport.patch diff --git a/ports/pugixml/dllexport.patch b/ports/pugixml/dllexport.patch new file mode 100644 index 00000000000000..a3368ed9e4d589 --- /dev/null +++ b/ports/pugixml/dllexport.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17f67d1f7..9acaf856f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,8 +110,12 @@ if (BUILD_SHARED_LIBS) + PUBLIC + ${PUGIXML_BUILD_DEFINES} + ${PUGIXML_PUBLIC_DEFINITIONS} ++ ) ++ if(WIN32) ++ target_compile_definitions(pugixml-shared + PRIVATE +- $<$:PUGIXML_API=__declspec\(dllexport\)>) ++ PUGIXML_API=__declspec\(dllexport\)) ++ endif() + target_compile_options(pugixml-shared + PRIVATE + ${msvc-rt-mtd-shared} diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 372e0f8ecaa3a0..69afbc7126ec4b 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.12.1 SHA512 c1a80518e8d7b21f2a15b2023b77e87484f5b7581e68ff508785a60cab53d1689b5508f5a652d6f0d4fbcc91f66d59246fdfe499fd6b0e188c7914ed5919980b HEAD_REF master + PATCHES + dllexport.patch ) vcpkg_cmake_configure( diff --git a/ports/pugixml/vcpkg.json b/ports/pugixml/vcpkg.json index 4485b70425fff1..629b800bab0e84 100644 --- a/ports/pugixml/vcpkg.json +++ b/ports/pugixml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pugixml", "version": "1.12.1", + "port-version": 1, "description": "Light-weight, simple and fast XML parser for C++ with XPath support", "homepage": "https://github.com/zeux/pugixml", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index bea1f0ff82700d..32439aa9245193 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5710,7 +5710,7 @@ }, "pugixml": { "baseline": "1.12.1", - "port-version": 0 + "port-version": 1 }, "pybind11": { "baseline": "2.10.0", diff --git a/versions/p-/pugixml.json b/versions/p-/pugixml.json index 51ec0a49c3bb59..b2fc0a32d4e53b 100644 --- a/versions/p-/pugixml.json +++ b/versions/p-/pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0af6c22cb58a218893ca193a5f5d29d7d1753355", + "version": "1.12.1", + "port-version": 1 + }, { "git-tree": "ffaef9b7ddc94c06bf1293ff4f04906960f0de4c", "version": "1.12.1", From 0bceafcf54f7f6cfc2cfc09c210e3c022c93216e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:58:50 +0200 Subject: [PATCH 216/791] [freexl] use make on all platforms (#25963) * [freexl] always use make * v db * add missing space * v db --- ports/freexl/portfile.cmake | 62 +++++-------------------------------- ports/freexl/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/f-/freexl.json | 5 +++ 4 files changed, 16 insertions(+), 56 deletions(-) diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake index b337c80301a040..0e2e405d10921f 100644 --- a/ports/freexl/portfile.cmake +++ b/ports/freexl/portfile.cmake @@ -15,69 +15,23 @@ vcpkg_extract_source_archive_ex( fix-pc-file.patch ) -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(OPTFLAGS "/nologo /fp:precise /W3 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT") - set(LIBS_ALL "iconv.lib charset.lib") - if(VCPKG_TARGET_IS_UWP) - string(APPEND OPTFLAGS " /DWINAPI_FAMILY=WINAPI_FAMILY_APP") - string(APPEND LIBS_ALL " WindowsApp.lib /APPCONTAINER") - endif() - cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR INSTDIR) - vcpkg_install_nmake( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "OPTFLAGS=${OPTFLAGS}" - "CFLAGS=-I. -Iheaders ${OPTFLAGS}" - "LIBS_ALL=${LIBS_ALL}" - OPTIONS_DEBUG - "INSTDIR=${INSTDIR}\\debug" - "LINK_FLAGS=/debug /LIBPATH:\"${CURRENT_INSTALLED_DIR}/debug/lib\"" - OPTIONS_RELEASE - "INSTDIR=${INSTDIR}" - "LINK_FLAGS=/LIBPATH:\"${CURRENT_INSTALLED_DIR}/lib\"" - ) - - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib") - else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") - endif() - endif() +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) +vcpkg_install_make() - set(VERSION "${FREEXL_VERSION_STR}") - set(libdir [[${prefix}/lib]]) - set(exec_prefix [[${prefix}]]) - set(ICONV_LIBS "-liconv -lcharset") +if(VCPKG_TARGET_IS_WINDOWS) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") set(includedir [[${prefix}/include]]) set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc") - configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY) - vcpkg_replace_string("${outfile}" " -lm" "") + vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(includedir [[${prefix}/../include]]) set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc") - configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY) - vcpkg_replace_string("${outfile}" " -lm" "") + vcpkg_replace_string("${outfile}" " -lm" " -liconv -lcharset") endif() - -else() - - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - ) - vcpkg_install_make() - endif() vcpkg_fixup_pkgconfig() diff --git a/ports/freexl/vcpkg.json b/ports/freexl/vcpkg.json index 39faf316c990b3..ccb91f1f1f0149 100644 --- a/ports/freexl/vcpkg.json +++ b/ports/freexl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freexl", - "version-string": "1.0.6", + "version": "1.0.6", + "port-version": 1, "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet", "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 32439aa9245193..0364e3d6c7a8e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2394,7 +2394,7 @@ }, "freexl": { "baseline": "1.0.6", - "port-version": 0 + "port-version": 1 }, "fribidi": { "baseline": "1.0.12", diff --git a/versions/f-/freexl.json b/versions/f-/freexl.json index 05ef3a3a09c5b7..4f24d7422fd4a2 100644 --- a/versions/f-/freexl.json +++ b/versions/f-/freexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa2b9775bc6c9594fc2f67ace1e80f54def8efe9", + "version": "1.0.6", + "port-version": 1 + }, { "git-tree": "d9635355d8831e1f9628ecbb8935a8e89813ff51", "version-string": "1.0.6", From edd9fb350484242120aa4205956adf16bf8afd70 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 25 Jul 2022 23:59:41 +0200 Subject: [PATCH 217/791] [qtbase] no absolute paths (#25965) --- ports/qtbase/installed_dir.patch | 15 +++++++++++++++ ports/qtbase/portfile.cmake | 2 ++ ports/qtbase/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/qtbase/installed_dir.patch diff --git a/ports/qtbase/installed_dir.patch b/ports/qtbase/installed_dir.patch new file mode 100644 index 00000000000000..91867314159820 --- /dev/null +++ b/ports/qtbase/installed_dir.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in +index 6e37ae02..e7e84468 100644 +--- a/cmake/qt.toolchain.cmake.in ++++ b/cmake/qt.toolchain.cmake.in +@@ -65,6 +65,10 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX + # one level higher is what we're looking for. + get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE) + ++get_filename_component(vcpkg_installed_dir ++ ${CMAKE_CURRENT_LIST_DIR}/../../../ ++ ABSOLUTE) ++ + # REROOT_PATH_ISSUE_MARKER + # There's a subdirectory check in cmake's cmFindCommon::RerootPaths() function, that doesn't handle + # the case of CMAKE_PREFIX_PATH == CMAKE_FIND_ROOT_PATH for a particular pair of entries. diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 2b812f45d87db1..fefa73ae770676 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -16,6 +16,7 @@ set(${PORT}_PATCHES harfbuzz.patch fix_egl.patch clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. + installed_dir.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -340,6 +341,7 @@ string(REGEX REPLACE "set\\\(__qt_chainload_toolchain_file [^\\\n]+\\\n" "set(__ string(REGEX REPLACE "set\\\(VCPKG_CHAINLOAD_TOOLCHAIN_FILE [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") string(REGEX REPLACE "set\\\(__qt_initial_c_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") string(REGEX REPLACE "set\\\(__qt_initial_cxx_compiler [^\\\n]+\\\n" "" toolchain_contents "${toolchain_contents}") +string(REPLACE "${CURRENT_HOST_INSTALLED_DIR}" "\${vcpkg_installed_dir}/${HOST_TRIPLET}" toolchain_contents "${toolchain_contents}") file(WRITE "${qttoolchain}" "${toolchain_contents}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index d3b0abddaee516..44bae6f5bbe583 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.3.1", - "port-version": 1, + "port-version": 2, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 0364e3d6c7a8e9..e0f75473ed56b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5954,7 +5954,7 @@ }, "qtbase": { "baseline": "6.3.1", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.3.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index e847c3a605d1b2..c75a137235b0d3 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fa8531e9f444076cc6e73b979bcaaa3e665a7a5", + "version": "6.3.1", + "port-version": 2 + }, { "git-tree": "53f9f138ffa51742c27c5e44606f86b6b70b2734", "version": "6.3.1", From 4be7ab52e812bb6a66ecb215bb9db4361fe4a645 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 26 Jul 2022 01:37:32 +0200 Subject: [PATCH 218/791] [sdl2pp] Fix exported pc file, cleanup (#25968) * Fix exported pc file * Fix sdl2 import * Move Find module to 'share/${PORT}' * Fix usage instructions * Trim dependencies patch * Update versions --- ports/sdl2pp/fix-dependencies.patch | 35 +++++++++++++------------- ports/sdl2pp/portfile.cmake | 5 ++-- ports/sdl2pp/usage | 9 ++++--- ports/sdl2pp/vcpkg-cmake-wrapper.cmake | 9 +++---- ports/sdl2pp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sdl2pp.json | 5 ++++ 7 files changed, 36 insertions(+), 31 deletions(-) diff --git a/ports/sdl2pp/fix-dependencies.patch b/ports/sdl2pp/fix-dependencies.patch index 13cc92e5278bdb..273ed5288e6573 100644 --- a/ports/sdl2pp/fix-dependencies.patch +++ b/ports/sdl2pp/fix-dependencies.patch @@ -2,27 +2,36 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index cdfd2a6..dc08748 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,11 +23,15 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) +@@ -23,10 +23,25 @@ ENDIF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) # depends FIND_PACKAGE(SDL2 REQUIRED) -SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) -SET(SDL2_ALL_LIBRARIES ${SDL2_LIBRARY}) -+SET(SDL2_ALL_INCLUDE_DIRS ) -+IF (BUILD_SHARED_LIBS) ++SET(SDL2_ALL_INCLUDE_DIRS "") ++IF(TARGET SDL2::SDL2) + SET(SDL2_ALL_LIBRARIES SDL2::SDL2) +ELSE() + SET(SDL2_ALL_LIBRARIES SDL2::SDL2-static) +ENDIF() SET(SDL2_ALL_PKGCONFIG_MODULES sdl2) -SET(SDL2PP_EXTRA_LIBRARIES ${SDL2MAIN_LIBRARY}) --SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES ${SDL2MAIN_LIBRARY}) -+SET(SDL2PP_EXTRA_LIBRARIES SDL2::SDL2main) -+SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES SDL2::SDL2main) ++set(SDL2PP_EXTRA_LIBRARIES SDL2::SDL2main) ++get_target_property(SDL2_MAIN_LIBRARY_DEBUG SDL2::SDL2main IMPORTED_LOCATION_DEBUG) ++get_target_property(SDL2_MAIN_LIBRARY_RELEASE SDL2::SDL2main IMPORTED_LOCATION_RELEASE) ++get_target_property(SDL2_MAIN_LIBRARY_GENERAL SDL2::SDL2main IMPORTED_LOCATION) ++set(SDL2MAIN_LIBRARY "") ++if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND SDL2_MAIN_LIBRARY_DEBUG) ++set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_DEBUG}") ++elseif(SDL2_MAIN_LIBRARY_RELEASE) ++set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_RELEASE}") ++elseif(SDL2_MAIN_LIBRARY_GENERAL) ++set(SDL2MAIN_LIBRARY "${SDL2_MAIN_LIBRARY_GENERAL}") ++endif() + SET(SDL2PP_EXTRA_PKGCONFIG_LIBRARIES ${SDL2MAIN_LIBRARY}) IF(MINGW) - SET(MINGW32_LIBRARY "mingw32" CACHE STRING "mingw32 library") -@@ -36,18 +40,18 @@ IF(MINGW) +@@ -36,18 +40,16 @@ IF(MINGW) ENDIF(MINGW) IF(SDL2PP_WITH_IMAGE) @@ -30,7 +39,6 @@ index cdfd2a6..dc08748 100644 - SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIR}) - SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_IMAGE_LIBRARY}) + FIND_PACKAGE(sdl2-image CONFIG REQUIRED) -+ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) + SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_image) SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_image") ELSE(SDL2PP_WITH_IMAGE) @@ -42,7 +50,6 @@ index cdfd2a6..dc08748 100644 - SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIR}) - SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_TTF_LIBRARY}) + FIND_PACKAGE(sdl2-ttf CONFIG REQUIRED) -+ SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS}) + SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_ttf) SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf") ELSE(SDL2PP_WITH_TTF) @@ -56,14 +63,6 @@ index cdfd2a6..dc08748 100644 SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_mixer") ELSE(SDL2PP_WITH_MIXER) MESSAGE(STATUS "SDL2_mixer support disabled") -@@ -81,7 +85,6 @@ ELSE(MSVC) - ENDIF() - ENDIF(MSVC) - --LIST(REMOVE_DUPLICATES SDL2_ALL_INCLUDE_DIRS) - - INCLUDE_DIRECTORIES(BEFORE ${PROJECT_SOURCE_DIR}) - INCLUDE_DIRECTORIES(SYSTEM ${SDL2_ALL_INCLUDE_DIRS}) @@ -200,10 +203,10 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OPTION(SDL2PP_STATIC "Build static library instead of shared one" OFF) diff --git a/ports/sdl2pp/portfile.cmake b/ports/sdl2pp/portfile.cmake index 265c9bf50c02c3..67ddaba17cb0da 100644 --- a/ports/sdl2pp/portfile.cmake +++ b/ports/sdl2pp/portfile.cmake @@ -18,6 +18,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL2PP_STATIC) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKEMODDIR=share/${PORT} -DSDL2PP_WITH_EXAMPLES=OFF -DSDL2PP_WITH_TESTS=OFF -DSDL2PP_STATIC=${SDL2PP_STATIC} @@ -26,8 +27,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cmake/Modules/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/include\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/FindSDL2PP.cmake" "HINTS \"${CURRENT_PACKAGES_DIR}/lib\"" "") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/sdl2pp/usage b/ports/sdl2pp/usage index e19381a32ff5d6..866ef7c8fde0eb 100644 --- a/ports/sdl2pp/usage +++ b/ports/sdl2pp/usage @@ -1,4 +1,5 @@ -The package sdl2pp provides CMake targets: - - find_package(SDL2PP REQUIRED) - target_include_directories(main PRIVATE ${SDL2PP_INCLUDE_DIRS}) +The package sdl2pp provides CMake variables: + + find_package(SDL2PP REQUIRED) + target_include_directories(main PRIVATE ${SDL2PP_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${SDL2PP_LIBRARIES}) diff --git a/ports/sdl2pp/vcpkg-cmake-wrapper.cmake b/ports/sdl2pp/vcpkg-cmake-wrapper.cmake index 5141fdd39d295f..b0eac9e1b18715 100644 --- a/ports/sdl2pp/vcpkg-cmake-wrapper.cmake +++ b/ports/sdl2pp/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,5 @@ -set(SDL2PP_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/../cmake/Modules) - +set(Z_VCPKG_SDL2PP_PREV_MODULE_PATH "${CMAKE_MODULE_PATH}") +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") _find_package(${ARGS}) - -set(CMAKE_MODULE_PATH ${SDL2PP_PREV_MODULE_PATH}) +set(CMAKE_MODULE_PATH "${Z_VCPKG_SDL2PP_PREV_MODULE_PATH}") +unset(Z_VCPKG_SDL2PP_PREV_MODULE_PATH) diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json index 2c454483e60708..ec726511266862 100644 --- a/ports/sdl2pp/vcpkg.json +++ b/ports/sdl2pp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2pp", "version": "0.16.1", - "port-version": 3, + "port-version": 4, "description": "C++11 bindings/wrapper for SDL2", "homepage": "https://sdl2pp.amdmi3.ru", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index e0f75473ed56b5..fd96ff36678866 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6506,7 +6506,7 @@ }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 3 + "port-version": 4 }, "seal": { "baseline": "3.7.2", diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json index a6a8739b9094f3..abe5cc50a664ce 100644 --- a/versions/s-/sdl2pp.json +++ b/versions/s-/sdl2pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d0efed99dd39ca3bbf35b1b601b7aec4a82b55b", + "version": "0.16.1", + "port-version": 4 + }, { "git-tree": "d5730ae91038160f97ba206548f86d3fbda63d7c", "version": "0.16.1", From b010f27895bbce5f02107fbf54dd5ba005909c4e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 25 Jul 2022 16:41:00 -0700 Subject: [PATCH 219/791] Fix vcpkg.jsons that don't conform with our schema (#25939) * Fix vcpkg.jsons that don't conform with our schema iniparser's homepage is not a valid URI. ndevilla.free.fr/iniparser says that the homepage has moved to github, so just replaced it with that. Note that portfile.cmake already uses vcpkg_from_github. nifticlib was referring to a github organization and used vcpkg_from_github in its homepage. thor was missing a scheme. Using https gave an invalid certificate but http redirected to the site I put here. * Add licenses. --- ports/iniparser/vcpkg.json | 7 ++++--- ports/nifticlib/vcpkg.json | 7 ++++--- ports/thor/vcpkg.json | 4 ++-- versions/baseline.json | 6 +++--- versions/i-/iniparser.json | 5 +++++ versions/n-/nifticlib.json | 5 +++++ versions/t-/thor.json | 5 +++++ 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/ports/iniparser/vcpkg.json b/ports/iniparser/vcpkg.json index 88ad1b9f61585a..e4b515cbfc374b 100644 --- a/ports/iniparser/vcpkg.json +++ b/ports/iniparser/vcpkg.json @@ -1,7 +1,8 @@ { "name": "iniparser", - "version-string": "2020-04-06", - "port-version": 2, + "version-date": "2020-04-06", + "port-version": 3, "description": "C library for parsing INI-style files", - "homepage": "ndevilla.free.fr/iniparser" + "homepage": "https://github.com/ndevilla/iniparser", + "license": "MIT" } diff --git a/ports/nifticlib/vcpkg.json b/ports/nifticlib/vcpkg.json index 8a35da5a0ae0a8..1a0aa85011519b 100644 --- a/ports/nifticlib/vcpkg.json +++ b/ports/nifticlib/vcpkg.json @@ -1,9 +1,10 @@ { "name": "nifticlib", - "version-string": "2020-04-30", - "port-version": 1, + "version-date": "2020-04-30", + "port-version": 2, "description": "Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format.", - "homepage": "NIFTI-Imaging/nifti_clib", + "homepage": "https://github.com/NIFTI-Imaging/nifti_clib", + "license": null, "supports": "!uwp", "dependencies": [ "zlib" diff --git a/ports/thor/vcpkg.json b/ports/thor/vcpkg.json index 17b1ad360f4eab..5137873664475b 100644 --- a/ports/thor/vcpkg.json +++ b/ports/thor/vcpkg.json @@ -1,9 +1,9 @@ { "name": "thor", "version": "2.0", - "port-version": 5, + "port-version": 6, "description": "Extends the multimedia library SFML with higher-level features", - "homepage": "www.bromeon.ch/libraries/thor", + "homepage": "https://bromeon.ch/libraries/thor/", "license": "Zlib", "dependencies": [ "aurora", diff --git a/versions/baseline.json b/versions/baseline.json index fd96ff36678866..4772f8079ac792 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3014,7 +3014,7 @@ }, "iniparser": { "baseline": "2020-04-06", - "port-version": 2 + "port-version": 3 }, "inja": { "baseline": "3.3.0", @@ -4922,7 +4922,7 @@ }, "nifticlib": { "baseline": "2020-04-30", - "port-version": 1 + "port-version": 2 }, "nlohmann-fifo-map": { "baseline": "2018.05.07", @@ -7046,7 +7046,7 @@ }, "thor": { "baseline": "2.0", - "port-version": 5 + "port-version": 6 }, "threadpool": { "baseline": "0.2.5", diff --git a/versions/i-/iniparser.json b/versions/i-/iniparser.json index 4e334c1bfb4f72..a52fdeec1c35f0 100644 --- a/versions/i-/iniparser.json +++ b/versions/i-/iniparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1a9b214d253fa9d677b4ed158bd5e0d0e4e8a31", + "version-date": "2020-04-06", + "port-version": 3 + }, { "git-tree": "4c89c4448c92e7d793775802d4d6cba832af7457", "version-string": "2020-04-06", diff --git a/versions/n-/nifticlib.json b/versions/n-/nifticlib.json index b3f2e4843c370d..d586284ed8ed28 100644 --- a/versions/n-/nifticlib.json +++ b/versions/n-/nifticlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bee84e9bdd74b5b80c68eb3c8933a86a51b37915", + "version-date": "2020-04-30", + "port-version": 2 + }, { "git-tree": "e27d9a2c6e8d4b8b00fc3d1adb0f54f06fa5adee", "version-string": "2020-04-30", diff --git a/versions/t-/thor.json b/versions/t-/thor.json index be1564b2370025..7a5b299f3fe4c8 100644 --- a/versions/t-/thor.json +++ b/versions/t-/thor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d337ec42ced0695748c94113eb08515810e3408f", + "version": "2.0", + "port-version": 6 + }, { "git-tree": "45ba80aa43a83b1c810d757922428538f82d8123", "version": "2.0", From 2343dc8bed11edaea418379794a7930182a48ed7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:04:13 +0200 Subject: [PATCH 220/791] [ci.baseline.txt] add some entries for arm64-osx (#25942) --- scripts/ci.baseline.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3a8e162ca2446f..3293809c48d9b4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -56,11 +56,13 @@ apr:arm64-windows=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail +bitserializer:arm64-osx=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail bond:arm-uwp=fail bond:x64-osx=fail +bond:arm64-osx=fail bond:x64-uwp=fail botan:x64-uwp=fail breakpad:arm64-windows=fail @@ -210,6 +212,7 @@ dmlc:x64-uwp=fail # requires python@2 from brew, but that no longer exists # python2 EOL yay! duktape:x64-osx=skip +duktape:arm64-osx=skip eastl:arm-uwp=fail easyloggingpp:arm-uwp=fail @@ -223,6 +226,7 @@ ecsutil:x64-osx=fail ecsutil:x64-uwp=fail # Checks for gnu extension so only works with gcc. elfutils:x64-osx=fail +elfutils:arm64-osx=fail # embree creates common conflicting static library names when built in static mode, reported upstream: # https://github.com/embree/embree/issues/331 embree2:x64-windows-static=skip @@ -230,6 +234,7 @@ embree2:x64-windows-static-md=skip # embree2 conflicts with embree3 embree2:x64-linux=skip embree2:x64-osx=skip +embree2:arm64-osx=skip epsilon:arm-uwp=fail epsilon:x64-uwp=fail fastrtps:arm-uwp=fail @@ -320,6 +325,7 @@ gperftools:arm-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail gstreamer:x64-osx=fail +gstreamer:arm64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail halide:x64-windows-static=fail @@ -361,6 +367,7 @@ intel-mkl:arm64-windows=fail intel-mkl:arm-uwp=fail intel-mkl:x64-linux=fail intel-mkl:x64-osx=fail +intel-mkl:arm64-osx=fail intel-mkl:x64-uwp=fail intel-mkl:x64-windows=fail intel-mkl:x64-windows-static=fail @@ -375,6 +382,7 @@ jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail jemalloc:x64-linux=fail jemalloc:x64-osx=fail +jemalloc:arm64-osx=fail jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail jinja2cpplight:arm-uwp=fail @@ -422,6 +430,7 @@ libgpg-error:x64-uwp=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail +libhdfs3:arm64-osx=fail libigl:arm64-windows=fail libigl:arm-uwp=fail libigl:x64-uwp=fail @@ -451,11 +460,13 @@ libmesh:x64-windows-static=skip libmesh:x64-windows-static-md=skip libmesh:x86-windows=skip libmesh:x64-osx=skip +libmesh:arm64-osx=skip libmesh:x64-linux=skip # Build fails since PIC is not enabled and some configuration tests do not work properly on UWP libmicrodns:arm-uwp=fail libmicrodns:x64-uwp=fail libmikmod:x64-osx=fail +libmikmod:arm64-osx=fail libmodman:arm-uwp=fail libmodman:x64-uwp=fail libmodman:x64-windows-static=fail @@ -496,6 +507,7 @@ boringssl:arm64-windows = skip boringssl:arm-uwp = skip boringssl:x64-linux = skip boringssl:x64-osx = skip +boringssl:arm64-osx = skip boringssl:x64-uwp = skip boringssl:x64-windows = skip boringssl:x64-windows-static = skip @@ -605,6 +617,7 @@ mesa:x64-linux=fail mesa:x64-osx=fail mfl:x64-linux=skip mfl:x64-osx=skip +mfl:arm64-osx=skip milerius-sfml-imgui:x64-windows-static=fail minifb:arm-uwp=fail minifb:x64-uwp=fail @@ -664,6 +677,7 @@ mozjpeg:arm64-windows = skip mozjpeg:arm-uwp = skip mozjpeg:x64-linux = skip mozjpeg:x64-osx = skip +mozjpeg:arm64-osx = skip mozjpeg:x64-uwp = skip mozjpeg:x64-windows = skip mozjpeg:x64-windows-static = skip @@ -735,6 +749,7 @@ ogre:x64-osx=fail ogre-next:arm64-windows = skip ogre-next:arm-uwp = skip ogre-next:x64-osx = skip +ogre-next:arm64-osx = skip ogre-next:x64-linux = skip ogre-next:x64-uwp = skip ogre-next:x64-windows = skip @@ -877,6 +892,7 @@ qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail qwt:x64-osx=fail +qwt:arm64-osx=fail qwt-qt6:x64-osx=fail qwtw:x64-windows=fail rabit:x64-osx=fail @@ -1174,6 +1190,7 @@ z3:x64-uwp=fail # clapack is replaced by lapack-reference on the platforms lapack-reference supports clapack:x64-linux=skip clapack:x64-osx=skip +clapack:arm64-osx=skip clapack:x64-windows-static=skip clapack:x64-windows-static-md=skip clapack:x64-windows=skip From 10d105c8c406e677a1f0bdb6891245a71ddfdbf9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:12:23 +0200 Subject: [PATCH 221/791] [openssl] Enable builds with clang-cl (#25869) * allow clang-cl builds * v db * should always wait for the debug build to finishe ..... * v db * fix static builds not having pdbs * v db * Add a variable and comment to describe why we are removing PDB copy rules. Co-authored-by: Billy O'Neal --- ports/openssl/vcpkg.json | 1 + ports/openssl/windows/portfile.cmake | 61 +++++++++++++++++----------- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++ 4 files changed, 44 insertions(+), 25 deletions(-) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index fdafd634742bc2..51f2ababfdd59b 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.0.5", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index b2b6d17af66d01..8d3b668edd31fc 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -18,12 +18,6 @@ set(ENV{CXX} "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") set(ENV{AR} "${VCPKG_DETECTED_CMAKE_AR}") set(ENV{LD} "${VCPKG_DETECTED_CMAKE_LINKER}") -# OpenSSL's buildsystem hardcodes certain PDB manipulations, so we cannot use Z7 -string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_RELEASE "${VCPKG_COMBINED_C_FLAGS_RELEASE}") -string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_C_FLAGS_DEBUG "${VCPKG_COMBINED_C_FLAGS_DEBUG}") -string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_CXX_FLAGS_RELEASE "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") -string(REGEX REPLACE "(^| )-Z7($| )" " " VCPKG_COMBINED_CXX_FLAGS_DEBUG "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") - set(CONFIGURE_OPTIONS enable-static-engine enable-capieng @@ -59,17 +53,30 @@ set(OPENSSL_MAKEFILE "makefile") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") +# Clang always uses /Z7; Patching /Zi /Fd out of openssl requires more work. +if (VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang" OR VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(OPENSSL_BUILD_MAKES_PDBS OFF) +else() + set(OPENSSL_BUILD_MAKES_PDBS ON) +endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") # Copy openssl sources. message(STATUS "Copying openssl release source files...") - file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) - foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) - file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - endforeach() + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + message(STATUS "Copying openssl release source files... done") set(SOURCE_PATH_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR}) + set(OPENSSLDIR_RELEASE "${CURRENT_PACKAGES_DIR}") + + # Remove install rules for pdbs if they don't exist + if(NOT OPENSSL_BUILD_MAKES_PDBS) + file(READ "${SOURCE_PATH_RELEASE}/Configurations/windows-makefile.tmpl" contents) + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" \$\(INSTALL_(ENGINE|MODULE|SHLIB|PROGRAM)PDBS\)]] "echo " contents "${contents}") + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" ossl_static.pdb]] "echo " contents "${contents}") + file(WRITE "${SOURCE_PATH_RELEASE}/Configurations/windows-makefile.tmpl" "${contents}") + endif() set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_RELEASE}") set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_RELEASE}") @@ -79,7 +86,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Configure ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" LOGNAME configure-perl-${TARGET_TRIPLET}-rel ) message(STATUS "Configure ${TARGET_TRIPLET}-rel done") @@ -87,16 +94,16 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Build ${TARGET_TRIPLET}-rel") # Openssl's buildsystem has a race condition which will cause JOM to fail at some point. # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build. - make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl) + make_directory("${SOURCE_PATH_RELEASE}/inc32/openssl") execute_process( COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log" ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log" ) vcpkg_execute_required_process( COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${SOURCE_PATH_RELEASE}" LOGNAME build-${TARGET_TRIPLET}-rel-1) message(STATUS "Build ${TARGET_TRIPLET}-rel done") @@ -106,14 +113,20 @@ endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") # Copy openssl sources. message(STATUS "Copying openssl debug source files...") - file(GLOB OPENSSL_SOURCE_FILES ${SOURCE_PATH}/*) - foreach(SOURCE_FILE ${OPENSSL_SOURCE_FILES}) - file(COPY ${SOURCE_FILE} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - endforeach() + file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + message(STATUS "Copying openssl debug source files... done") set(SOURCE_PATH_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug) + # Remove install rules for pdbs if they don't exist + if(NOT OPENSSL_BUILD_MAKES_PDBS) + file(READ "${SOURCE_PATH_DEBUG}/Configurations/windows-makefile.tmpl" contents) + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" \$\(INSTALL_(ENGINE|MODULE|SHLIB|PROGRAM)PDBS\)]] "echo " contents "${contents}") + string(REGEX REPLACE [["\$\(PERL\)" "\$\(SRCDIR\)\\util\\copy.pl" ossl_static.pdb]] "echo " contents "${contents}") + file(WRITE "${SOURCE_PATH_DEBUG}/Configurations/windows-makefile.tmpl" "${contents}") + endif() + + set(OPENSSLDIR_DEBUG "${CURRENT_PACKAGES_DIR}/debug") set(ENV{CFLAGS} "${VCPKG_COMBINED_C_FLAGS_DEBUG}") set(ENV{CXXFLAGS} "${VCPKG_COMBINED_CXX_FLAGS_DEBUG}") @@ -123,7 +136,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Configure ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" LOGNAME configure-perl-${TARGET_TRIPLET}-dbg ) message(STATUS "Configure ${TARGET_TRIPLET}-dbg done") @@ -132,18 +145,18 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") make_directory("${SOURCE_PATH_DEBUG}/inc32/openssl") execute_process( COMMAND "${JOM}" -k -j "${VCPKG_CONCURRENCY}" -f "${OPENSSL_MAKEFILE}" - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" OUTPUT_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log" ERROR_FILE "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log" ) vcpkg_execute_required_process( COMMAND "${JOM}" -j 1 -f "${OPENSSL_MAKEFILE}" install_sw install_ssldirs - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY "${SOURCE_PATH_DEBUG}" LOGNAME build-${TARGET_TRIPLET}-dbg-1) message(STATUS "Build ${TARGET_TRIPLET}-dbg done") - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "Clang") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/legacy.pdb") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ossl-modules/legacy.pdb" "${CURRENT_PACKAGES_DIR}/bin/legacy.pdb") endif() diff --git a/versions/baseline.json b/versions/baseline.json index 4772f8079ac792..866a462ec5ff3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5250,7 +5250,7 @@ }, "openssl": { "baseline": "3.0.5", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 7fc56dbcef849e..63dafbbedbc378 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b7cc4dec346a7593959636aa8cc266240d92b7f", + "version": "3.0.5", + "port-version": 1 + }, { "git-tree": "6f3d4db3ea7bcbac9c79e8beb24c0a33c4da3e96", "version": "3.0.5", From d851aa754c3d817d369f73596595012ae0f0c7ec Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Wed, 27 Jul 2022 01:23:47 +0800 Subject: [PATCH 222/791] update to 2.68.1 (#25987) --- ports/daw-header-libraries/portfile.cmake | 4 ++-- ports/daw-header-libraries/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/daw-header-libraries.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index d2b78b32ceb2ce..9424e326b416cc 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries - REF 67637711bc87f959b6d52adab56a819765b94ae1 #v2.46.2 - SHA512 f9f55ba15b33f2bb5b71fa8a87a189deaa377b848188008d56e884d19d863b4b98ad705d84811f17e2a14e60cc52b8a492fac525a19076e71ecd9dcbdad55dfc + REF d32ba610088041429d48b4f3398f8d1eb84cfe58 #v2.68.1 + SHA512 4d25b5d83401ea36ea4b987ee7530824d3599a36fd8ca8b0bb4ff7560854550eb267414d762770f8b30179178d5d2758060eedd6534913088a5c220f0d14915d HEAD_REF master ) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 6fc0282fb92dd6..94980babcc7b37 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-header-libraries", - "version": "2.46.2", + "version": "2.68.1", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 866a462ec5ff3f..017d1a2e210f54 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1829,7 +1829,7 @@ "port-version": 0 }, "daw-header-libraries": { - "baseline": "2.46.2", + "baseline": "2.68.1", "port-version": 0 }, "daw-json-link": { diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index aa8fe6b9de198f..b9b911686dcdf5 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c183461d315649b9c1fbbb8f2701767d68a38820", + "version": "2.68.1", + "port-version": 0 + }, { "git-tree": "14d1e3a6c6a143089ec1590f343144aa2c6790d9", "version": "2.46.2", From 34d2f421b661fe4bce70dc3659116d7370aadf4b Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:29:21 +0200 Subject: [PATCH 223/791] [brotli] Remove debug tools (#25976) * [brotli] Remove debug tools * version --- ports/brotli/portfile.cmake | 19 ++++++++++--------- ports/brotli/vcpkg.json | 17 ++++++++++++++--- versions/b-/brotli.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/ports/brotli/portfile.cmake b/ports/brotli/portfile.cmake index 9c1e3037dc5184..e578bf3e2f1069 100644 --- a/ports/brotli/portfile.cmake +++ b/ports/brotli/portfile.cmake @@ -11,20 +11,21 @@ vcpkg_from_github( fix-ios.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBROTLI_DISABLE_TESTS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBROTLI_DISABLE_TESTS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/brotli) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-brotli TARGET_PATH share/unofficial-brotli) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/brotli") +vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-brotli PACKAGE_NAME unofficial-brotli) vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-brotli) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-brotli") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/brotli/vcpkg.json b/ports/brotli/vcpkg.json index c5b7fc09dff7e5..bfc8a62cc53c15 100644 --- a/ports/brotli/vcpkg.json +++ b/ports/brotli/vcpkg.json @@ -1,7 +1,18 @@ { "name": "brotli", - "version-string": "1.0.9", - "port-version": 2, + "version": "1.0.9", + "port-version": 3, "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.", - "homepage": "https://github.com/google/brotli" + "homepage": "https://github.com/google/brotli", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json index e00f28e5204089..fc346bbfa92461 100644 --- a/versions/b-/brotli.json +++ b/versions/b-/brotli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b182b3e0615d6f3538b5eeac680f7eb8af5abd0", + "version": "1.0.9", + "port-version": 3 + }, { "git-tree": "73d0ed2fd7816c7a4958983b0b027c85b60eac15", "version-string": "1.0.9", diff --git a/versions/baseline.json b/versions/baseline.json index 017d1a2e210f54..03323810f65914 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1166,7 +1166,7 @@ }, "brotli": { "baseline": "1.0.9", - "port-version": 2 + "port-version": 3 }, "brpc": { "baseline": "1.2.0", From a365d44152d1a4907f265080e1374ddcdc2f150c Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:32:09 +0200 Subject: [PATCH 224/791] [freetype] Fix license (#25980) * [freetype] Fix license * version --- ports/freetype/portfile.cmake | 10 +++++----- ports/freetype/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/freetype.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index daa4ebf79e9eef..40f410d5bfa6d1 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -75,9 +75,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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" - "${SOURCE_PATH}/docs/GPLv2.TXT" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/LICENSE.TXT" + "${SOURCE_PATH}/docs/FTL.TXT" + "${SOURCE_PATH}/docs/GPLv2.TXT" ) -file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index 70ed7e9386d281..b7e60b21389451 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freetype", "version": "2.12.1", + "port-version": 1, "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "license": "FTL OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 03323810f65914..ce6d9f49862f4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2386,7 +2386,7 @@ }, "freetype": { "baseline": "2.12.1", - "port-version": 0 + "port-version": 1 }, "freetype-gl": { "baseline": "2022-01-17", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index 3e06506e84a48b..2a2bc3317bdf26 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f62a602dce6f188e2e4324b46995b2c79a97759a", + "version": "2.12.1", + "port-version": 1 + }, { "git-tree": "bf7afc9d9fa4aba9747dfc7902c60ea7cfa09e72", "version": "2.12.1", From a2df2f95f4c4633c8b595bd3c205053aaff21aae Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 26 Jul 2022 19:32:56 +0200 Subject: [PATCH 225/791] [vamp-sdk] Remove duplicated dependence on vcpkg-cmake (#25981) * [vamp-sdk] Fix duplicate dependence on vcpkg-cmake * version --- ports/vamp-sdk/portfile.cmake | 9 +++------ ports/vamp-sdk/vcpkg.json | 7 +------ versions/baseline.json | 2 +- versions/v-/vamp-sdk.json | 5 +++++ 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ports/vamp-sdk/portfile.cmake b/ports/vamp-sdk/portfile.cmake index 83c60e6fa1ca18..62907f3b5dcc72 100644 --- a/ports/vamp-sdk/portfile.cmake +++ b/ports/vamp-sdk/portfile.cmake @@ -5,11 +5,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() @@ -17,5 +15,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/vamp-sdk/vcpkg.json b/ports/vamp-sdk/vcpkg.json index 33f02b2358818e..f032335d17ba2c 100644 --- a/ports/vamp-sdk/vcpkg.json +++ b/ports/vamp-sdk/vcpkg.json @@ -1,8 +1,7 @@ { - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", "version": "2.10", - "port-version": 3, + "port-version": 4, "description": "Library for Vamp plugins", "homepage": "https://www.vamp-plugins.org/develop.html", "license": "MIT", @@ -12,10 +11,6 @@ "name": "libsndfile", "default-features": false }, - { - "name": "vcpkg-cmake", - "host": true - }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index ce6d9f49862f4f..dc2dcb04005a24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7406,7 +7406,7 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 3 + "port-version": 4 }, "variant-lite": { "baseline": "2.0.0", diff --git a/versions/v-/vamp-sdk.json b/versions/v-/vamp-sdk.json index ab9cdc4230b3d1..97b6ae4f7e7c81 100644 --- a/versions/v-/vamp-sdk.json +++ b/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be6c66cbbf45af0e78aa4456832c04bbe301b951", + "version": "2.10", + "port-version": 4 + }, { "git-tree": "ac0236fcb60d389d21fe96a9c96c5f21f9e905b0", "version": "2.10", From 0257395b0f2da4d5566f71bf0a6683591c9e21a4 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Tue, 26 Jul 2022 23:04:32 +0100 Subject: [PATCH 226/791] [DPP] Add new port (#25949) * vcpkg dpp port built from our CI * fix missing dependency * update * Update Sun Jul 24 11:26:12 UTC 2022 * exclude uwp for dpp * Update Sun Jul 24 13:21:45 UTC 2022 * fix supports * fix supports * Update Sun Jul 24 14:14:29 UTC 2022 * Update Sun Jul 24 15:36:39 UTC 2022 * Update Mon Jul 25 12:04:56 UTC 2022 * * Add https:// to the homepage so that it is a valid URI. * Added usage. * Forced pkgconfig to be required rather than quiet. * Changed tabs to spaces in portfile.cmake. Co-authored-by: Billy O'Neal --- ports/dpp/make-pkgconfig-required.patch | 16 +++++++++++++ ports/dpp/portfile.cmake | 32 +++++++++++++++++++++++++ ports/dpp/usage | 3 +++ ports/dpp/vcpkg.json | 23 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/d-/dpp.json | 9 +++++++ 6 files changed, 87 insertions(+) create mode 100644 ports/dpp/make-pkgconfig-required.patch create mode 100644 ports/dpp/portfile.cmake create mode 100644 ports/dpp/usage create mode 100644 ports/dpp/vcpkg.json create mode 100644 versions/d-/dpp.json diff --git a/ports/dpp/make-pkgconfig-required.patch b/ports/dpp/make-pkgconfig-required.patch new file mode 100644 index 00000000000000..9cef2af0b3ab94 --- /dev/null +++ b/ports/dpp/make-pkgconfig-required.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/FindSodium.cmake b/cmake/FindSodium.cmake +index 23c5317..abbd08f 100644 +--- a/cmake/FindSodium.cmake ++++ b/cmake/FindSodium.cmake +@@ -46,9 +46,9 @@ endif() + # UNIX + if(UNIX) + # import pkg-config +- find_package(PkgConfig QUIET) ++ find_package(PkgConfig REQUIRED) + if(PKG_CONFIG_FOUND) +- pkg_check_modules(sodium_PKG QUIET libsodium) ++ pkg_check_modules(sodium_PKG REQUIRED libsodium) + endif() + + if(sodium_USE_STATIC_LIBS) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake new file mode 100644 index 00000000000000..bd3a05e933de5c --- /dev/null +++ b/ports/dpp/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brainboxdotcc/DPP + REF d9eb0083c7d4f3bb188ac4fde12f3af9a4443696 + SHA512 5b6514a1152d566bba8959f2e51284142d57eec086e634a2b33a08186ee5cb5800a6244d92b9c8e367b60a542ed75b4401f4d68b510f16226633b958aa4aeefa + HEAD_REF master + PATCHES + make-pkgconfig-required.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(NO_PREFIX_CORRECTION) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/dpp") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/dpp/usage b/ports/dpp/usage new file mode 100644 index 00000000000000..4c9c1b3735c262 --- /dev/null +++ b/ports/dpp/usage @@ -0,0 +1,3 @@ +dpp provides CMake targets: + find_package(dpp CONFIG REQUIRED) + target_link_libraries(main PRIVATE dpp::dpp) diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json new file mode 100644 index 00000000000000..5531c18dca4aef --- /dev/null +++ b/ports/dpp/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "dpp", + "version": "10.0.15", + "description": "D++ Extremely Lightweight C++ Discord Library.", + "homepage": "https://dpp.dev/", + "license": "Apache-2.0", + "supports": "(windows & !static & !uwp) | linux | osx", + "dependencies": [ + "libsodium", + "nlohmann-json", + "openssl", + "opus", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index dc2dcb04005a24..7fd4cc16ce0c14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1972,6 +1972,10 @@ "baseline": "22.03", "port-version": 1 }, + "dpp": { + "baseline": "10.0.15", + "port-version": 0 + }, "draco": { "baseline": "1.5.2", "port-version": 0 diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json new file mode 100644 index 00000000000000..d9393630faee01 --- /dev/null +++ b/versions/d-/dpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fe4fafd238e318a6ddf7d5c4db59da499328fdae", + "version": "10.0.15", + "port-version": 0 + } + ] +} From 5b8640fab18484ac0a7759123ebab37b04ffe1d9 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 28 Jul 2022 02:21:32 +0800 Subject: [PATCH 227/791] [libzip] Update to 1.9.2 (#25999) * [libzip] Update to 1.9.2 * Update --- ports/libzip/portfile.cmake | 4 ++-- ports/libzip/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libzip.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 74e9e0df83f88c..8719483153c2e6 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nih-at/libzip - REF v1.9.0 - SHA512 955ea6aa184ad1c0cd3902e252cd7dc6c3b877311e037243223d2e07824146440c690828e77fc41ee943bd8738b8cd03a9b011c1dedacc52e9a7f63d40d242b4 + REF 5532f9baa0c44cc5435ad135686a4ea009075b9a #v1.9.2 + SHA512 1105bc48c8a554a7fce84028197427b02ff53508592889b37e81cc419eb208d91112b98df2bf2d6f5629887e4418230ee36e3bf03c9ae39cdc39cfa90e7e3e7f HEAD_REF master PATCHES fix-dependency.patch diff --git a/ports/libzip/vcpkg.json b/ports/libzip/vcpkg.json index ae89f289a789f0..ffbf0bb12d7306 100644 --- a/ports/libzip/vcpkg.json +++ b/ports/libzip/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libzip", - "version-semver": "1.9.0", + "version": "1.9.2", "description": "A library for reading, creating, and modifying zip archives.", "homepage": "https://github.com/nih-at/libzip", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 7fd4cc16ce0c14..0ca1a46028745a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4293,7 +4293,7 @@ "port-version": 1 }, "libzip": { - "baseline": "1.9.0", + "baseline": "1.9.2", "port-version": 0 }, "libzippp": { diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index adc19b34eb969c..6e694aafb2a2d0 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec8e48c035f43c65ce9f0f5b455affaa92aa477e", + "version": "1.9.2", + "port-version": 0 + }, { "git-tree": "c09a3e4837603b5b74bd434802fdbf8c2367e494", "version-semver": "1.9.0", From 6905d914b7075b76d116f31ebe6d77e364bf6cd4 Mon Sep 17 00:00:00 2001 From: Charles Karney Date: Wed, 27 Jul 2022 14:38:22 -0400 Subject: [PATCH 228/791] [Geographiclib] Update to 2.1.1 (#25982) * update for GeographicLib 2.1.1 * [geographiclib] Update to version 2.1.1 --- ports/geographiclib/portfile.cmake | 4 ++-- ports/geographiclib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/geographiclib.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 42818b4cf9a30f..5870368b057788 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO geographiclib REF distrib-C++ - FILENAME "GeographicLib-2.1.tar.gz" - SHA512 efa3bad6a4f4fb3b2553334f357b5051b82a0c295e9c80ead467a8cdaeb438d81c59bc162444cb7cafa7733d0907a7d303e7f2b5a07640b19dc57a1d0c6c5d95 + FILENAME "GeographicLib-2.1.1.tar.gz" + SHA512 52b01ad4147686ae83d799c1ab7de2452f7288d2f9d1ce12f5daeee88b24484a7aad129a04a3273148221613aaf7d1ea8f07083abb5fd3fc2b4a55cc5dd79951 ) vcpkg_check_features( diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index da68b9a7a8c21d..ef939c3f76e617 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geographiclib", - "version": "2.1", + "version": "2.1.1", "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0ca1a46028745a..e4a47ffbe32cdc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2509,7 +2509,7 @@ "port-version": 2 }, "geographiclib": { - "baseline": "2.1", + "baseline": "2.1.1", "port-version": 0 }, "geos": { diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index d94a1683a4e20e..57f30e76a1939e 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efe97af6f3b9584df1eb7ba4491af1f87e5e0053", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "447b01efd62b08035684790b159926403cc5f7a1", "version": "2.1", From 12a005017be08e8328a68db00416194a1f6101fa Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 27 Jul 2022 20:41:12 +0200 Subject: [PATCH 229/791] [dcmtk] no absolute paths (#25964) --- ports/dcmtk/portfile.cmake | 1 + ports/dcmtk/vcpkg.json | 1 + scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 2 +- versions/baseline.json | 2 +- versions/d-/dcmtk.json | 5 +++++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 1444a40ab24572..a7ba43bc16a332 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -45,5 +45,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" " vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_CONFIGURATION_DIR \"${CURRENT_PACKAGES_DIR}/etc/dcmtk/\"" "") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "") +vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dcmtk" RENAME copyright) diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 00553a1cf6b9fd..5358bba2809a2f 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dcmtk", "version": "3.6.7", + "port-version": 1, "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.", "homepage": "https://github.com/DCMTK/dcmtk", "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng", diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 6040c2699d989e..d0aa3d8fe590c2 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -104,7 +104,7 @@ function(vcpkg_fixup_pkgconfig) string(REPLACE "${unix_packages_dir}" [[${prefix}]] contents "${contents}") string(REPLACE "${unix_installed_dir}" [[${prefix}]] contents "${contents}") - string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" contents "${contents}") + string(REGEX REPLACE "(^|\n) *prefix[\t ]*=[^\n]*" "" contents "${contents}") if("${config}" STREQUAL "DEBUG") # prefix points at the debug subfolder string(REPLACE [[${prefix}/debug]] [[${prefix}]] contents "${contents}") diff --git a/versions/baseline.json b/versions/baseline.json index e4a47ffbe32cdc..b8fdb99d21c875 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1858,7 +1858,7 @@ }, "dcmtk": { "baseline": "3.6.7", - "port-version": 0 + "port-version": 1 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index d335fccb178a5c..b53193613a6d77 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c08360f31aa07d9514b52b3c98ca6c5ae6e17bb2", + "version": "3.6.7", + "port-version": 1 + }, { "git-tree": "df20e5c0215de121a9137a9047fabbde17bab8f7", "version": "3.6.7", From e59f7400c331b4abc82049e80f6f5482f52629f7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 27 Jul 2022 20:51:32 +0200 Subject: [PATCH 230/791] [wxwidgets] Update to 3.2 (#25943) * Update wxwidgets to 3.2.0 * Update portfile * Update wrapper for win32 * [cmake-user] Test wxwidgets on mingw * Fixup cmake config * Updated nanosvg patch * Handle search path for gtk3 link libs * Update versions * Remove obsolete option * Cleanup pkg-config setup * Update versions Co-authored-by: Tal Regev --- ports/wxwidgets/example/CMakeLists.txt | 5 ++++ ports/wxwidgets/gtk3-link-libraries.patch | 12 ++++++++++ ports/wxwidgets/install-layout.patch | 2 +- ports/wxwidgets/nanosvg-ext-depend.patch | 13 +++++++++++ ports/wxwidgets/portfile.cmake | 27 +++++++++++----------- ports/wxwidgets/usage | 8 +++---- ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 28 +++++++++++++++-------- ports/wxwidgets/vcpkg.json | 6 ++++- scripts/test_ports/cmake-user/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 ++++ 11 files changed, 77 insertions(+), 33 deletions(-) create mode 100644 ports/wxwidgets/gtk3-link-libraries.patch diff --git a/ports/wxwidgets/example/CMakeLists.txt b/ports/wxwidgets/example/CMakeLists.txt index 7d5b12dba4cdbe..229b7107a07936 100644 --- a/ports/wxwidgets/example/CMakeLists.txt +++ b/ports/wxwidgets/example/CMakeLists.txt @@ -9,6 +9,11 @@ target_compile_definitions(main PRIVATE ${wxWidgets_DEFINITIONS} "$<$:${wxWidgets_DEFINITIONS_DEBUG}>") - target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) + find_package(wxWidgets CONFIG REQUIRED) + target_link_libraries(main PRIVATE wx::core wx::base) diff --git a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake index cbdd338090f6cf..5737945d08d139 100644 --- a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -8,18 +8,26 @@ set(WX_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") unset(_vcpkg_wx_root) if(WIN32 AND CMAKE_HOST_WIN32) - # FindwxWidgets.cmake win32 mode, multi-config + # Find all libs with "32" infix which is unknown to FindwxWidgets.cmake + function(z_vcpkg_wxwidgets_find_base_library BASENAME) + find_library(WX_${BASENAME}d wx${BASENAME}32ud NAMES wx${BASENAME}d PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(WX_${BASENAME} wx${BASENAME}32u NAMES wx${BASENAME} PATHS "${wxWidgets_ROOT_DIR}/lib" NO_DEFAULT_PATH REQUIRED) + endfunction() + function(z_vcpkg_wxwidgets_find_suffix_library BASENAME) + foreach(lib IN LISTS ARGN) + find_library(WX_${lib}d NAMES wx${BASENAME}32ud_${lib} PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) + find_library(WX_${lib} NAMES wx${BASENAME}32u_${lib} PATHS "${wxWidgets_ROOT_DIR}/lib" NO_DEFAULT_PATH) + endforeach() + endfunction() + z_vcpkg_wxwidgets_find_base_library(base) + z_vcpkg_wxwidgets_find_suffix_library(base net odbc xml) + z_vcpkg_wxwidgets_find_suffix_library(msw core adv aui html media xrc dbgrid gl qa richtext stc ribbon propgrid webview) + if(WX_stc AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + z_vcpkg_wxwidgets_find_base_library(scintilla) + endif() # Force FindwxWidgets.cmake win32 mode for all windows targets built on windows set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") set(CMAKE_CROSSCOMPILING 0) - # Get cache variables for debug libs - set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/debug/lib" CACHE INTERNAL "") - set(WX_LIB_DIR "${wxWidgets_LIB_DIR}" CACHE INTERNAL "") - _find_package(${ARGS}) - # Reset for regular lookup - unset(wxWidgets_CONFIGURATION CACHE) - unset(wxWidgets_USE_REL_AND_DBG CACHE) - set(WX_CONFIGURATION_LIST "") set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") else() # FindwxWidgets.cmake unix mode, single-config @@ -51,7 +59,7 @@ if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling) unset(_vcpkg_wxwidgets_backup_crosscompiling) endif() -if(WIN32 AND CMAKE_HOST_WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") +if(WIN32 AND CMAKE_HOST_WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT "wx::core" IN_LIST wxWidgets_LIBRARIES) find_package(EXPAT QUIET) find_package(JPEG QUIET) find_package(PNG QUIET) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 2075c208508457..54eeafebf54a5a 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wxwidgets", - "version": "3.1.7", + "version": "3.2.0", "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.", @@ -25,6 +25,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index 70d44b9f3a41e0..8b476c587b046c 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -122,7 +122,7 @@ "$package": "wxWidgets", "name": "wxwidgets", "default-features": false, - "platform": "!linux & !mingw & !uwp" + "platform": "!linux & !uwp" }, { "$package": "ZLIB", diff --git a/versions/baseline.json b/versions/baseline.json index b8fdb99d21c875..b8f1d7ab68017f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7673,7 +7673,7 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.1.7", + "baseline": "3.2.0", "port-version": 0 }, "x-plane": { diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 41c90fb00f0fc7..de0d1ba03679b1 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "204fda7008c12569ddf44a935b32bbe5df87cef4", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "2610601e9e585455bc709f29636f79b5ad9382a2", "version": "3.1.7", From dd73b021dcd8b9ddc51c0eb01aeefcb72b837ed8 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 27 Jul 2022 21:39:11 +0200 Subject: [PATCH 231/791] [libspatialite] mingw support (#25881) --- ports/libspatialite/fix-mingw.patch | 11 +++++++++++ ports/libspatialite/portfile.cmake | 1 + ports/libspatialite/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libspatialite.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/libspatialite/fix-mingw.patch b/ports/libspatialite/fix-mingw.patch index 0c90851f15064c..c29b034498223f 100644 --- a/ports/libspatialite/fix-mingw.patch +++ b/ports/libspatialite/fix-mingw.patch @@ -11,3 +11,14 @@ index ee2f1cf..01f2571 100644 #endif #if OMIT_ICONV == 0 /* if ICONV is disabled no SHP support is available */ +diff --color -ur a/configure.ac b/configure.ac +--- a/configure.ac 2022-07-21 17:23:50.490298108 +0200 ++++ b/configure.ac 2022-07-21 17:25:45.671489524 +0200 +@@ -116,7 +116,6 @@ + + # Checks for installed libraries + AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm) +-AC_CHECK_LIB(z,inflateInit_,,AC_MSG_ERROR(['libz' is required but it doesn't seem to be installed on this system.]),-lm) + + AC_CONFIG_FILES([Makefile \ + src/Makefile \ diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 59959dd9ca24a9..e4ff7e9e0f011c 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -178,6 +178,7 @@ else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG + DETERMINE_BUILD_TRIPLET OPTIONS ${TARGET_ALIAS} ${FREEXL_OPTION} diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 46cd4fbd443d7a..27c8a1b49e3d7c 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 6, + "port-version": 7, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index b8f1d7ab68017f..ae6472c983ad82 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4098,7 +4098,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 6 + "port-version": 7 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index c664463066d5ea..2a93500efa87c8 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e92008bb08f680c156f894b77774f76b5ff89f21", + "version": "5.0.1", + "port-version": 7 + }, { "git-tree": "17b2434a466cabf41bd653845871d5b4ec6bfdeb", "version": "5.0.1", From e20e1c79080f076dbdeac37579a6e9e009a8ff31 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 27 Jul 2022 21:39:30 +0200 Subject: [PATCH 232/791] [arrow] Update to 8.0.1, fix usage (#25983) * Use expressive patch name * Fix BROTLI_INCLUDE_DIR import * glog is unused (off by default) * Cleanup portfile, fix 'arrow[core]' * Add CI test port * Update to 8.0.1 [skip actions] * Declare dependency source for substituted packages * Trim obsolete patch chunks * Fix static link libs export * Use substituted targets directly, for proper export * Fix snappy lib export to pc file * Update versions * Add license for test port * Add =pass entries for the new "vcpkg-ci-Xxx" port. Co-authored-by: Billy O'Neal --- ports/arrow/fix-ThirdPartyToolchain.patch | 139 ++++++++++++++---- .../{all.patch => msvc-static-name.patch} | 0 ports/arrow/portfile.cmake | 42 +++--- ports/arrow/static-link-libs.patch | 12 ++ ports/arrow/usage | 3 - ports/arrow/usage-parquet | 3 + ports/arrow/vcpkg.json | 6 +- scripts/ci.baseline.txt | 5 + .../test_ports/vcpkg-ci-arrow/portfile.cmake | 10 ++ scripts/test_ports/vcpkg-ci-arrow/vcpkg.json | 20 +++ versions/a-/arrow.json | 5 + versions/baseline.json | 2 +- 12 files changed, 192 insertions(+), 55 deletions(-) rename ports/arrow/{all.patch => msvc-static-name.patch} (100%) create mode 100644 ports/arrow/static-link-libs.patch create mode 100644 ports/arrow/usage-parquet create mode 100644 scripts/test_ports/vcpkg-ci-arrow/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-arrow/vcpkg.json diff --git a/ports/arrow/fix-ThirdPartyToolchain.patch b/ports/arrow/fix-ThirdPartyToolchain.patch index f39cc9758f9672..2b84dbe17e473c 100644 --- a/ports/arrow/fix-ThirdPartyToolchain.patch +++ b/ports/arrow/fix-ThirdPartyToolchain.patch @@ -1,3 +1,42 @@ +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 7d9c5c7..33afd70 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -705,7 +705,7 @@ endif() + + if(ARROW_WITH_BROTLI) + # Order is important for static linking +- set(ARROW_BROTLI_LIBS Brotli::brotlienc Brotli::brotlidec Brotli::brotlicommon) ++ set(ARROW_BROTLI_LIBS unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon) + list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) + list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) + if(Brotli_SOURCE STREQUAL "SYSTEM") +@@ -721,9 +721,9 @@ if(ARROW_WITH_BZ2) + endif() + + if(ARROW_WITH_LZ4) +- list(APPEND ARROW_STATIC_LINK_LIBS LZ4::lz4) ++ list(APPEND ARROW_STATIC_LINK_LIBS lz4::lz4) + if(Lz4_SOURCE STREQUAL "SYSTEM") +- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS LZ4::lz4) ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS lz4::lz4) + endif() + endif() + +@@ -793,10 +793,10 @@ if(ARROW_WITH_OPENTELEMETRY) + endif() + + if(ARROW_WITH_UTF8PROC) +- list(APPEND ARROW_LINK_LIBS utf8proc::utf8proc) +- list(APPEND ARROW_STATIC_LINK_LIBS utf8proc::utf8proc) ++ list(APPEND ARROW_LINK_LIBS utf8proc) ++ list(APPEND ARROW_STATIC_LINK_LIBS utf8proc) + if(utf8proc_SOURCE STREQUAL "SYSTEM") +- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc::utf8proc) ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc) + endif() + endif() + diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index f070323..290b5a7 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -48,33 +87,45 @@ index f070323..290b5a7 100644 else() set(PACKAGE_NAME ${DEPENDENCY_NAME}) endif() -@@ -1129,10 +1132,16 @@ macro(build_brotli) +@@ -1061,7 +1064,21 @@ endmacro() + if(ARROW_WITH_SNAPPY) + resolve_dependency(Snappy PC_PACKAGE_NAMES snappy) + if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND) ++ get_target_property(SNAPPY_IMPLIB_DEBUG Snappy::snappy IMPORTED_IMPLIB_DEBUG) ++ get_target_property(SNAPPY_LIB_DEBUG Snappy::snappy IMPORTED_LOCATION_DEBUG) ++ get_target_property(SNAPPY_IMPLIB_RELEASE Snappy::snappy IMPORTED_IMPLIB_RELEASE) ++ get_target_property(SNAPPY_LIB_RELEASE Snappy::snappy IMPORTED_LOCATION_RELEASE) ++ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND SNAPPY_IMPLIB_DEBUG) ++ set(SNAPPY_LIB "${SNAPPY_IMPLIB_DEBUG}") ++ elseif(CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND SNAPPY_LIB_DEBUG) ++ set(SNAPPY_LIB "${SNAPPY_LIB_DEBUG}") ++ elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND SNAPPY_IMPLIB_RELEASE) ++ set(SNAPPY_LIB "${SNAPPY_IMPLIB_RELEASE}") ++ elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND SNAPPY_LIB_RELEASE) ++ set(SNAPPY_LIB "${SNAPPY_LIB_RELEASE}") ++ else() + get_target_property(SNAPPY_LIB Snappy::snappy IMPORTED_LOCATION) ++ endif() + string(APPEND ARROW_PC_LIBS_PRIVATE " ${SNAPPY_LIB}") + endif() + # TODO: Don't use global includes but rather target_include_directories +@@ -1129,10 +1132,14 @@ macro(build_brotli) endmacro() if(ARROW_WITH_BROTLI) - resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) ++ set(Brotli_SOURCE SYSTEM) + resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) -+ add_library(Brotli::brotlicommon ALIAS unofficial::brotli::brotlicommon) -+ add_library(Brotli::brotlienc ALIAS unofficial::brotli::brotlienc) -+ add_library(Brotli::brotlidec ALIAS unofficial::brotli::brotlidec) -+ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static INTERFACE_INCLUDE_DIRECTORIES) # TODO: Don't use global includes but rather target_include_directories -+ if(NOT BROTLI_INCLUDE_DIR) - get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon +- get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon ++ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon INTERFACE_INCLUDE_DIRECTORIES) ++ if(NOT BROTLI_INCLUDE_DIR) ++ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static INTERFACE_INCLUDE_DIRECTORIES) + endif() include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) endif() -@@ -1249,7 +1261,7 @@ macro(build_glog) - endmacro() - - if(ARROW_USE_GLOG) -- resolve_dependency(GLOG PC_PACKAGE_NAMES libglog) -+ resolve_dependency(glog USE_CONFIG TRUE PC_PACKAGE_NAMES libglog) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) @@ -1434,6 +1446,13 @@ if(ARROW_WITH_THRIFT) # TODO: Don't use global includes but rather target_include_directories include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) @@ -98,40 +149,51 @@ index f070323..290b5a7 100644 if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) add_definitions(-DPROTOBUF_USE_DLLS) -@@ -2121,8 +2142,6 @@ endmacro() - if(ARROW_WITH_RAPIDJSON) - set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") - resolve_dependency(RapidJSON -- HAVE_ALT -- TRUE - REQUIRED_VERSION - ${ARROW_RAPIDJSON_REQUIRED_VERSION} - IS_RUNTIME_DEPENDENCY -@@ -2260,7 +2279,8 @@ macro(build_lz4) +@@ -2260,10 +2276,11 @@ macro(build_lz4) endmacro() if(ARROW_WITH_LZ4) - resolve_dependency(Lz4 PC_PACKAGE_NAMES liblz4) ++ set(Lz4_SOURCE SYSTEM) + resolve_dependency(lz4 USE_CONFIG TRUE PC_PACKAGE_NAMES liblz4) -+ add_library(LZ4::lz4 ALIAS lz4::lz4) # TODO: Don't use global includes but rather target_include_directories - get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) -@@ -2517,11 +2537,10 @@ macro(build_utf8proc) +- get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(LZ4_INCLUDE_DIR lz4::lz4 INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) + endif() + +@@ -2517,9 +2534,8 @@ macro(build_utf8proc) endmacro() if(ARROW_WITH_UTF8PROC) - resolve_dependency(utf8proc - REQUIRED_VERSION - "2.2.0" ++ set(utf8proc_SOURCE SYSTEM) + resolve_dependency(unofficial-utf8proc PC_PACKAGE_NAMES libutf8proc) -+ add_library(utf8proc::utf8proc ALIAS utf8proc) - add_definitions(-DARROW_WITH_UTF8PROC) +@@ -2527,7 +2543,7 @@ if(ARROW_WITH_UTF8PROC) + + # TODO: Don't use global definitions but rather + # target_compile_definitions or target_link_libraries +- get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc::utf8proc ++ get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc + INTERFACE_COMPILER_DEFINITIONS) + if(UTF8PROC_COMPILER_DEFINITIONS) + add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) +@@ -2535,7 +2551,7 @@ if(ARROW_WITH_UTF8PROC) -@@ -3719,6 +3738,9 @@ if(ARROW_WITH_GRPC) + # TODO: Don't use global includes but rather + # target_include_directories or target_link_libraries +- get_target_property(UTF8PROC_INCLUDE_DIR utf8proc::utf8proc ++ get_target_property(UTF8PROC_INCLUDE_DIR utf8proc + INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) + endif() +@@ -3719,6 +3735,9 @@ 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}) @@ -141,3 +203,16 @@ index f070323..290b5a7 100644 if(GRPC_VENDORED) set(GRPCPP_PP_INCLUDE TRUE) +diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt +index b1b6847..444a45e 100644 +--- a/cpp/src/arrow/adapters/orc/CMakeLists.txt ++++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt +@@ -30,7 +30,7 @@ set(ORC_MIN_TEST_LIBS + GTest::gtest_main + GTest::gtest + Snappy::snappy +- LZ4::lz4 ++ lz4::lz4 + ZLIB::ZLIB) + + if(ARROW_BUILD_STATIC) diff --git a/ports/arrow/all.patch b/ports/arrow/msvc-static-name.patch similarity index 100% rename from ports/arrow/all.patch rename to ports/arrow/msvc-static-name.patch diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 4f5e759d9baacc..4ba5cc9a7a9bf3 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -1,13 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-8.0.0 - SHA512 08b6ab4a3c5e0dd9c46402da8e7b9ef9f918eea177413cb31695192dfdb5a472ebbfef255b8343fe775d81e8b5eb268c3428a699fac48b36bf808f5b81e83a64 + REF apache-arrow-8.0.1 + SHA512 b32f5a3666de7d6d16ea828697bb42e1b6605f58719c42e670c9ec0a8782057dac933f6e14e97b46f82802fc38cc7f4cc825794a4a95ac641593c2ee26ac5bbe HEAD_REF master PATCHES vs-2022-fixes.patch - all.patch + msvc-static-name.patch fix-ThirdPartyToolchain.patch + static-link-libs.patch # https://github.com/apache/arrow/pull/13707 ) file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake" "${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake" @@ -87,32 +88,39 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib") message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.") endif() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/arrow) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake") - -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -file(GLOB PARQUET_FILES ${CURRENT_PACKAGES_DIR}/share/${PORT}/Parquet*) -file(COPY ${PARQUET_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/parquet") -file(REMOVE_RECURSE ${PARQUET_FILES}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake ${CURRENT_PACKAGES_DIR}/share/parquet/FindParquet.cmake) +if("parquet" IN_LIST FEATURES) + file(GLOB PARQUET_FILES "${CURRENT_PACKAGES_DIR}/share/${PORT}/Parquet*") + file(COPY ${PARQUET_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/parquet") + file(REMOVE_RECURSE ${PARQUET_FILES}) + file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake" "${CURRENT_PACKAGES_DIR}/share/parquet/FindParquet.cmake") + file(READ "${CMAKE_CURRENT_LIST_DIR}/usage-parquet" usage-parquet) + file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "${usage-parquet}") +else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindParquet.cmake") +endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if("example" IN_LIST FEATURES) + file(INSTALL "${SOURCE_PATH}/cpp/examples/minimal_build/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/example") +endif() if ("plasma" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES plasma-store-server AUTO_CLEAN) endif () -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}" @ONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt" "${SOURCE_PATH}/NOTICE.txt") diff --git a/ports/arrow/static-link-libs.patch b/ports/arrow/static-link-libs.patch new file mode 100644 index 00000000000000..1dd7fe7b77dbdf --- /dev/null +++ b/ports/arrow/static-link-libs.patch @@ -0,0 +1,12 @@ +diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt +index 690c51a..2f7d26b 100644 +--- a/cpp/src/arrow/CMakeLists.txt ++++ b/cpp/src/arrow/CMakeLists.txt +@@ -570,6 +570,7 @@ add_arrow_lib(arrow + ${ARROW_SHARED_PRIVATE_LINK_LIBS} + STATIC_LINK_LIBS + ${ARROW_STATIC_LINK_LIBS} ++ STATIC_INSTALL_INTERFACE_LIBS + ${ARROW_STATIC_INSTALL_INTERFACE_LIBS} + SHARED_INSTALL_INTERFACE_LIBS + ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}) diff --git a/ports/arrow/usage b/ports/arrow/usage index 0dcfa79cbcded0..cd89c9308468a7 100644 --- a/ports/arrow/usage +++ b/ports/arrow/usage @@ -2,6 +2,3 @@ The package arrow provides CMake targets: find_package(Arrow CONFIG REQUIRED) target_link_libraries(main PRIVATE ${ARROW_LIBRARIES}) - - find_package(Parquet CONFIG REQUIRED) - target_link_libraries(main PRIVATE ${PARQUET_LIBRARIES}) \ No newline at end of file diff --git a/ports/arrow/usage-parquet b/ports/arrow/usage-parquet new file mode 100644 index 00000000000000..62d7a14b7fd407 --- /dev/null +++ b/ports/arrow/usage-parquet @@ -0,0 +1,3 @@ + + find_package(Parquet CONFIG REQUIRED) + target_link_libraries(main PRIVATE ${PARQUET_LIBRARIES}) diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index f435e7112f5736..803cd858e3e545 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "arrow", - "version": "8.0.0", + "version": "8.0.1", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -12,7 +12,6 @@ "brotli", "bzip2", "gflags", - "glog", "lz4", "openssl", "re2", @@ -49,6 +48,9 @@ "dataset": { "description": "Dataset support" }, + "example": { + "description": "Install the minimal example (source code)" + }, "filesystem": { "description": "Filesystem support" }, diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3293809c48d9b4..48de87857dcf2b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1253,6 +1253,11 @@ cmake-user:x64-windows-static-md=pass cmake-user:x64-windows-static=pass cmake-user:x64-windows=pass cmake-user:x86-windows=pass +vcpkg-ci-arrow:x64-windows=pass +vcpkg-ci-arrow:x64-windows-static=pass +vcpkg-ci-arrow:x64-windows-static-md=pass +vcpkg-ci-arrow:x64-osx=pass +vcpkg-ci-arrow:x64-linux=pass vcpkg-ci-boost:x64-linux=pass vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass diff --git a/scripts/test_ports/vcpkg-ci-arrow/portfile.cmake b/scripts/test_ports/vcpkg-ci-arrow/portfile.cmake new file mode 100644 index 00000000000000..46a179430135d3 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-arrow/portfile.cmake @@ -0,0 +1,10 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ARROW_LINK_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${CURRENT_INSTALLED_DIR}/share/arrow/example" + OPTIONS + -DARROW_LINK_SHARED=${ARROW_LINK_SHARED} +) +vcpkg_cmake_build() diff --git a/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json b/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json new file mode 100644 index 00000000000000..b5e4ed3458ddb4 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-arrow/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "vcpkg-ci-arrow", + "version-date": "2022-07-25", + "description": "Builds an example app in order to validate the arrow port.", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "arrow", + "default-features": false, + "features": [ + "csv", + "example" + ] + } + ] +} diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index febcc4fd3388fb..b5cc28fad790cd 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6935bb6b1a309931f2f85bd8da334b9777d51a4a", + "version": "8.0.1", + "port-version": 0 + }, { "git-tree": "4334074d163357f9002145ca722dc8dbcc546dbc", "version": "8.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index ae6472c983ad82..7a4ae4ad1ac26b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,7 +177,7 @@ "port-version": 0 }, "arrow": { - "baseline": "8.0.0", + "baseline": "8.0.1", "port-version": 0 }, "ashes": { From fb5d36bcad52d34ea308c41fb2bef3b2ab917a25 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 28 Jul 2022 21:21:06 +0200 Subject: [PATCH 233/791] [winsock2,usocket] Fix mingw build (#25079) * winsocks2 is empty package on mingw * Fix usocket build on mingw * Update versions * Add license fields * Update versions * Update versions --- ports/usockets/CMakeLists.txt | 2 +- ports/usockets/vcpkg.json | 2 +- ports/winsock2/portfile.cmake | 5 +++++ ports/winsock2/vcpkg.json | 3 ++- versions/baseline.json | 4 ++-- versions/u-/usockets.json | 5 +++++ versions/w-/winsock2.json | 5 +++++ 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index 990176f30906d3..b2daed66d7e370 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -41,7 +41,7 @@ endif() if (CMAKE_USE_NETWORK) list(APPEND USOCKETS_EXT_INCLUDE_DIR src/internal/networking) - list(APPEND USOCKETS_EXT_LIBS Ws2_32) + list(APPEND USOCKETS_EXT_LIBS ws2_32) endif() add_library(uSockets ${SOURCES}) diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json index ab920957b08b5b..f65c263ac4ff3b 100644 --- a/ports/usockets/vcpkg.json +++ b/ports/usockets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "usockets", "version": "0.8.1", - "port-version": 1, + "port-version": 2, "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", "license": "Apache-2.0", diff --git a/ports/winsock2/portfile.cmake b/ports/winsock2/portfile.cmake index b684c2f4327697..2bd5c72ba6ff61 100644 --- a/ports/winsock2/portfile.cmake +++ b/ports/winsock2/portfile.cmake @@ -1,3 +1,8 @@ +if(VCPKG_TARGET_IS_MINGW) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() +endif() + vcpkg_get_windows_sdk(WINDOWS_SDK) if (WINDOWS_SDK MATCHES "10.") diff --git a/ports/winsock2/vcpkg.json b/ports/winsock2/vcpkg.json index 02e569826770ac..d6919d4b073e66 100644 --- a/ports/winsock2/vcpkg.json +++ b/ports/winsock2/vcpkg.json @@ -1,7 +1,8 @@ { "name": "winsock2", "version": "0.0", - "port-version": 4, + "port-version": 5, "description": "Windows Sockets.", + "license": null, "supports": "windows" } diff --git a/versions/baseline.json b/versions/baseline.json index 7a4ae4ad1ac26b..7c413a441c9dcc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7350,7 +7350,7 @@ }, "usockets": { "baseline": "0.8.1", - "port-version": 1 + "port-version": 2 }, "usrsctp": { "baseline": "0.9.5.0", @@ -7614,7 +7614,7 @@ }, "winsock2": { "baseline": "0.0", - "port-version": 4 + "port-version": 5 }, "winsparkle": { "baseline": "0.7.0", diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json index b50ca1ffd7c72d..4482b7ef13a146 100644 --- a/versions/u-/usockets.json +++ b/versions/u-/usockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5f1af355335cdcd1c055cdbcdd574b146116942", + "version": "0.8.1", + "port-version": 2 + }, { "git-tree": "bf42304e17879df7e100c97d4487adaeaadfd87e", "version": "0.8.1", diff --git a/versions/w-/winsock2.json b/versions/w-/winsock2.json index 8c41d101f24ac9..2bfb20b28c3bdc 100644 --- a/versions/w-/winsock2.json +++ b/versions/w-/winsock2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9afad2b0a036847b45f884809b16d804eae56cf", + "version": "0.0", + "port-version": 5 + }, { "git-tree": "f6fb217f4eea375e9691dbde28c72c01dddd0c9f", "version": "0.0", From 6691c1a0427c9d21ac85dc560dc82514be221620 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 28 Jul 2022 23:54:27 +0200 Subject: [PATCH 234/791] [apr] unglue version string (#26005) * apr unglue version string * v db --- ports/apr/portfile.cmake | 3 ++- ports/apr/unglue.patch | 17 +++++++++++++++++ ports/apr/vcpkg.json | 2 +- versions/a-/apr.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 ports/apr/unglue.patch diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index b6970da1011a38..9416ecf215e1c5 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -11,7 +11,8 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - fix-configcmake.patch + fix-configcmake.patch + unglue.patch ) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/apr/unglue.patch b/ports/apr/unglue.patch new file mode 100644 index 00000000000000..0ce518b8a7c209 --- /dev/null +++ b/ports/apr/unglue.patch @@ -0,0 +1,17 @@ +diff --git a/include/apr_version.h b/include/apr_version.h +index e96de3835..de3437d71 100644 +--- a/include/apr_version.h ++++ b/include/apr_version.h +@@ -114,9 +114,9 @@ + + /** An alternative formatted string of APR's version */ + /* macro for Win32 .rc files using numeric csv representation */ +-#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION ##, \ +- ##APR_MINOR_VERSION ##, \ +- ##APR_PATCH_VERSION ++#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION , \ ++ APR_MINOR_VERSION , \ ++ APR_PATCH_VERSION + + + #ifndef APR_VERSION_ONLY diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index e5d1ab75d6ae2b..fca57ea3287aa4 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "apr", "version": "1.7.0", - "port-version": 10, + "port-version": 11, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 82e10c5cc0b3b3..22d2fcf8f0e141 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f23cf24a3496f9fb519512245a3e0f1a66c8ed9", + "version": "1.7.0", + "port-version": 11 + }, { "git-tree": "7b9002157134602da80c38b7eda863fd9e0012da", "version": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7c413a441c9dcc..503036d5b0864f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -118,7 +118,7 @@ }, "apr": { "baseline": "1.7.0", - "port-version": 10 + "port-version": 11 }, "apr-util": { "baseline": "1.6.1", From cf2e61b0f7b735d5fbfc29b98a8774d9fb76c1a1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:16:30 +0200 Subject: [PATCH 235/791] [libwebp] update to 1.2.3 (#25959) * libwebp update to 1.2.3 * v db * fix missing libwebp target * v db * add find_dependency(Threads) * v db * include the macro * v db * Add license * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libwebp/0001-build.patch | 36 ----------- ports/libwebp/0002-cmake-config.patch | 4 +- .../0006-fix-dependecies-platform.patch | 17 ----- ports/libwebp/0010-fix_build.patch | 62 +++++++++++++++++++ ports/libwebp/portfile.cmake | 17 +++-- ports/libwebp/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/l-/libwebp.json | 5 ++ 8 files changed, 86 insertions(+), 60 deletions(-) delete mode 100644 ports/libwebp/0001-build.patch delete mode 100644 ports/libwebp/0006-fix-dependecies-platform.patch create mode 100644 ports/libwebp/0010-fix_build.patch diff --git a/ports/libwebp/0001-build.patch b/ports/libwebp/0001-build.patch deleted file mode 100644 index 8a7cd7f37d7c5c..00000000000000 --- a/ports/libwebp/0001-build.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd1bebb..4ce801d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,6 +214,9 @@ endfunction() - if(MSVC) - # avoid security warnings for e.g., fopen() used in the examples. - add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+ if(BUILD_SHARED_LIBS) -+ add_definitions("-DWEBP_EXTERN=__declspec(dllexport)" "-DWEBP_DLL") -+ endif() - else() - add_definitions(-Wall) - endif() -@@ -586,8 +589,12 @@ if(WEBP_BUILD_EXTRAS) - # webp_quality - add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS}) - target_link_libraries(webp_quality exampleutil imagedec) -+ if(BUILD_SHARED_LIBS) -+ target_link_libraries(webp_quality webpdspdecode) -+ endif() - target_include_directories(webp_quality - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -+ ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_BINARY_DIR}) - - # vwebp_sdl -@@ -620,7 +627,7 @@ if(WEBP_BUILD_WEBP_JS) - -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ - -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") - set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) -- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) -+ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) - endif() - - # WASM version diff --git a/ports/libwebp/0002-cmake-config.patch b/ports/libwebp/0002-cmake-config.patch index ae36fb6815eceb..cc9a27fc8b1433 100644 --- a/ports/libwebp/0002-cmake-config.patch +++ b/ports/libwebp/0002-cmake-config.patch @@ -2,8 +2,10 @@ diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in index 822fc59..fb31829 100644 --- a/cmake/WebPConfig.cmake.in +++ b/cmake/WebPConfig.cmake.in -@@ -5,7 +5,17 @@ set(WEBP_VERSION ${WebP_VERSION}) +@@ -5,7 +5,19 @@ set(WEBP_VERSION ${WebP_VERSION}) ++include(CMakeFindDependencyMacro) ++find_dependency(Threads) include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") diff --git a/ports/libwebp/0006-fix-dependecies-platform.patch b/ports/libwebp/0006-fix-dependecies-platform.patch deleted file mode 100644 index a5849a7ac5011e..00000000000000 --- a/ports/libwebp/0006-fix-dependecies-platform.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 83edb3a..f634094 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -540,7 +540,11 @@ if(WEBP_BUILD_EXTRAS) - find_package(SDL) - if(SDL_FOUND) - add_executable(vwebp_sdl ${VWEBP_SDL_SRCS}) -- target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) -+ target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) -+ if (MSVC) -+ target_link_libraries(vwebp_sdl dxguid winmm) -+ endif() -+ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) - target_include_directories(vwebp_sdl - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} diff --git a/ports/libwebp/0010-fix_build.patch b/ports/libwebp/0010-fix_build.patch new file mode 100644 index 00000000000000..1d3d45094a819c --- /dev/null +++ b/ports/libwebp/0010-fix_build.patch @@ -0,0 +1,62 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 43742c7f7..44b035ebb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -248,6 +248,9 @@ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h") + if(MSVC) + # avoid security warnings for e.g., fopen() used in the examples. + add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ if(BUILD_SHARED_LIBS) ++ add_definitions("-DWEBP_DLL") ++ endif() + else() + add_definitions(-Wall) + endif() +@@ -635,8 +638,12 @@ if(WEBP_BUILD_EXTRAS) + # webp_quality + add_executable(webp_quality ${WEBP_QUALITY_SRCS}) + target_link_libraries(webp_quality exampleutil imagedec extras) ++ if(BUILD_SHARED_LIBS) ++ target_link_libraries(webp_quality webpdspdecode) ++ endif() + target_include_directories(webp_quality + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ++ ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR}) + + # vwebp_sdl +@@ -651,6 +658,10 @@ if(WEBP_BUILD_EXTRAS) + ${SDL_INCLUDE_DIR}) + set(WEBP_HAVE_SDL 1) + target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL) ++ if (MSVC) ++ target_link_libraries(vwebp_sdl dxguid winmm) ++ endif() ++ target_compile_definitions(vwebp_sdl PRIVATE WEBP_HAVE_JUST_SDL_H) + endif() + endif() + +@@ -669,7 +680,7 @@ if(WEBP_BUILD_WEBP_JS) + -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ + -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") + set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) +- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + endif() + + # WASM version +diff --git a/src/webp/types.h b/src/webp/types.h +index 47f7f2b00..a7a706590 100644 +--- a/src/webp/types.h ++++ b/src/webp/types.h +@@ -39,7 +39,9 @@ typedef long long int int64_t; + #ifndef WEBP_EXTERN + // This explicitly marks library functions and allows for changing the + // signature for e.g., Windows DLL builds. +-# if defined(__GNUC__) && __GNUC__ >= 4 ++# if defined(_MSC_VER) && defined(WEBP_DLL) ++# define WEBP_EXTERN extern __declspec(dllexport) ++# elif defined(__GNUC__) && __GNUC__ >= 4 + # define WEBP_EXTERN extern __attribute__ ((visibility ("default"))) + # else + # define WEBP_EXTERN extern diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index ae0881b1fedf42..20159d4fc0f93f 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,17 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libwebp - REF v1.2.2 - SHA512 04a036b705316ea04add50c9ec2d6d7a8316c710556b97413015d7b8548fe31a8f7f5bf0632e76262ada504dcc35ead20189ee7fcb3cebbe568eb15736ad9a94 + REF v1.2.3 + SHA512 27f86817350e6d0e215c449665046df8c63203344f9a2846770af292ce8fee486a72adfd5e1122aa67e7d2f3e3972cd8423da95fee7edf10c9848bcbda46264c HEAD_REF master PATCHES - 0001-build.patch 0002-cmake-config.patch 0003-fix-tool-dependencies.patch - 0006-fix-dependecies-platform.patch 0007-fix-arm-build.patch 0008-sdl.patch 0009-glut.patch + 0010-fix_build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -80,3 +79,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# For compatibility +file(READ "${CURRENT_PACKAGES_DIR}/share/WebP/WebPTargets.cmake" contents) +string(APPEND contents " +if(NOT TARGET WebP::libwebpmux) + add_library(WebP::libwebpmux INTERFACE IMPORTED) + set_target_properties(WebP::libwebpmux PROPERTIES INTERFACE_LINK_LIBRARIES WebP::webpmux) +endif() +") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/WebP/WebPTargets.cmake" "${contents}") \ No newline at end of file diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 0b7b25c9e00517..6f0bcf2f0a47d4 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,8 +1,9 @@ { "name": "libwebp", - "version": "1.2.2", + "version": "1.2.3", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", + "license": "BSD-3-Clause", "dependencies": [ { "name": "libwebp", diff --git a/versions/baseline.json b/versions/baseline.json index 503036d5b0864f..9c2911f7064234 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4245,7 +4245,7 @@ "port-version": 1 }, "libwebp": { - "baseline": "1.2.2", + "baseline": "1.2.3", "port-version": 0 }, "libwebsockets": { diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index c41c58cbf92627..9003761b96c447 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2b9421b3093512c54494cf01a3fd6edb7424e02", + "version": "1.2.3", + "port-version": 0 + }, { "git-tree": "bf8ec989a234ddde96494e4e07d0ffd93df82151", "version": "1.2.2", From 768932ab5b79921ec829b297ae264eedde11ae19 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:19:48 +0200 Subject: [PATCH 236/791] [libflac] Disable man pages (#26016) * [libflac] Remove documentation * version * [libflac] Disable man pages * version * man already removed * version --- ports/libflac/portfile.cmake | 14 +++++++------- ports/libflac/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/l-/libflac.json | 5 +++++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ports/libflac/portfile.cmake b/ports/libflac/portfile.cmake index 9af82a6d36dc76..39e605592226f7 100644 --- a/ports/libflac/portfile.cmake +++ b/ports/libflac/portfile.cmake @@ -19,12 +19,8 @@ else() endif() if("asm" IN_LIST FEATURES) - if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - message(FATAL_ERROR "Feature asm only supports x86 architecture.") - endif() - VCPKG_FIND_ACQUIRE_PROGRAM(NASM) - GET_FILENAME_COMPONENT(NASM_PATH ${NASM} DIRECTORY) + GET_FILENAME_COMPONENT(NASM_PATH "${NASM}" DIRECTORY) vcpkg_add_to_path("${NASM_PATH}") endif() @@ -35,12 +31,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} -DBUILD_PROGRAMS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DBUILD_TESTING=OFF - -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR}) + -DWITH_STACK_PROTECTOR=${WITH_STACK_PROTECTOR} + -DINSTALL_MANPAGES=OFF +) vcpkg_cmake_install() @@ -50,6 +49,7 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/LICENSE") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FLAC/export.h" diff --git a/ports/libflac/vcpkg.json b/ports/libflac/vcpkg.json index 7ca4b9dcc4b51e..ee275816a302f7 100644 --- a/ports/libflac/vcpkg.json +++ b/ports/libflac/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libflac", "version": "1.3.4", + "port-version": 1, "description": "Library for manipulating FLAC files", "homepage": "https://xiph.org/flac/", "license": "GFDL-1.2-or-later", @@ -17,7 +18,8 @@ ], "features": { "asm": { - "description": "Use any assembly optimization routines" + "description": "Use any assembly optimization routines", + "supports": "x86" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 9c2911f7064234..8ee198b3890e64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3622,7 +3622,7 @@ }, "libflac": { "baseline": "1.3.4", - "port-version": 0 + "port-version": 1 }, "libfort": { "baseline": "0.4.2", diff --git a/versions/l-/libflac.json b/versions/l-/libflac.json index 46b06a0c63ae20..23d75d34353386 100644 --- a/versions/l-/libflac.json +++ b/versions/l-/libflac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6931704180602d16a54e15759cd6c04739d40699", + "version": "1.3.4", + "port-version": 1 + }, { "git-tree": "a3dff2074f8f7a8ac9d8e9c5e78d8cae8538f3ef", "version": "1.3.4", From d3f74469ee263a128e27a49af5e4b3a4396c0163 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:21:33 +0200 Subject: [PATCH 237/791] [libxslt] fix export statements for clang-cl (#26003) * fix libxslt export statement to include extern for clang-cl * v db --- ports/libxslt/extern_export.patch | 30 ++++++++++++++++++++++++++++++ ports/libxslt/portfile.cmake | 1 + ports/libxslt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 +++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 ports/libxslt/extern_export.patch diff --git a/ports/libxslt/extern_export.patch b/ports/libxslt/extern_export.patch new file mode 100644 index 00000000000000..df82ab5dc761cb --- /dev/null +++ b/ports/libxslt/extern_export.patch @@ -0,0 +1,30 @@ +diff --git a/libexslt/exsltexports.h b/libexslt/exsltexports.h +index 381567e0a..5088e0ec4 100644 +--- a/libexslt/exsltexports.h ++++ b/libexslt/exsltexports.h +@@ -48,8 +48,8 @@ + #undef EXSLTPUBVAR + #undef EXSLTCALL + #if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC) +- #define EXSLTPUBFUN __declspec(dllexport) +- #define EXSLTPUBVAR __declspec(dllexport) ++ #define EXSLTPUBFUN extern __declspec(dllexport) ++ #define EXSLTPUBVAR extern __declspec(dllexport) + #else + #define EXSLTPUBFUN + #if !defined(LIBEXSLT_STATIC) +diff --git a/libxslt/xsltexports.h b/libxslt/xsltexports.h +index 99b6ac387..bbc556fb6 100644 +--- a/libxslt/xsltexports.h ++++ b/libxslt/xsltexports.h +@@ -50,8 +50,8 @@ + #undef XSLTPUBVAR + #undef XSLTCALL + #if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC) +- #define XSLTPUBFUN __declspec(dllexport) +- #define XSLTPUBVAR __declspec(dllexport) ++ #define XSLTPUBFUN extern __declspec(dllexport) ++ #define XSLTPUBVAR extern __declspec(dllexport) + #else + #define XSLTPUBFUN + #if !defined(LIBXSLT_STATIC) diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 1320051ab9e510..cf38cf6a74b689 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( libexslt-pkgconfig.patch fix-gcrypt-deps.patch skip-install-docs.patch + extern_export.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 8d63754719027a..d67f9d8565cd25 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxslt", "version": "1.1.35", - "port-version": 1, + "port-version": 2, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 8ee198b3890e64..14223112e879a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4278,7 +4278,7 @@ }, "libxslt": { "baseline": "1.1.35", - "port-version": 1 + "port-version": 2 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 86b53c81b5df10..42335a998d8f3e 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb07abefc8894accd9967f41c8db983dcc031189", + "version": "1.1.35", + "port-version": 2 + }, { "git-tree": "3febc2931430356214f9a15ec06f7863ad4825d9", "version": "1.1.35", From f7b4df27ad9c05f71292bcb3a5a72b50fcc2df42 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:42:12 +0200 Subject: [PATCH 238/791] [lcms] fix register usage for cpp >= 17 (#26008) * lcms fix register usage in cpp code * v db --- ports/lcms/cpp17.patch | 13 +++++++++++++ ports/lcms/portfile.cmake | 1 + ports/lcms/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lcms.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/lcms/cpp17.patch diff --git a/ports/lcms/cpp17.patch b/ports/lcms/cpp17.patch new file mode 100644 index 00000000000000..77da5bef17a49d --- /dev/null +++ b/ports/lcms/cpp17.patch @@ -0,0 +1,13 @@ +diff --git a/include/lcms2.h b/include/lcms2.h +index 7e061ce7c..5d234c4e4 100644 +--- a/include/lcms2.h ++++ b/include/lcms2.h +@@ -152,7 +152,7 @@ typedef double cmsFloat64Number; + #endif + + // Handle "register" keyword +-#if defined(CMS_NO_REGISTER_KEYWORD) && !defined(CMS_DLL) && !defined(CMS_DLL_BUILD) ++#if __cplusplus >= 201703L || defined(CMS_NO_REGISTER_KEYWORD) && !defined(CMS_DLL) && !defined(CMS_DLL_BUILD) + # define CMSREGISTER + #else + # define CMSREGISTER register diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 78b8409ce0d8f0..1facfa22df933d 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES remove_library_directive.patch ${ADDITIONAL_PATCH} + cpp17.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/lcms/vcpkg.json b/ports/lcms/vcpkg.json index 8a78ac8bbf2d5d..718a2b5c2b7132 100644 --- a/ports/lcms/vcpkg.json +++ b/ports/lcms/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lcms", "version": "2.12", - "port-version": 3, + "port-version": 4, "description": "Little CMS.", "homepage": "https://github.com/mm2/Little-CMS", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 14223112e879a3..df4ec19326c010 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3414,7 +3414,7 @@ }, "lcms": { "baseline": "2.12", - "port-version": 3 + "port-version": 4 }, "leaf": { "baseline": "0.2.2", diff --git a/versions/l-/lcms.json b/versions/l-/lcms.json index 5253e422477eb0..65c76959c12685 100644 --- a/versions/l-/lcms.json +++ b/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "220d2255b3f13ec7b0266393d65c674f5c060c2b", + "version": "2.12", + "port-version": 4 + }, { "git-tree": "5e1b890660ea5d2a869407a0714d4385e949b4d6", "version": "2.12", From 9430b3c760a7ee8610cdee28f26cb0e9f424f80d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:45:36 +0200 Subject: [PATCH 239/791] [freeimage] remove usage of auto_ptr (#26007) * freeimage remove auto_ptr * v db --- ports/freeimage/portfile.cmake | 1 + ports/freeimage/remove_auto_ptr.patch | 35 +++++++++++++++++++++++++++ ports/freeimage/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/freeimage.json | 5 ++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 ports/freeimage/remove_auto_ptr.patch diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index ce1b86821cc544..cb1fa0e2b75900 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_from_sourceforge( fix-function-overload.patch use-typedef-as-already-declared.patch use-functions-to-override-libtiff-warning-error-handlers.patch + remove_auto_ptr.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/freeimage/remove_auto_ptr.patch b/ports/freeimage/remove_auto_ptr.patch new file mode 100644 index 00000000000000..65315e2a7b1537 --- /dev/null +++ b/ports/freeimage/remove_auto_ptr.patch @@ -0,0 +1,35 @@ +diff --git a/Source/FreeImage/MultiPage.cpp b/Source/FreeImage/MultiPage.cpp +index 4f2605188..8af384aff 100644 +--- a/Source/FreeImage/MultiPage.cpp ++++ b/Source/FreeImage/MultiPage.cpp +@@ -31,6 +31,8 @@ + #pragma warning (disable : 4786) // identifier was truncated to 'number' characters + #endif + ++#include ++ + #include "CacheFile.h" + #include "FreeImageIO.h" + #include "Plugin.h" +@@ -271,8 +273,8 @@ FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL crea + } + } + +- std::auto_ptr bitmap (new FIMULTIBITMAP); +- std::auto_ptr header (new MULTIBITMAPHEADER); ++ std::unique_ptr bitmap (new FIMULTIBITMAP); ++ std::unique_ptr header (new MULTIBITMAPHEADER); + header->m_filename = filename; + // io is default + header->node = node; +@@ -337,8 +339,8 @@ FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_h + PluginNode *node = list->FindNodeFromFIF(fif); + + if (node) { +- std::auto_ptr bitmap (new FIMULTIBITMAP); +- std::auto_ptr header (new MULTIBITMAPHEADER); ++ std::unique_ptr bitmap (new FIMULTIBITMAP); ++ std::unique_ptr header (new MULTIBITMAPHEADER); + header->io = *io; + header->node = node; + header->fif = fif; diff --git a/ports/freeimage/vcpkg.json b/ports/freeimage/vcpkg.json index 08fbf28d2c083f..a01645f282eed8 100644 --- a/ports/freeimage/vcpkg.json +++ b/ports/freeimage/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeimage", "version": "3.18.0", - "port-version": 22, + "port-version": 23, "description": "Support library for graphics image formats", "homepage": "https://sourceforge.net/projects/freeimage/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index df4ec19326c010..6fa891f55fc85d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2374,7 +2374,7 @@ }, "freeimage": { "baseline": "3.18.0", - "port-version": 22 + "port-version": 23 }, "freeopcua": { "baseline": "20190125", diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json index 8c6c1586b18fc4..b4b5583d515087 100644 --- a/versions/f-/freeimage.json +++ b/versions/f-/freeimage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "748b7f37d074522ba08e6c4d6e6cf3afb3107da6", + "version": "3.18.0", + "port-version": 23 + }, { "git-tree": "9bad6f331c05331144e8bad4a2ef63d4c594cd5a", "version": "3.18.0", From 162a88fa440a3c785fd1c58bf7820424353cef68 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 29 Jul 2022 00:49:19 +0200 Subject: [PATCH 240/791] [libraw] Remove register in cpp (#26009) * libraw remove register cpp * v db * move patch to the correct location * v db --- ports/libraw/portfile.cmake | 2 ++ ports/libraw/remove_register_cpp.patch | 31 ++++++++++++++++++++++++++ ports/libraw/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libraw.json | 5 +++++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 ports/libraw/remove_register_cpp.patch diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index ecdcf1da015bc7..ef47b4ec5e9606 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF d4f05dd1b9b2d44c8f7e82043cbad3c724db2416 SHA512 5794521f535163afd7815ad005295301c5e0e2f8b2f34ef0a911d9dd1572c1f456b292777548203f9767957a55782b5bc9041c033190d25d1e9b4240d7df32b9 HEAD_REF master + PATCHES + remove_register_cpp.patch ) vcpkg_from_github( diff --git a/ports/libraw/remove_register_cpp.patch b/ports/libraw/remove_register_cpp.patch new file mode 100644 index 00000000000000..69eb8f3464bd5e --- /dev/null +++ b/ports/libraw/remove_register_cpp.patch @@ -0,0 +1,31 @@ +diff --git a/src/libraw_cxx.cpp b/src/libraw_cxx.cpp +index 0abd5329a..5eea00ea9 100644 +--- a/src/libraw_cxx.cpp ++++ b/src/libraw_cxx.cpp +@@ -3500,7 +3500,7 @@ int LibRaw::phase_one_subtract_black(ushort *src, ushort *dest) + { + if (!imgdata.rawdata.ph1_cblack || !imgdata.rawdata.ph1_rblack) + { +- register int bl = imgdata.color.phase_one_data.t_black; ++ int bl = imgdata.color.phase_one_data.t_black; + for (int row = 0; row < S.raw_height; row++) + { + checkCancel(); +@@ -3514,7 +3514,7 @@ int LibRaw::phase_one_subtract_black(ushort *src, ushort *dest) + } + else + { +- register int bl = imgdata.color.phase_one_data.t_black; ++ int bl = imgdata.color.phase_one_data.t_black; + for (int row = 0; row < S.raw_height; row++) + { + checkCancel(); +@@ -6467,7 +6467,7 @@ static void utf2char(utf16_t *str, char *buffer, unsigned bufsz) + + static void *lr_memmem(const void *l, size_t l_len, const void *s, size_t s_len) + { +- register char *cur, *last; ++ char *cur, *last; + const char *cl = (const char *)l; + const char *cs = (const char *)s; + diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json index 9cc33e31cc7aed..a4f6b1df1a7d75 100644 --- a/ports/libraw/vcpkg.json +++ b/ports/libraw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libraw", "version-string": "201903", - "port-version": 9, + "port-version": 10, "description": "raw image decoder library", "homepage": "https://www.libraw.org", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 6fa891f55fc85d..fc8a7d57d9cd44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4010,7 +4010,7 @@ }, "libraw": { "baseline": "201903", - "port-version": 9 + "port-version": 10 }, "librdkafka": { "baseline": "1.9.0", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index 32d1a0f892671f..b936662630ef9c 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "906477f849ef0c2b348f8ff9f526d2c5a2e19b22", + "version-string": "201903", + "port-version": 10 + }, { "git-tree": "13ab93771f3879d0f68e0418b028df14cb260dd3", "version-string": "201903", From 40ec948687e59bd870e944ccbe2f9efc133b10cc Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 29 Jul 2022 07:19:42 +0200 Subject: [PATCH 241/791] [openimageio] Update to v2.3.17.0, revise dependencies and export (#23918) * Fix exported Imath dependency * Drop unused deps from patches and config * Handle DLL import in installed header * Fix non-required find_package(OpenColorIO) * Omit unrelocatable script * Installation cleanup * Update to 2.1.2 * Fix exported pc file * Update versions * Silence warning * Update versions * OpenImageIO features CI test * Consolidate patches * Revise OpenJPEG patching * Revise PNG patching * Revise libheif patching * Revise libsquish patching * Revise ffmpeg patching * Fix static ffmpeg linking * Fix webp usage * More dependency control * Misc cleanup * Update copyright, add usage * Move config to share/openimageio * Trim dependencies * Revise opencv dependency * Remove find modules which might clash with opencv * Use opencolorio config and target * Update openimageio to 2.3.17.0 * LINKSTATIC breaks CRT lib linkage * Catch Imath version conflicts. This is not a regression but the result of previous opencolorio changes. It will eventually be resolved by upgrading openexr. * Remove llvm from opencv CI test port [skip actions] * [libheif] Fix symbol export * [skip actions] * Update versions * Add baseline =pass entries. Co-authored-by: Billy O'Neal --- ports/libheif/portfile.cmake | 5 +- ports/libheif/vcpkg.json | 2 +- ports/openimageio/fix-config-cmake.patch | 13 -- ports/openimageio/fix-dependencies.patch | 129 +++++++++++------- ports/openimageio/fix-ffmpeg-tool.patch | 17 --- ports/openimageio/fix-openexr-dll.patch | 13 ++ ports/openimageio/fix-openjpeg-linkage.patch | 13 -- ports/openimageio/fix-static-ffmpeg.patch | 18 +++ ports/openimageio/imath-version-guard.patch | 16 +++ ports/openimageio/portfile.cmake | 54 +++++--- ports/openimageio/usage | 4 + ports/openimageio/vcpkg.json | 18 ++- scripts/ci.baseline.txt | 6 + scripts/test_ports/vcpkg-ci-opencv/vcpkg.json | 1 - .../vcpkg-ci-openimageio/portfile.cmake | 1 + .../vcpkg-ci-openimageio/vcpkg.json | 22 +++ versions/baseline.json | 4 +- versions/l-/libheif.json | 5 + versions/o-/openimageio.json | 5 + 19 files changed, 226 insertions(+), 120 deletions(-) delete mode 100644 ports/openimageio/fix-config-cmake.patch delete mode 100644 ports/openimageio/fix-ffmpeg-tool.patch create mode 100644 ports/openimageio/fix-openexr-dll.patch delete mode 100644 ports/openimageio/fix-openjpeg-linkage.patch create mode 100644 ports/openimageio/fix-static-ffmpeg.patch create mode 100644 ports/openimageio/imath-version-guard.patch create mode 100644 ports/openimageio/usage create mode 100644 scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake create mode 100644 scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index bde4f5b17332dd..fe565b78741e0d 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -26,10 +26,11 @@ endif() vcpkg_fixup_pkgconfig() if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "defined(_MSC_VER) && !defined(LIBHEIF_STATIC_BUILD)" "defined(_WIN32)") else() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "!defined(LIBHEIF_STATIC_BUILD)" "0") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "defined(_MSC_VER) && !defined(LIBHEIF_STATIC_BUILD)" "0") endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "#ifdef LIBHEIF_EXPORTS" "#if 0") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 957f728f42a69a..d9ddc6b5c4e8d7 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libheif", "version": "1.12.0", - "port-version": 3, + "port-version": 4, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/ports/openimageio/fix-config-cmake.patch b/ports/openimageio/fix-config-cmake.patch deleted file mode 100644 index b1ad7065020c83..00000000000000 --- a/ports/openimageio/fix-config-cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index b498ece..fb45388 100644 ---- a/src/cmake/Config.cmake.in -+++ b/src/cmake/Config.cmake.in -@@ -30,7 +30,7 @@ endif () - #...logic to determine installedPrefix from the own location... - #set (@PROJECT_NAME@_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@") - --include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/OpenImageIOTargets.cmake") - - check_required_components ("@PROJECT_NAME@") - diff --git a/ports/openimageio/fix-dependencies.patch b/ports/openimageio/fix-dependencies.patch index fb630ad9a005ef..d72b4c60e2196c 100644 --- a/ports/openimageio/fix-dependencies.patch +++ b/ports/openimageio/fix-dependencies.patch @@ -2,68 +2,105 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in index b690864..fb45388 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in -@@ -11,6 +11,9 @@ elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONF - HINTS @IlmBase_DIR@ @OpenEXR_DIR@) - find_dependency(OpenEXR @OpenEXR_VERSION@ - HINTS @OpenEXR_DIR@) -+ find_dependency(libpng CONFIG REQUIRED) -+ find_dependency(libheif CONFIG REQUIRED) -+ find_dependency(unofficial-libsquish CONFIG REQUIRED) - find_dependency(ZLIB @ZLIB_VERSION@) # Because OpenEXR doesn't do it - find_dependency(Threads) # Because OpenEXR doesn't do it - endif () +@@ -1,6 +1,21 @@ + @PACKAGE_INIT@ + + include(CMakeFindDependencyMacro) ++find_dependency(libheif CONFIG) ++find_dependency(PNG) ++find_dependency(unofficial-libsquish CONFIG) ++if(@USE_OPENCV@) ++ find_dependency(OpenCV CONFIG) ++endif() ++if(@USE_OPENCOLORIO@) ++ find_dependency(OpenColorIO CONFIG) ++endif() ++if(@USE_OPENJPEG@) ++ find_dependency(OpenJPEG CONFIG) ++endif() ++if(@USE_WEBP@) ++ find_dependency(WebP CONFIG) ++endif() + + # add here all the find_dependency() whenever switching to config based dependencies + if (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 3.0) diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 631035a..9f4d096 100644 +index 631035a..d416d78 100644 --- a/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake -@@ -148,7 +148,7 @@ find_python() - # Dependencies for optional formats and features. If these are not found, - # we will continue building, but the related functionality will be disabled. +@@ -158,14 +158,19 @@ endif () + checked_find_package (Freetype + DEFINITIONS -DUSE_FREETYPE=1 ) --checked_find_package (PNG) -+checked_find_package (png PREFER_CONFIG) +-checked_find_package (OpenColorIO ++set(OPENCOLORIO_INCLUDES "") ++set(OPENCOLORIO_LIBRARIES OpenColorIO::OpenColorIO) ++checked_find_package (OpenColorIO CONFIG + DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1 + # PREFER_CONFIG + ) ++set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}") + if (NOT OPENCOLORIO_FOUND) + set (OPENCOLORIO_FOUND 0) + endif () +-checked_find_package (OpenCV 3.0 ++set(OPENCV_INCLUDES "") ++set(OPENCV_LIBRARIES opencv_core) ++checked_find_package (OpenCV CONFIG + DEFINITIONS -DUSE_OPENCV=1) + + # Intel TBB +@@ -175,7 +177,9 @@ checked_find_package (TBB 2017 + PREFER_CONFIG) - checked_find_package (BZip2) # Used by ffmpeg and freetype - if (NOT BZIP2_FOUND) -@@ -200,7 +200,8 @@ if (ENABLE_FIELD3D) + checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images +-checked_find_package (FFmpeg VERSION_MIN 3.0) ++checked_find_package (FFMPEG) ++set(FFmpeg_FOUND "${FFMPEG_FOUND}") ++set(FFMPEG_INCLUDES "${FFMPEG_INCLUDE_DIRS}") + checked_find_package (GIF + VERSION_MIN 4 + RECOMMEND_MIN 5.0 +@@ -200,7 +200,9 @@ if (ENABLE_FIELD3D) endif () # For HEIF/HEIC/AVIF formats -checked_find_package (Libheif VERSION_MIN 1.3 -+checked_find_package (libheif VERSION_MIN 1.3 -+ PREFER_CONFIG ++set(LIBHEIF_INCLUDES "") ++set(LIBHEIF_LIBRARIES heif) ++checked_find_package (Libheif CONFIG RECOMMEND_MIN 1.7 RECOMMEND_MIN_REASON "for AVIF support") if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11) -@@ -307,7 +308,8 @@ endmacro() +@@ -221,9 +222,8 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER + # set (LIBRAW_FOUND 0) + endif () + +-checked_find_package (OpenJPEG VERSION_MIN 2.0 +- RECOMMEND_MIN 2.2 +- RECOMMEND_MIN_REASON "for multithreading support") ++set(CMAKE_REQUIRE_FIND_PACKAGE_OpenJPEG ${USE_OPENJPEG}) ++checked_find_package (OpenJPEG CONFIG) + # Note: Recent OpenJPEG versions have exported cmake configs, but we don't + # find them reliable at all, so we stick to our FindOpenJPEG.cmake module. + +@@ -240,6 +243,8 @@ if (NOT Ptex_FOUND OR NOT Ptex_VERSION) + checked_find_package (Ptex) + endif () + ++set(WEBP_INCLUDES "") ++set(WEBP_LIBRARIES WebP::webp WebP::webpdemux) + checked_find_package (WebP) + + option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF) +@@ -307,7 +309,9 @@ endmacro() option (USE_EMBEDDED_LIBSQUISH "Force use of embedded Libsquish, even if external is found" OFF) if (NOT USE_EMBEDDED_LIBSQUISH) - checked_find_package (Libsquish) -+ checked_find_package (unofficial-libsquish PREFER_CONFIG) -+ set(libsquish_FOUND 1) ++ set(LIBSQUISH_INCLUDES "") ++ set(LIBSQUISH_LIBRARIES unofficial::libsquish::squish) ++ checked_find_package (Libsquish NAMES unofficial-libsquish) endif () -diff --git a/src/ico.imageio/CMakeLists.txt b/src/ico.imageio/CMakeLists.txt -index d290625..cff954c 100644 ---- a/src/ico.imageio/CMakeLists.txt -+++ b/src/ico.imageio/CMakeLists.txt -@@ -2,9 +2,15 @@ - # SPDX-License-Identifier: BSD-3-Clause - # https://github.com/OpenImageIO/oiio - --if (TARGET PNG::PNG) -+if (libpng_FOUND) -+ if (TARGET png_static) -+ set(PNG_TARGET png_static) -+ elseif (TARGET png) -+ set(PNG_TARGET png) -+ endif() -+ - add_oiio_plugin (icoinput.cpp icooutput.cpp -- LINK_LIBRARIES PNG::PNG ZLIB::ZLIB) -+ LINK_LIBRARIES ${PNG_TARGET} ZLIB::ZLIB) - else () - message (WARNING "libpng not found, so ICO support will not work") - set (format_plugin_definitions ${format_plugin_definitions} DISABLE_ICO=1 PARENT_SCOPE) diff --git a/ports/openimageio/fix-ffmpeg-tool.patch b/ports/openimageio/fix-ffmpeg-tool.patch deleted file mode 100644 index e185a3003193c8..00000000000000 --- a/ports/openimageio/fix-ffmpeg-tool.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt -index 5840206..cc52e4c 100644 ---- a/src/ffmpeg.imageio/CMakeLists.txt -+++ b/src/ffmpeg.imageio/CMakeLists.txt -@@ -2,9 +2,10 @@ - # SPDX-License-Identifier: BSD-3-Clause - # https://github.com/OpenImageIO/oiio - --if (FFmpeg_FOUND) -+if (USE_FFMPEG) -+ find_package(FFMPEG REQUIRED) - add_oiio_plugin (ffmpeginput.cpp -- INCLUDE_DIRS ${FFMPEG_INCLUDES} -+ INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} - LINK_LIBRARIES ${FFMPEG_LIBRARIES} - ${BZIP2_LIBRARIES} - DEFINITIONS "-DUSE_FFMPEG" diff --git a/ports/openimageio/fix-openexr-dll.patch b/ports/openimageio/fix-openexr-dll.patch new file mode 100644 index 00000000000000..37a9df45d43669 --- /dev/null +++ b/ports/openimageio/fix-openexr-dll.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index b50a923..c3250b9 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -108,7 +108,7 @@ if (CMAKE_COMPILER_IS_CLANG AND OPENEXR_VERSION VERSION_LESS 2.3) + # clang C++ >= 11 doesn't like 'register' keyword in old exr headers + add_compile_options (-Wno-deprecated-register) + endif () +-if (MSVC AND NOT LINKSTATIC) ++if (WIN32 AND BUILD_SHARED_LIBS) + add_definitions (-DOPENEXR_DLL) # Is this needed for new versions? + endif () + diff --git a/ports/openimageio/fix-openjpeg-linkage.patch b/ports/openimageio/fix-openjpeg-linkage.patch deleted file mode 100644 index 7d3a24c2fef0da..00000000000000 --- a/ports/openimageio/fix-openjpeg-linkage.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 1fc2059..62c4efb 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -222,7 +222,7 @@ if (LibRaw_FOUND AND LibRaw_VERSION VERSION_LESS 0.20 AND CMAKE_CXX_STANDARD VER - # set (LIBRAW_FOUND 0) - endif () - --checked_find_package (OpenJPEG VERSION_MIN 2.0) -+checked_find_package (OpenJPEG PREFER_CONFIG VERSION_MIN 2.0) - - checked_find_package (OpenVDB - VERSION_MIN 5.0 diff --git a/ports/openimageio/fix-static-ffmpeg.patch b/ports/openimageio/fix-static-ffmpeg.patch new file mode 100644 index 00000000000000..16096dd091d802 --- /dev/null +++ b/ports/openimageio/fix-static-ffmpeg.patch @@ -0,0 +1,18 @@ +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index dc260a7..433ffbb 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -6,6 +6,13 @@ + checked_find_package (pybind11 REQUIRED + VERSION_MIN 2.4.2) + ++if(USE_FFMPEG AND UNIX AND NOT BUILD_SHARED_LIBS AND VCPKG_CRT_LINKAGE STREQUAL "dynamic") ++ include(CheckLinkerFlag) ++ check_linker_flag(C "LINKER:-Bsymbolic" supports_bsymbolic) ++ if(supports_bsymbolic) ++ add_link_options("LINKER:-Bsymbolic") ++ endif() ++endif() + + file (GLOB python_srcs *.cpp) + setup_python_module (TARGET PyOpenImageIO diff --git a/ports/openimageio/imath-version-guard.patch b/ports/openimageio/imath-version-guard.patch new file mode 100644 index 00000000000000..598d8229a3f18b --- /dev/null +++ b/ports/openimageio/imath-version-guard.patch @@ -0,0 +1,16 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index b50a923..cec6e43 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -168,6 +168,11 @@ set(OPENCOLORIO_FOUND "${OpenColorIO_FOUND}") + if (NOT OPENCOLORIO_FOUND) + set (OPENCOLORIO_FOUND 0) + endif () ++if(USE_OPENCOLORIO AND TARGET Imath::Imath AND OIIO_USING_IMATH STREQUAL "2") ++ message(FATAL_ERROR ++ "OpenColorIO and OpenEXR use incompatible versions of Imath. " ++ "You cannot use openimageio[opencolorio] for this configuration.") ++endif() + set(OPENCV_INCLUDES "") + set(OPENCV_LIBRARIES opencv_core) + checked_find_package (OpenCV CONFIG diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 950ebf63a7ff2d..20fdac139f0c8a 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -1,25 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF ff71703961f7758409fb7e6e689258e2997f7c18 # 2.3.10.1 - SHA512 f56cb58329a496ca1fe3537fe87d469038ac0e74a555990a4510d2c019d2ad14b556240c0d5087a9a25ac01d9b371b5c77ce5a719e71a85fcd56e9cd099bc31e + REF v2.3.17.0 + SHA512 25cb1a671e7cd5154e363eef178ab091fd7d55868746a4394340567a794f6c6f0295e58721a5b4ee8bf66b4cc0e6a01c3e82f9cc9de9953ae349d45738a04700 HEAD_REF master PATCHES fix-dependencies.patch - fix-config-cmake.patch - fix-openjpeg-linkage.patch - fix-ffmpeg-tool.patch + fix-static-ffmpeg.patch + fix-openexr-dll.patch + imath-version-guard.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") -file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake") - -file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LINKSTATIC) +file(REMOVE + "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindLibheif.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindOpenJPEG.cmake" + "${SOURCE_PATH}/src/cmake/modules/FindWebP.cmake" +) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -33,22 +35,23 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS webp USE_WEBP pybind11 USE_PYTHON tools OIIO_BUILD_TOOLS + tools USE_OPENGL + tools USE_QT + tools USE_QT5 ) -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path("${PYTHON3_DIR}") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DOIIO_BUILD_TESTS=OFF + -DBUILD_TESTING=OFF -DUSE_DCMTK=OFF -DUSE_NUKE=OFF -DUSE_QT=OFF + -DUSE_OpenVDB=OFF -DUSE_PTEX=OFF - -DLINKSTATIC=${LINKSTATIC} + -DUSE_TBB=OFF + -DLINKSTATIC=OFF # LINKSTATIC breaks library lookup -DBUILD_MISSING_FMT=OFF -DBUILD_MISSING_ROBINMAP=OFF -DBUILD_MISSING_DEPS=OFF @@ -56,13 +59,14 @@ vcpkg_cmake_configure( -DVERBOSE=ON -DBUILD_DOCS=OFF -DINSTALL_DOCS=OFF + "-DREQUIRED_DEPS=fmt;JPEG;Libheif;Libsquish;PNG;Robinmap" ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(PACKAGE_NAME OpenImageIO CONFIG_PATH lib/cmake/OpenImageIO) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenImageIO) if("tools" IN_LIST FEATURES) vcpkg_copy_tools( @@ -72,11 +76,19 @@ if("tools" IN_LIST FEATURES) endif() # Clean -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" - "${CURRENT_PACKAGES_DIR}/debug/doc" +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(READ "${SOURCE_PATH}/THIRD-PARTY.md" third_party) +string(REGEX REPLACE + "^.*The remainder of this file" + "\n-------------------------------------------------------------------------\n\nThe remainder of this file" + third_party + "${third_party}" +) +file(APPEND "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${third_party}") diff --git a/ports/openimageio/usage b/ports/openimageio/usage new file mode 100644 index 00000000000000..b76a4cdd776a12 --- /dev/null +++ b/ports/openimageio/usage @@ -0,0 +1,4 @@ +The package openimageio provides CMake targets: + + find_package(OpenImageIO CONFIG REQUIRED) + target_link_libraries(main PRIVATE OpenImageIO::OpenImageIO) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 9136d46481f7d5..44ff6fcbd5d939 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openimageio", - "version": "2.3.10.1", + "version": "2.3.17.0", "port-version": 4, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", @@ -43,6 +43,7 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "avresample" ] @@ -68,7 +69,10 @@ ] }, "opencolorio": { - "description": "Enable opencolorio support for openimageio", + "description": [ + "Enable opencolorio support for openimageio.", + "This feature can only be used when openexr and opencolorio use the same version of Imath." + ], "dependencies": [ "opencolorio" ] @@ -76,7 +80,10 @@ "opencv": { "description": "Enable opencv support for openimageio", "dependencies": [ - "opencv" + { + "name": "opencv", + "default-features": false + } ] }, "openjpeg": { @@ -95,7 +102,10 @@ "description": "Build openimageio tools", "dependencies": [ "opengl", - "qt5-base" + { + "name": "qt5-base", + "default-features": false + } ] }, "webp": { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 48de87857dcf2b..da8f38a96ae709 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1285,6 +1285,12 @@ vcpkg-ci-opencv:x64-windows-static-md=pass vcpkg-ci-opencv:x64-windows-static=pass vcpkg-ci-opencv:x64-windows=pass vcpkg-ci-opencv:x86-windows=pass +vcpkg-ci-openimageio:x86-windows=pass +vcpkg-ci-openimageio:x64-windows=pass +vcpkg-ci-openimageio:x64-windows-static=pass +vcpkg-ci-openimageio:x64-windows-static-md=pass +vcpkg-ci-openimageio:x64-osx=pass +vcpkg-ci-openimageio:x64-linux=pass vcpkg-ci-paraview:x64-linux=pass vcpkg-ci-paraview:x64-osx=pass vcpkg-ci-paraview:x64-windows-static-md=pass diff --git a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json index 6250e5755e6c0d..83bbc51bc70bc1 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-opencv/vcpkg.json @@ -38,7 +38,6 @@ "cuda", "cudnn", "gstreamer", - "halide", "ovis", "tbb" ], diff --git a/scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake b/scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake new file mode 100644 index 00000000000000..0015715fb66c72 --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-openimageio/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json b/scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json new file mode 100644 index 00000000000000..0d449b94a5578d --- /dev/null +++ b/scripts/test_ports/vcpkg-ci-openimageio/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "vcpkg-ci-openimageio", + "version": "1", + "description": "OpenImageIO features testing within CI.", + "license": "MIT", + "dependencies": [ + { + "name": "openimageio", + "features": [ + "ffmpeg", + "freetype", + "gif", + "libraw", + "opencv", + "openjpeg", + "pybind11", + "tools", + "webp" + ] + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index fc8a7d57d9cd44..1daf664a55132e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3702,7 +3702,7 @@ }, "libheif": { "baseline": "1.12.0", - "port-version": 3 + "port-version": 4 }, "libhsplasma": { "baseline": "2022-05-19", @@ -5217,7 +5217,7 @@ "port-version": 2 }, "openimageio": { - "baseline": "2.3.10.1", + "baseline": "2.3.17.0", "port-version": 4 }, "openjpeg": { diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 437397e9a737e8..0b643536a5b0cf 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f183481e325abb8be75988c2061260ebf60ad7d4", + "version": "1.12.0", + "port-version": 4 + }, { "git-tree": "9638a1f823a06ad68484b408f5640ac2204b5262", "version": "1.12.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 0fac6cd2e73d8a..cdc6f62e8eb7e0 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4317b62fd8bf1e11d9da42132ecfdf1ccb03a8af", + "version": "2.3.17.0", + "port-version": 4 + }, { "git-tree": "4c60e9a4adf07bdd6ff8bf766f295af17d8a0818", "version": "2.3.10.1", From 4f0eabea1cdb59272e507ce9ade960dc1ffe3a9f Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 29 Jul 2022 08:32:55 +0300 Subject: [PATCH 242/791] [boost-python] Fix boost-python linking to release python in debug builds (#23416) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/boost-modular-build-helper/CMakeLists.txt | 14 +++++++++----- .../boost-modular-build.cmake | 1 + ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 8cdb5d9c350dd8..20859011a85665 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -210,6 +210,15 @@ if(WITH_PYTHON3) list(APPEND python_versions "${python3_version}") endif() +if(NOT python_versions STREQUAL "") + list(JOIN python_versions "," python_versions) + list(APPEND B2_OPTIONS "python=${python_versions}") + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND B2_OPTIONS "python-debugging=on") + endif() +endif() + if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") string(APPEND USER_CONFIG_EXTRA_LINES "using mpi : : \"${CURRENT_INSTALLED_DIR}/lib\"\n" @@ -226,11 +235,6 @@ if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel") endif() endif() -if(NOT python_versions STREQUAL "") - list(JOIN python_versions "," python_versions) - list(APPEND B2_OPTIONS "python=${python_versions}") -endif() - # Include port specific CMake fragment if(DEFINED BOOST_CMAKE_FRAGMENT) message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index bb0fb6a1dd1902..18f8bbfc8a5058 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -154,6 +154,7 @@ function(boost_modular_build) string(REPLACE "-vc143-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 and VS2015 binaries string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs + string(REPLACE "-gyd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs with python debugging string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 9bebbebcd9c25d..c0a50275d121c0 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.79.0", - "port-version": 5, + "port-version": 6, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index bbb9d39a7cf58c..2ab40c85fc1f8e 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9428ba48caa81512147423f26559c7a57b37e71b", + "version": "1.79.0", + "port-version": 6 + }, { "git-tree": "93946fc40b519f0f9afe1b0d36985b2def25d4ab", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1daf664a55132e..a665d68b312315 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -842,7 +842,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 5 + "port-version": 6 }, "boost-move": { "baseline": "1.79.0", From 837261793a932123d5c45025aa7f4faac170114e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 29 Jul 2022 13:35:30 +0800 Subject: [PATCH 243/791] [asio] update to 1.23.0 (#26025) * [asio] update to 1.23.0 * update version * add license * update version --- ports/asio/portfile.cmake | 4 ++-- ports/asio/vcpkg.json | 3 ++- versions/a-/asio.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 6f83c5f4067ba8..55f855620a0cc0 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-22-1 - SHA512 7658293f2be1f5ea659a424614b2f3092954df45802fbb0031b7983d11762f4f68d18eab076e14954df3a24ce89ff26bd4bebea88b9a3dc680387252efec8398 + REF 4915cfd8a1653c157a1480162ae5601318553eb8 #vasio-1-23-0 + SHA512 4fb30b82d51726b621fe80a17dac0ce23d4d48c813d3d45b394aac4e6de68008f142da848d6d6f2a69f70147dfb52b7bac4f45b15385ac227d94fd2e15f9e4b3 HEAD_REF master ) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index ab4d1455678081..cf1381ec44ef4f 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,9 +1,10 @@ { "name": "asio", - "version": "1.22.1", + "version": "1.23.0", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.22.1/doc/", + "license": "BSL-1.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 8ff066eac8f387..dff326db0926a3 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "029bab0230676c0a38979db2b89076983401e553", + "version": "1.23.0", + "port-version": 0 + }, { "git-tree": "fbf8b87b680829fee5a422169f3d73df4392d8cf", "version": "1.22.1", diff --git a/versions/baseline.json b/versions/baseline.json index a665d68b312315..16fbe3badd1118 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -185,7 +185,7 @@ "port-version": 0 }, "asio": { - "baseline": "1.22.1", + "baseline": "1.23.0", "port-version": 0 }, "asio-grpc": { From 56ab1ad0898ce8c4ae76359ee33de194bd770df8 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Jul 2022 07:40:03 +0200 Subject: [PATCH 244/791] [mp3lame] Remove docs (#26042) * [mp3lame] remove docs * version --- ports/mp3lame/portfile.cmake | 77 ++++++++++++++++++------------------ ports/mp3lame/vcpkg.json | 7 ++-- versions/baseline.json | 2 +- versions/m-/mp3lame.json | 5 +++ 4 files changed, 49 insertions(+), 42 deletions(-) diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index f30f9e2cbac62d..6d70733475daca 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -13,24 +13,24 @@ vcpkg_from_sourceforge( if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(platform "ARM64") - set(machine "ARM64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(platform "ARM") - set(machine "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(platform "x64") - set(machine "x64") - else() - set(platform "Win32") - set(machine "x86") - endif() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(platform "ARM64") + set(machine "ARM64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(platform "ARM") + set(machine "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(platform "x64") + set(machine "x64") + else() + set(platform "Win32") + set(machine "x86") + endif() - file(READ "${SOURCE_PATH}/vc_solution/vc11_lame.sln" sln_con) - string(REPLACE "|Win32" "|${platform}" sln_con "${sln_con}") - string(REPLACE "\"vc11_" "\"${machine}_vc11_" sln_con "${sln_con}") - file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_vc11_lame.sln" "${sln_con}") + file(READ "${SOURCE_PATH}/vc_solution/vc11_lame.sln" sln_con) + string(REPLACE "|Win32" "|${platform}" sln_con "${sln_con}") + string(REPLACE "\"vc11_" "\"${machine}_vc11_" sln_con "${sln_con}") + file(WRITE "${SOURCE_PATH}/vc_solution/${machine}_vc11_lame.sln" "${sln_con}") file(GLOB vcxprojs RELATIVE "${SOURCE_PATH}/vc_solution" "${SOURCE_PATH}/vc_solution/vc11_*.vcxproj") @@ -41,10 +41,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) string(REPLACE "DLL" "" vcxproj_con "${vcxproj_con}") endif() - string(REPLACE "/machine:x86" "/machine:${machine}" vcxproj_con "${vcxproj_con}") - string(REPLACE "Win32" "${platform}" vcxproj_con "${vcxproj_con}") - string(REPLACE "|Win32" "|${platform}" vcxproj_con "${vcxproj_con}") - string(REPLACE "Include=\"vc11_" "Include=\"${machine}_vc11_" vcxproj_con "${vcxproj_con}") + string(REPLACE "/machine:x86" "/machine:${machine}" vcxproj_con "${vcxproj_con}") + string(REPLACE "Win32" "${platform}" vcxproj_con "${vcxproj_con}") + string(REPLACE "|Win32" "|${platform}" vcxproj_con "${vcxproj_con}") + string(REPLACE "Include=\"vc11_" "Include=\"${machine}_vc11_" vcxproj_con "${vcxproj_con}") if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") string(REPLACE "/APPCONTAINER" "" vcxproj_con "${vcxproj_con}") @@ -54,7 +54,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endforeach() vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "vc_solution/${machine}_vc11_lame.sln" TARGET "lame" PLATFORM "${platform}" @@ -62,22 +62,22 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame.lib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libmp3lame.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame.lib) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame.lib") endif() set(MP3LAME_LIB "libmp3lame-static.lib") else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmp3lame-static.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmpghip-static.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libmp3lame-static.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libmpghip-static.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame-static.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmpghip-static.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libmp3lame-static.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libmpghip-static.lib") endif() set(MP3LAME_LIB "libmp3lame.lib") endif() @@ -101,20 +101,21 @@ else() endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DETERMINE_BUILD_TRIPLET OPTIONS ${OPTIONS} ) vcpkg_install_make() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) - endif() -file(COPY ${SOURCE_PATH}/include/lame.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/lame) -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake @ONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/man1") + +file(COPY "${SOURCE_PATH}/include/lame.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/lame") +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/mp3lame-config.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mp3lame/vcpkg.json b/ports/mp3lame/vcpkg.json index f0c7cfca97f9ff..13eda2965bc392 100644 --- a/ports/mp3lame/vcpkg.json +++ b/ports/mp3lame/vcpkg.json @@ -1,7 +1,8 @@ { "name": "mp3lame", - "version-string": "3.100", - "port-version": 7, + "version": "3.100", + "port-version": 8, "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.", - "homepage": "http://lame.sourceforge.net/" + "homepage": "https://sourceforge.net/projects/lame", + "license": "LGPL-2.0-only" } diff --git a/versions/baseline.json b/versions/baseline.json index 16fbe3badd1118..813c2d49c0015b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4706,7 +4706,7 @@ }, "mp3lame": { "baseline": "3.100", - "port-version": 7 + "port-version": 8 }, "mpark-variant": { "baseline": "1.4.0", diff --git a/versions/m-/mp3lame.json b/versions/m-/mp3lame.json index bcabc3520c1a28..4389fec3aeffcf 100644 --- a/versions/m-/mp3lame.json +++ b/versions/m-/mp3lame.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd7f2793ec89d5ce9c00b4b9848a80905eb7ab67", + "version": "3.100", + "port-version": 8 + }, { "git-tree": "ead40ed860e86cd8c3c5492b9bb3fcc7c8a2770e", "version-string": "3.100", From 47a0bd967d51404a3c86e1c1b63c781b68f30b62 Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Fri, 29 Jul 2022 01:41:00 -0400 Subject: [PATCH 245/791] [bshoshany-thread-pool] Updated to v3.2.0 (#26044) * [bshoshany-thread-pool] Updated to v3.2.0 * [bshoshany-thread-pool] Updated to v3.2.0 --- ports/bshoshany-thread-pool/portfile.cmake | 4 ++-- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index fa4864651b811b..ff0ceeedf41847 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool - REF v3.1.0 - SHA512 c53f85392422c957610fe3414340bce9dc22b7d2eab901f253510ea85bb50ee386c01258569b72dbaf151782fe5284d88f706d188d96d0746744bdd92c1ada71 + REF v3.2.0 + SHA512 785d6c4827e39b0128501ff4379ba0ffbf90ef4b612eccd0279027e6fc9ce9d2a463c2b8b93515ca0a1dc86dc4c34d9849bc281940b1f490086d1db49d5521bb HEAD_REF master ) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 12c4c3830f33d3..6cc71015e3411a 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "3.1.0", + "version": "3.2.0", "maintainers": "Barak Shoshany ", "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index 4fe6e7bd30ac3a..d23ee2823a4b79 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fee21d430188c7e3c7f7d92da0cb30c48b6cafba", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "9903a88f968331b1a71254f21e8db7ddd5782df9", "version": "3.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 813c2d49c0015b..d9e285bae31d3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1181,7 +1181,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "3.1.0", + "baseline": "3.2.0", "port-version": 0 }, "bsio": { From 67029c5d3d99936b9bf06588c071a653ea87a520 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Jul 2022 21:53:41 +0200 Subject: [PATCH 246/791] [mpfr] Remove docs (#26018) * [mpfr] Remove docs * version * license * version --- ports/mpfr/portfile.cmake | 16 ++++++++++++---- ports/mpfr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mpfr.json | 5 +++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 83354d7d93a4a1..7ab383aa654ffa 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -1,4 +1,4 @@ -if (VCPKG_TARGET_IS_LINUX) +if(VCPKG_TARGET_IS_LINUX) message(WARNING "${PORT} currently requires the following packages:\n autoconf-archive\nThese can be installed on Ubuntu systems via\n sudo apt-get update -y\n sudo apt-get install -y autoconf-archive\n") endif() @@ -12,7 +12,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - PATCHES + PATCHES dll.patch src-only.patch ) @@ -31,5 +31,13 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE + "${CURRENT_PACKAGES_DIR}/share/${PORT}/AUTHORS" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/BUGS" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING.LESSER" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/NEWS" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/TODO" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING.LESSER") diff --git a/ports/mpfr/vcpkg.json b/ports/mpfr/vcpkg.json index 195d7efbee3d6a..09f4f2cfd022bc 100644 --- a/ports/mpfr/vcpkg.json +++ b/ports/mpfr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpfr", "version": "4.1.0", - "port-version": 4, + "port-version": 5, "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", "homepage": "https://www.mpfr.org", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index d9e285bae31d3a..c25a8cc6359c83 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4718,7 +4718,7 @@ }, "mpfr": { "baseline": "4.1.0", - "port-version": 4 + "port-version": 5 }, "mpg123": { "baseline": "1.29.3", diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index e3316b5bb20f4f..2c3c62260e6854 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39b251ed109ce7a5787fe0e7235f9fe0ce436a09", + "version": "4.1.0", + "port-version": 5 + }, { "git-tree": "af50e086428e7b7b1e1e5969a296a770a32ff88d", "version": "4.1.0", From 281d2f2dc27a2d0761e0f761e11ab38638ef7653 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 29 Jul 2022 21:57:10 +0200 Subject: [PATCH 247/791] [libsndfile] Remove docs (#26017) * [libsndfile] Remove docs * version * `PYTHON_EXECUTABLE` is only used with `BUILD_SHARED_LIBS` * version * Fix license * version * license * version --- ports/libsndfile/portfile.cmake | 14 ++++++++------ ports/libsndfile/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libsndfile.json | 5 +++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ports/libsndfile/portfile.cmake b/ports/libsndfile/portfile.cmake index 7c31e3468a8dc4..e6ad23df30b6a6 100644 --- a/ports/libsndfile/portfile.cmake +++ b/ports/libsndfile/portfile.cmake @@ -26,7 +26,7 @@ if(VCPKG_TARGET_IS_UWP) endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF @@ -36,6 +36,8 @@ vcpkg_cmake_configure( -DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON -DPYTHON_EXECUTABLE=${PYTHON3} ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + PYTHON_EXECUTABLE ) vcpkg_cmake_install() @@ -46,13 +48,13 @@ else() set(CONFIG_PATH lib/cmake/SndFile) endif() -vcpkg_cmake_config_fixup(PACKAGE_NAME SndFile CONFIG_PATH ${CONFIG_PATH}) +vcpkg_cmake_config_fixup(PACKAGE_NAME SndFile CONFIG_PATH "${CONFIG_PATH}") vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsndfile/vcpkg.json b/ports/libsndfile/vcpkg.json index 20c29ae2ae0734..ad775ca2136c7a 100644 --- a/ports/libsndfile/vcpkg.json +++ b/ports/libsndfile/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libsndfile", "version-semver": "1.1.0", + "port-version": 1, "description": "A library for reading and writing audio files", "homepage": "https://github.com/erikd/libsndfile", - "license": "LGPL-2.1", + "license": "LGPL-2.1-or-later", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c25a8cc6359c83..18fb07c3f97685 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4078,7 +4078,7 @@ }, "libsndfile": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "libsnoretoast": { "baseline": "0.8.0", diff --git a/versions/l-/libsndfile.json b/versions/l-/libsndfile.json index b1d58472db8b50..83ba3f8b327f0e 100644 --- a/versions/l-/libsndfile.json +++ b/versions/l-/libsndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee6720c9ecc42994e16325893fcc740b28210533", + "version-semver": "1.1.0", + "port-version": 1 + }, { "git-tree": "1ec8249a4721dda26735a12603defe2aa680c264", "version-semver": "1.1.0", From 90bff083b4c1e3f6128d83bb67166c646c611bf3 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 30 Jul 2022 08:09:55 +0800 Subject: [PATCH 248/791] [PoDoFo] update to 0.9.8 (#26046) * [podofo] update to 0.9.8 * update version * fix-x64-osx * update version --- ports/podofo/fix-compiler.patch | 12 ++++++++++++ ports/podofo/portfile.cmake | 5 +++-- ports/podofo/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/podofo.json | 5 +++++ 5 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 ports/podofo/fix-compiler.patch diff --git a/ports/podofo/fix-compiler.patch b/ports/podofo/fix-compiler.patch new file mode 100644 index 00000000000000..e698da3e041ac4 --- /dev/null +++ b/ports/podofo/fix-compiler.patch @@ -0,0 +1,12 @@ +diff --git a/src/podofo/CMakeLists.txt b/src/podofo/CMakeLists.txt +index 16f0798..12fc0e8 100644 +--- a/src/podofo/CMakeLists.txt ++++ b/src/podofo/CMakeLists.txt +@@ -1,5 +1,7 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + ++set(CMAKE_CXX_STANDARD 14) ++ + IF(NOT PODOFO_MAIN_CMAKELISTS_READ) + MESSAGE(FATAL_ERROR "Run cmake on the CMakeLists.txt in the project root, not the one in the 'src' directory. You will need to delete CMakeCache.txt from the current directory.") + ENDIF(NOT PODOFO_MAIN_CMAKELISTS_READ) diff --git a/ports/podofo/portfile.cmake b/ports/podofo/portfile.cmake index ba11dbeb2495e9..d9cc0308bb4d8e 100644 --- a/ports/podofo/portfile.cmake +++ b/ports/podofo/portfile.cmake @@ -1,4 +1,4 @@ -set(PODOFO_VERSION 0.9.7) +set(PODOFO_VERSION 0.9.8) if (VCPKG_TARGET_IS_UWP) set(ADDITIONAL_PATCH "0003-uwp_fix.patch") @@ -9,7 +9,7 @@ vcpkg_from_sourceforge( REPO podofo/podofo REF ${PODOFO_VERSION} FILENAME "podofo-${PODOFO_VERSION}.tar.gz" - SHA512 0e699739c2fb7d4d02ffca371504bb19f3a8a97ddcbfc06f8d9636db9e73064b4f633f7f09bce92140bb2174610ad68c1e5f8460d474d176ab803ed28295251b + SHA512 b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1 PATCHES 0002-HAVE_UNISTD_H.patch freetype.patch @@ -17,6 +17,7 @@ vcpkg_from_sourceforge( 0005-fix-crypto.patch fix-x64-osx.patch install-cmake-config.patch + fix-compiler.patch ) set(PODOFO_NO_FONTMANAGER ON) diff --git a/ports/podofo/vcpkg.json b/ports/podofo/vcpkg.json index a5bc9eb004d613..d27ed0bfc1615b 100644 --- a/ports/podofo/vcpkg.json +++ b/ports/podofo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "podofo", - "version": "0.9.7", - "port-version": 2, + "version": "0.9.8", "description": "PoDoFo is a library to work with the PDF file format", "homepage": "https://sourceforge.net/projects/podofo/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 18fb07c3f97685..f7862394541f8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5577,8 +5577,8 @@ "port-version": 0 }, "podofo": { - "baseline": "0.9.7", - "port-version": 2 + "baseline": "0.9.8", + "port-version": 0 }, "poissonrecon": { "baseline": "2021-09-26", diff --git a/versions/p-/podofo.json b/versions/p-/podofo.json index 7a1aaff361209f..8d6ab713507d5b 100644 --- a/versions/p-/podofo.json +++ b/versions/p-/podofo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e302c730989d9f85b236c00b51e44dd067af7e6d", + "version": "0.9.8", + "port-version": 0 + }, { "git-tree": "f7f44c3594a2850412f1cb33ef1feaa78d35b7f9", "version": "0.9.7", From fc6fbb447b77f0368c3f139f2395aadd338f177c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 30 Jul 2022 04:28:59 +0000 Subject: [PATCH 249/791] [qtmultimedia] Remove dependency alsa (#26000) * [qtmultimedia] Fix find dependency alsa * version * Fix find alsa * Remove dependency alsa since it's not ready * version * Forgot * version * typo * version * Set alsa to OFF * version --- ports/qtmultimedia/portfile.cmake | 10 +++------- ports/qtmultimedia/vcpkg.json | 5 +---- versions/baseline.json | 2 +- versions/q-/qtmultimedia.json | 5 +++++ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 67a771a9be75c4..913526f78e3d50 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -3,7 +3,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES fix_windows_header_include.patch remove_unistd.patch - ) +) #Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added @@ -38,12 +38,8 @@ else() list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") endif() -if(VCPKG_TARGET_IS_LINUX) - list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON") - list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_ALSA=ON") -else() - list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON") -endif() +# alsa is not ready +list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=OFF") qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 3ce8174f8275f1..6a3256e71a8749 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,14 +1,11 @@ { "name": "qtmultimedia", "version": "6.3.1", + "port-version": 1, "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ - { - "name": "alsa", - "platform": "linux" - }, { "name": "qtbase", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index f7862394541f8c..c4885d296e284f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6018,7 +6018,7 @@ }, "qtmultimedia": { "baseline": "6.3.1", - "port-version": 0 + "port-version": 1 }, "qtnetworkauth": { "baseline": "6.3.1", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index cffae3eb23ccce..72a8c10174c83a 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e820875b5bc53163ca6af245c6874ce366dac52a", + "version": "6.3.1", + "port-version": 1 + }, { "git-tree": "aa389d9b2b938058dda0c787072eb791a7c6032e", "version": "6.3.1", From 25d3e2c8e32619c0be36e45fa76535ddf76cecfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Aubrecht?= Date: Sat, 30 Jul 2022 06:30:35 +0200 Subject: [PATCH 250/791] [cpuinfo] updated to last commit from 2022-07-19 (#25974) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added libxml port. * Remove port version as it's initial port. * Added baseline version * Support only for windows and static * Allowed building debug version * update versions * Update ports/libxpm/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Added new lines * Update ports/libxpm/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update ports/libxpm/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update ports/libxpm/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Regenerated versions * Update ports/libxpm/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Libxpm is taken from gitlab now. * Dropped changes against master in original repo for libxpm. * Dropped libxpm from baseline * Dropped version for libxpm * Update cpuinfo * Updated date of version * Update version database * Removed support for arm32 & uwp as library is not supporting it. * Version regenerated * Update ports/cpuinfo/vcpkg.json Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Updated versions * Update versions/c-/cpuinfo.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/cpuinfo/check-for-x86-correctly.patch | 48 --------------------- ports/cpuinfo/portfile.cmake | 6 +-- ports/cpuinfo/vcpkg.json | 5 +-- versions/baseline.json | 4 +- versions/c-/cpuinfo.json | 5 +++ 5 files changed, 11 insertions(+), 57 deletions(-) delete mode 100644 ports/cpuinfo/check-for-x86-correctly.patch diff --git a/ports/cpuinfo/check-for-x86-correctly.patch b/ports/cpuinfo/check-for-x86-correctly.patch deleted file mode 100644 index 7acb388cdf7ae0..00000000000000 --- a/ports/cpuinfo/check-for-x86-correctly.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 99486c3d72cc0aec72992eb95bd46a27f09ff41e Mon Sep 17 00:00:00 2001 -From: Billy Robert O'Neal III -Date: Wed, 15 Jun 2022 13:59:23 -0700 -Subject: [PATCH] Always check for x86-ish with the same regex. - -On line 68, and in most places, "intel-like" is checked with `i[3-6]86|AMD64|x86(_64)?`, but in these 3 places the (_x64)? was missing. - -First reported as https://github.com/microsoft/vcpkg/issues/24713 ---- - CMakeLists.txt | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74364e8..1cdada0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -319,7 +319,7 @@ ENDIF() - # ---[ cpuinfo mock library and mock tests - IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_MOCK_TESTS) - SET(CPUINFO_MOCK_SRCS "${CPUINFO_SRCS}") -- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") -+ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") - LIST(APPEND CPUINFO_MOCK_SRCS src/x86/mockcpuid.c) - ENDIF() - IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android") -@@ -763,7 +763,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_UNIT_TESTS) - ADD_TEST(get-current-test get-current-test) - ENDIF() - -- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") -+ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") - ADD_EXECUTABLE(brand-string-test test/name/brand-string.cc) - CPUINFO_TARGET_ENABLE_CXX11(brand-string-test) - CPUINFO_TARGET_RUNTIME_LIBRARY(brand-string-test) -@@ -830,7 +830,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM AND CPUINFO_BUILD_TOOLS) - CPUINFO_TARGET_RUNTIME_LIBRARY(cpuinfo-dump) - ENDIF() - -- IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86_64)$") -+ IF(CPUINFO_TARGET_PROCESSOR MATCHES "^(i[3-6]86|AMD64|x86(_64)?)$") - ADD_EXECUTABLE(cpuid-dump tools/cpuid-dump.c) - CPUINFO_TARGET_ENABLE_C99(cpuid-dump) - CPUINFO_TARGET_RUNTIME_LIBRARY(cpuid-dump) -@@ -869,4 +869,3 @@ IF(CPUINFO_BUILD_PKG_CONFIG) - DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - - ENDIF() -- diff --git a/ports/cpuinfo/portfile.cmake b/ports/cpuinfo/portfile.cmake index d992673358b266..0065691ade1c21 100644 --- a/ports/cpuinfo/portfile.cmake +++ b/ports/cpuinfo/portfile.cmake @@ -6,11 +6,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pytorch/cpuinfo - REF b40bae27785787b6dd70788986fd96434cf90ae2 - SHA512 dbbe4f3e1d5ae74ffc8ba2cba0ab745a23f4993788f4947825ef5125dd1cbed3e13e0c98e020e6fcfa9879f54f06d7cba4de73ec29f77649b6a27b4ab82c8f1c + REF 5e63739504f0f8e18e941bd63b2d6d42536c7d90 + SHA512 6a61f4574661a55771c2ec31bb0919a51d0bd8c770477b254a5c14dc5323716af275c7fe3abc5aa96720d7cc929559ca66f614265d3940e076b8db2fa15c8e36 HEAD_REF master - PATCHES - check-for-x86-correctly.patch # https://github.com/pytorch/cpuinfo/pull/93 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/cpuinfo/vcpkg.json b/ports/cpuinfo/vcpkg.json index cc1c3159cb23f4..d2087dfbc5ae35 100644 --- a/ports/cpuinfo/vcpkg.json +++ b/ports/cpuinfo/vcpkg.json @@ -1,11 +1,10 @@ { "name": "cpuinfo", - "version-date": "2022-04-02", - "port-version": 1, + "version-date": "2022-07-19", "description": "CPU INFOrmation library (x86/x86-64/ARM/ARM64, Linux/Windows/Android/macOS/iOS)", "homepage": "https://github.com/pytorch/cpuinfo", "license": "BSD-2-Clause", - "supports": "!(arm & windows)", + "supports": "!(uwp & arm32)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index c4885d296e284f..43b3a9e0983b7d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1693,8 +1693,8 @@ "port-version": 3 }, "cpuinfo": { - "baseline": "2022-04-02", - "port-version": 1 + "baseline": "2022-07-19", + "port-version": 0 }, "cr": { "baseline": "2020-04-26", diff --git a/versions/c-/cpuinfo.json b/versions/c-/cpuinfo.json index 485dd2a03d0651..0215d34e3c071c 100644 --- a/versions/c-/cpuinfo.json +++ b/versions/c-/cpuinfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ee1eff9fe6cfa584b697e71ce7081a69ef2c51d", + "version-date": "2022-07-19", + "port-version": 0 + }, { "git-tree": "11ac581a5c1307b2039cf9db3933c2aeffb7a923", "version-date": "2022-04-02", From 66045de4dcc5da3d1029c02b606307f5951dcb22 Mon Sep 17 00:00:00 2001 From: David Garske Date: Fri, 29 Jul 2022 21:33:04 -0700 Subject: [PATCH 251/791] [wolfSSL] update version to v5.4.0 AND [wolfTPM] update version to v2.5.0 AND [wolfMQTT] update version to v1.14.0 (#25936) * wolfSSL release updates for wolfTPM v2.5.0, wolfSSL v5.4.0 and wolfMQTT v1.14.0. * Fixes for wolfSSL, wolfTPM and wolfMQTT for CMake issues. --- ports/wolfmqtt/portfile.cmake | 6 ++-- ports/wolfmqtt/vcpkg.json | 4 +-- ports/wolfmqtt/wolfmqtt_pr305.diff | 55 ++++++++++++++++++++++++++++++ ports/wolfssl/portfile.cmake | 6 ++-- ports/wolfssl/vcpkg.json | 4 +-- ports/wolfssl/wolfssl_pr5401.diff | 17 +++++++++ ports/wolftpm/portfile.cmake | 7 ++-- ports/wolftpm/vcpkg.json | 4 +-- ports/wolftpm/wolftpm_pr235.diff | 30 ++++++++++++++++ versions/baseline.json | 6 ++-- versions/w-/wolfmqtt.json | 5 +++ versions/w-/wolfssl.json | 5 +++ versions/w-/wolftpm.json | 5 +++ 13 files changed, 139 insertions(+), 15 deletions(-) create mode 100644 ports/wolfmqtt/wolfmqtt_pr305.diff create mode 100644 ports/wolfssl/wolfssl_pr5401.diff create mode 100644 ports/wolftpm/wolftpm_pr235.diff diff --git a/ports/wolfmqtt/portfile.cmake b/ports/wolfmqtt/portfile.cmake index a8d47137a871f0..50c04a2cb75040 100644 --- a/ports/wolfmqtt/portfile.cmake +++ b/ports/wolfmqtt/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfmqtt - REF v1.13.0 - SHA512 2bd05471c548bacf6fc5166d9c2ee546b3ce5c4fab89ff16175de9ab7696b8b570cdd7d4377378fc0cb579447488dbf727cb938192eb3180ed007414cb949a8a + REF v1.14.0 + SHA512 9449d87c543e823b3517a4605343a92207499812e75c950a2e8fb3d969333d39579dac69657e298826ba65017a8208c28934d7c6a4abbb4bf308514047273191 HEAD_REF master + PATCHES + wolfmqtt_pr305.diff ) vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/wolfmqtt/vcpkg.json b/ports/wolfmqtt/vcpkg.json index a148d4a72cabe7..b484d91f04beec 100644 --- a/ports/wolfmqtt/vcpkg.json +++ b/ports/wolfmqtt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wolfmqtt", - "version": "1.13.0", - "description": "MQTT library used with wolfSSL libraray for many platforms", + "version": "1.14.0", + "description": "MQTT library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", "supports": "!uwp", diff --git a/ports/wolfmqtt/wolfmqtt_pr305.diff b/ports/wolfmqtt/wolfmqtt_pr305.diff new file mode 100644 index 00000000000000..76912c7f903cc8 --- /dev/null +++ b/ports/wolfmqtt/wolfmqtt_pr305.diff @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5f0f408..a436f51c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,6 +94,11 @@ target_compile_definitions(wolfmqtt PRIVATE + "BUILDING_WOLFMQTT" + ) + ++ # Tell mqtt_types.h we are using a ./configure like output / options.h ++target_compile_definitions(wolfmqtt PRIVATE ++ "BUILDING_CMAKE" ++ ) ++ + #TODO generate options file + configure_file(wolfmqtt/options.h.in wolfmqtt/options.h) + +diff --git a/wolfmqtt/mqtt_types.h b/wolfmqtt/mqtt_types.h +index f8e8f4d7..f7e33280 100644 +--- a/wolfmqtt/mqtt_types.h ++++ b/wolfmqtt/mqtt_types.h +@@ -65,7 +65,8 @@ + #endif + + #ifdef ENABLE_MQTT_TLS +- #if !defined(WOLFSSL_USER_SETTINGS) && !defined(USE_WINDOWS_API) ++ #if !defined(WOLFSSL_USER_SETTINGS) && \ ++ (!defined(USE_WINDOWS_API) || defined(BUILDING_CMAKE)) + #include + #endif + #include +diff --git a/wolfmqtt/vs_settings.h b/wolfmqtt/vs_settings.h +index a385c4e0..9d8231a0 100644 +--- a/wolfmqtt/vs_settings.h ++++ b/wolfmqtt/vs_settings.h +@@ -4,8 +4,9 @@ + #ifndef _WOLFMQTT_VS_SETTINGS_ + #define _WOLFMQTT_VS_SETTINGS_ + +-/* Don't include this if using autoconf cross-compile */ +-#ifndef HAVE_CONFIG_H ++/* Don't include this if using autoconf cross-compile or cmake */ ++#if !defined(HAVE_CONFIG_H) && !defined(BUILDING_CMAKE) ++ + + /* TLS Support */ + #undef ENABLE_MQTT_TLS +@@ -58,6 +59,7 @@ + #undef WOLFMQTT_NO_ERROR_STRINGS + //#define WOLFMQTT_NO_ERROR_STRINGS + +-#endif /* !HAVE_CONFIG_H */ ++ ++#endif /* !HAVE_CONFIG_H && !BUILDING_CMAKE */ + + #endif /* _WOLFMQTT_VS_SETTINGS_ */ diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index 00faef9dbd45cd..3960262d32092f 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfssl - REF v5.3.0-stable - SHA512 399d2b8aad58471d237d21dea68c33fde2b9a3c117c554c241d9174db02847a6c31afae2908839d18f9ada317b2388560a24c077b76014f663227061342bf045 + REF v5.4.0-stable + SHA512 e43560f83f6c62d78b10c4df7db21f02386f22b893688b98d2f3432e3b3946a4e80960c7402404a8c0486c87b1dde5b7a3827f9d4d3be13f87f370dfc1179c78 HEAD_REF master + PATCHES + wolfssl_pr5401.diff ) vcpkg_cmake_configure( diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 048f6f0c46c05e..08fbde2e605369 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wolfssl", - "version": "5.3.0", - "description": "TLS and Cryptographic libraray for many platforms", + "version": "5.4.0", + "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", "supports": "!uwp", diff --git a/ports/wolfssl/wolfssl_pr5401.diff b/ports/wolfssl/wolfssl_pr5401.diff new file mode 100644 index 00000000000000..99919488bc7fc7 --- /dev/null +++ b/ports/wolfssl/wolfssl_pr5401.diff @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2da855cce3..467f4b79725 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2044,7 +2044,11 @@ endif() + + if(NOT BUILD_SP) + list(APPEND HEADER_EXCLUDE +- "wolfssl/wolfcrypt/sp.h" ++ "wolfssl/wolfcrypt/sp.h") ++endif() ++ ++if(NOT BUILD_SP_INT) ++ list(APPEND HEADER_EXCLUDE + "wolfssl/wolfcrypt/sp_int.h") + endif() + diff --git a/ports/wolftpm/portfile.cmake b/ports/wolftpm/portfile.cmake index e43b43fe859c07..b2c4c12f7b990a 100644 --- a/ports/wolftpm/portfile.cmake +++ b/ports/wolftpm/portfile.cmake @@ -1,14 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolftpm - REF v2.4.0 - SHA512 82aa43f8773cc230d403d7e6cdbc4dc7dc8a3cb8e2f942c810a5ef0d60647d288ce82910820127ed6e67771d3900cfc55c5f9d87b722e0847bcb6a81c4e41441 + REF v2.5.0 + SHA512 4047671171fda4115a4e94bbd2362642752efbaf30531b1f55f6fe66e2e90bdf3b5549c6ddf4e53dce3b6f44c59e792217b2be4c5650857d28193aa5466919fc HEAD_REF master + PATCHES + wolftpm_pr235.diff ) vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} OPTIONS -DWOLFTPM_EXAMPLES=no + -DWOLFTPM_BUILD_OUT_OF_TREE=yes OPTIONS_DEBUG -DCMAKE_C_FLAGS='-DDEBUG_WOLFTPM' ) diff --git a/ports/wolftpm/vcpkg.json b/ports/wolftpm/vcpkg.json index 839a4a8a10c762..53f75a7f56c6a6 100644 --- a/ports/wolftpm/vcpkg.json +++ b/ports/wolftpm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wolftpm", - "version": "2.4.0", - "description": "TPM library used with wolfSSL libraray for many platforms", + "version": "2.5.0", + "description": "TPM library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", "supports": "!uwp", diff --git a/ports/wolftpm/wolftpm_pr235.diff b/ports/wolftpm/wolftpm_pr235.diff new file mode 100644 index 00000000000000..de283bbd841273 --- /dev/null +++ b/ports/wolftpm/wolftpm_pr235.diff @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d642a06..157b000 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -194,7 +194,24 @@ endfunction() + add_definitions(${WOLFTPM_DEFINITIONS}) + + # generate options file +-set(OPTION_FILE "wolftpm/options.h") ++message("Generating user options header...") ++if (${CMAKE_DISABLE_SOURCE_CHANGES}) ++ set(WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT "${CMAKE_DISABLE_SOURCE_CHANGES}") ++else() ++ set(WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT "no") ++endif() ++ ++set(WOLFTPM_BUILD_OUT_OF_TREE "${WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT}" CACHE STRING ++ "Don't generate files in the source tree (default: ${WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT})") ++set_property(CACHE WOLFTPM_BUILD_OUT_OF_TREE ++ PROPERTY STRINGS "yes;no") ++ ++if (${WOLFTPM_BUILD_OUT_OF_TREE}) ++ set(WOLFTPM_OUTPUT_BASE ${CMAKE_CURRENT_BINARY_DIR}) ++else() ++ set(WOLFTPM_OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR}) ++endif() ++set(OPTION_FILE "${WOLFTPM_OUTPUT_BASE}/wolftpm/options.h") + + file(REMOVE ${OPTION_FILE}) + diff --git a/versions/baseline.json b/versions/baseline.json index 43b3a9e0983b7d..d87cd72ec1dce8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7629,15 +7629,15 @@ "port-version": 3 }, "wolfmqtt": { - "baseline": "1.13.0", + "baseline": "1.14.0", "port-version": 0 }, "wolfssl": { - "baseline": "5.3.0", + "baseline": "5.4.0", "port-version": 0 }, "wolftpm": { - "baseline": "2.4.0", + "baseline": "2.5.0", "port-version": 0 }, "wordnet": { diff --git a/versions/w-/wolfmqtt.json b/versions/w-/wolfmqtt.json index 33d661bbec711c..88cf513fa07ae2 100644 --- a/versions/w-/wolfmqtt.json +++ b/versions/w-/wolfmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cc2bb0123d6f9ea038bf52190ba1c6c2154b02b", + "version": "1.14.0", + "port-version": 0 + }, { "git-tree": "bc6b26e4254f8938dc9db7f7b5dc84958a45c877", "version": "1.13.0", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index e5cba80c29da93..f6a83731b2ac29 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b522a6326a126579cee52953fe42f597f301a22", + "version": "5.4.0", + "port-version": 0 + }, { "git-tree": "4dee782f3dda81bc4a72959bcda6d1377a24cbaa", "version": "5.3.0", diff --git a/versions/w-/wolftpm.json b/versions/w-/wolftpm.json index 31f2abb4a92aad..034c61d2fa6d42 100644 --- a/versions/w-/wolftpm.json +++ b/versions/w-/wolftpm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80998c4f2e20341ac7195103ba9581a8c8e0cd68", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "647740c5ad277ccf2d910605595118087f3bc342", "version": "2.4.0", From dca98e49d23ddf3ff3b8f33273b87fdb43957d95 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 1 Aug 2022 18:47:25 +0200 Subject: [PATCH 252/791] [Ixwebsocket] Update to 11.4.3 (#26078) * [ixwebsocket] Update to 11.4.3 * version --- ports/ixwebsocket/portfile.cmake | 11 +++++------ ports/ixwebsocket/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/ixwebsocket.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/ixwebsocket/portfile.cmake b/ports/ixwebsocket/portfile.cmake index 83ebf1bd1e032d..57a2b2c570ad6e 100644 --- a/ports/ixwebsocket/portfile.cmake +++ b/ports/ixwebsocket/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO machinezone/IXWebSocket - REF 2f560ff4c07e5446f2539505cb4f64f80b54ca8e #v11.4.2 - SHA512 afa19cc161b9e49eafacc113583bbf68a34d83a9535c5c4f1f1cd57f943a5ad91c3117c0e2b47b2975a65f0284aec1200f6f8f5768afa7d6aebcbb823934036a + REF v11.4.3 + SHA512 6db4f05b3a73aa5f6efdb6d4692d9f9665b14c3a6e4837ff6b2719d9261aa660166fd4ddf99ca8e6804202d6f71c399fe1c223932493ea8db0a73752cb5b8e97 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -21,10 +21,10 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} - -DUSE_TLS=1 + ${FEATURE_OPTIONS} + -DUSE_TLS=1 MAYBE_UNUSED_VARIABLES - USE_SECURE_TRANSPORT + USE_SECURE_TRANSPORT ) vcpkg_cmake_install() @@ -33,5 +33,4 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ixwebsocket/vcpkg.json b/ports/ixwebsocket/vcpkg.json index 870cf5ddff9076..4d7808ac636d99 100644 --- a/ports/ixwebsocket/vcpkg.json +++ b/ports/ixwebsocket/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ixwebsocket", - "version-semver": "11.4.2", + "version-semver": "11.4.3", "description": "Lightweight WebSocket Client and Server + HTTP Client and Server", "homepage": "https://github.com/machinezone/IXWebSocket", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d87cd72ec1dce8..72034428f0f512 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3065,7 +3065,7 @@ "port-version": 8 }, "ixwebsocket": { - "baseline": "11.4.2", + "baseline": "11.4.3", "port-version": 0 }, "jack2": { diff --git a/versions/i-/ixwebsocket.json b/versions/i-/ixwebsocket.json index 622ecc16151c36..0c4f7fde889527 100644 --- a/versions/i-/ixwebsocket.json +++ b/versions/i-/ixwebsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5abcb4348cb05507367eeaac8fb075c5cf8ed35", + "version-semver": "11.4.3", + "port-version": 0 + }, { "git-tree": "35c2086eecc92cd95482b875fd1ec843eb233f94", "version-semver": "11.4.2", From c256a8e1e78a65ddb7ea43f9afcea8d0b03d3a3e Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Mon, 1 Aug 2022 18:52:21 +0200 Subject: [PATCH 253/791] [c9y] update to version 0.4.0 (#26071) * [c9y] Updates to version 0.4.0 * [c9y] Update baseline and versions. --- ports/c9y/portfile.cmake | 4 ++-- ports/c9y/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/c9y.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/c9y/portfile.cmake b/ports/c9y/portfile.cmake index 42f281d8c7bf4a..0b44fd3a401858 100644 --- a/ports/c9y/portfile.cmake +++ b/ports/c9y/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rioki/c9y - REF v0.3.0 - SHA512 9d105f5d8f93856d6104663704944e0456c779c9ae6469d4ad9a40f6e451065376a44e4efb61c2e0b5e79cb2f3ae78de72209b6668d56d7df7992275f2168336 + REF v0.4.0 + SHA512 496466a639fa1f4111583363ce13ce4f2c1d6a56763fd12f45acc2cb791f379a6d81545536186e8f0f72f19a9b5689d16fd0561345411ca1cb98a16447141114 ) vcpkg_cmake_configure( diff --git a/ports/c9y/vcpkg.json b/ports/c9y/vcpkg.json index ebeff761000095..a0f025b334b9ed 100644 --- a/ports/c9y/vcpkg.json +++ b/ports/c9y/vcpkg.json @@ -1,6 +1,6 @@ { "name": "c9y", - "version-semver": "0.3.0", + "version-semver": "0.4.0", "description": "Concurency", "homepage": "https://github.com/rioki/c9y", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 72034428f0f512..cdbee196a2b4c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1237,7 +1237,7 @@ "port-version": 0 }, "c9y": { - "baseline": "0.3.0", + "baseline": "0.4.0", "port-version": 0 }, "caf": { diff --git a/versions/c-/c9y.json b/versions/c-/c9y.json index 62647f3068e360..5a4f3d9908357a 100644 --- a/versions/c-/c9y.json +++ b/versions/c-/c9y.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7664032e69d86b58605c20e353af75d9961d10d8", + "version-semver": "0.4.0", + "port-version": 0 + }, { "git-tree": "5964f7fa10d83aa2d1a01ec7c64bd9b64f25f6a6", "version-semver": "0.3.0", From cadfaa5a2206ef727755cad60fe562ebb4eff212 Mon Sep 17 00:00:00 2001 From: Matthieu Penant Date: Mon, 1 Aug 2022 12:53:39 -0400 Subject: [PATCH 254/791] [protobuf] update to 3.21.4 (#26061) * [protobuf] update at 3.21.4 * Update protobuf.json --- ports/protobuf/portfile.cmake | 6 +++--- ports/protobuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 06c1fb170cae55..ebf240d7370d2a 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -1,10 +1,10 @@ -set(version 3.21.3) +set(version 3.21.4) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF b1eb1260fce7308081822413a0cba77365e7a6ab #v3.21.3 - SHA512 71bdd8e997fdb7d3f8ef6f4f5ac79a69b84283f8e7962809b64aab6778ec6f7051c52af8b1501ec78c63edfe668af4bed43bfc132e17baa8d8e465c0d5a5d770 + REF c9869dc7803eb0a21d7e589c40ff4f9288cd34ae #v3.21.4 + SHA512 99f90020bfc21f717341cf88b43950ede4ba4bd75357397eb2517cb4f6699ae88dcabd65e666df7321b9ba5203b18603fa1c4e97d924aa7978b1ba6b63216fbb HEAD_REF master PATCHES fix-static-build.patch diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 5daa0d9bd9b7c3..9b341c1a03f986 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "protobuf", - "version": "3.21.3", + "version": "3.21.4", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index cdbee196a2b4c4..a741231763b3cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5665,7 +5665,7 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.21.3", + "baseline": "3.21.4", "port-version": 0 }, "protobuf-c": { diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index fa0f24b2719ab5..efed0c5b4b0b71 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b66573195da9e32b3396e253b520ad498617405b", + "version": "3.21.4", + "port-version": 0 + }, { "git-tree": "3ed82c1c5eef7b766d472f71c5ccebcff30cb7bd", "version": "3.21.3", From cf5979b735edab3606a64b3bdf7f4b6a64e06470 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Mon, 1 Aug 2022 12:56:24 -0400 Subject: [PATCH 255/791] [z3] Update to v4.10.2 (#25954) * [z3] Update to v4.10.2 * Update version --- ports/z3/portfile.cmake | 4 ++-- ports/z3/remove-flag-overrides.patch | 2 +- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index b9d724e051a79c..72300e5d099958 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.9.1 - SHA512 0c44e10d039c3bf16591a7b94e3a3209bc334635106ac7ae4afda95541d13d4fc39214646662683c26b4874846e0d83813215e189ce5422d13f8ce7c2ac4db51 + REF z3-4.10.2 + SHA512 d0e54036d403d124a7bbf4cf8de9fd9159bab5151f875b546474563811dfb259bc46650df950802031a180375745fb589acbc79d0065944f0631df378dd6d0c3 HEAD_REF master PATCHES fix-install-path.patch diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index ebf6c028d49139..ed4969f1941933 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -7,6 +7,6 @@ index 477410ba8..fcca03917 100644 cmake_minimum_required(VERSION 3.4) -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.9.1.0 LANGUAGES CXX) + project(Z3 VERSION 4.10.2.0 LANGUAGES CXX) ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 10cd07298ae717..6709dea907cbbb 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.9.1", + "version": "4.10.2", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a741231763b3cd..14f768f89a650e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7813,7 +7813,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.9.1", + "baseline": "4.10.2", "port-version": 0 }, "z85": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 53c388f2b59e51..6abbd24502367e 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa0794e55ef223e835ae4dd228e3986d83be4843", + "version": "4.10.2", + "port-version": 0 + }, { "git-tree": "c934af0db69ef3b1bacc4bf5a72b5d901aaf1136", "version": "4.9.1", From 21feabf8fe04f1497f8d42659d46c1b7e19b86b9 Mon Sep 17 00:00:00 2001 From: jureviciusr Date: Mon, 1 Aug 2022 18:58:22 +0200 Subject: [PATCH 256/791] [dv-processing] Update to latest version (#25992) * [dv-processing] version update to 1.5 * [dv-processing] version update * Removing port version * Version bump Co-authored-by: Rokas Jurevicius --- ports/dv-processing/portfile.cmake | 9 ++- ports/dv-processing/vcpkg-build.patch | 84 --------------------------- ports/dv-processing/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/d-/dv-processing.json | 5 ++ 5 files changed, 12 insertions(+), 93 deletions(-) delete mode 100644 ports/dv-processing/vcpkg-build.patch diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake index cf9971f31456e0..bf1e82673ba456 100644 --- a/ports/dv-processing/portfile.cmake +++ b/ports/dv-processing/portfile.cmake @@ -2,11 +2,9 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com/inivation OUT_SOURCE_PATH SOURCE_PATH REPO dv/dv-processing - REF rel_1.4 - SHA512 c011ca0e6d9842913ff35b0a03f9053bfbc98c090b6936e01f6514b8a35d31ee6d0a821f491be96400113e93967aa2d3e8ab19e558f5c3e9f8eba9ad4e1fe013 - HEAD_REF d4ffab46a2849372789c5a2084821011165086ab - PATCHES - vcpkg-build.patch + REF 96d082a862bb1e5bfdc79b39aa09e7a50c2dac49 + SHA512 cf74e8a6f94f690e159778b59eb2e4d9c8f51f09437e94a507a2ec8f42e167fe6d1413ba91ab608624a02b4b479b27f454e7b7792d125ce5a163f4aa98e774cc + HEAD_REF rel_1.5 ) vcpkg_from_gitlab( @@ -27,6 +25,7 @@ vcpkg_cmake_configure( -DENABLE_TESTS=OFF -DENABLE_SAMPLES=OFF -DENABLE_PYTHON=OFF + -DENABLE_UTILITIES=OFF -DBUILD_CONFIG_VCPKG=ON ) diff --git a/ports/dv-processing/vcpkg-build.patch b/ports/dv-processing/vcpkg-build.patch deleted file mode 100644 index 7a9f10636c98a3..00000000000000 --- a/ports/dv-processing/vcpkg-build.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c7775b5..acf6208 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,11 +27,15 @@ IF(Git_FOUND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") - ENDIF() - ENDIF() - -+OPTION(BUILD_CONFIG_VCPKG "Set build environment compatible with VCPKG" OFF) -+ - # Basic setup, useful variables, see docs. - SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmakemod ${CMAKE_MODULE_PATH}) - SET(ENABLE_ALL_WARNINGS ON CACHE BOOL "Turn on all warnings for build" FORCE) - INCLUDE(inivation-setup) - -+# Skip compiler compatibility checks when doing the VCPKG build -+if(NOT BUILD_CONFIG_VCPKG) - # Compiler compatibility testing starts GCC has to be at least version 10 - IF(CC_GCC AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "10.0.0") - MESSAGE( -@@ -56,6 +60,7 @@ IF(NOT CC_GCC AND NOT CC_GCC) - ) - ENDIF() - # Compiler compatibility testing ends -+ENDIF() - - # Boost support. Search in extra directory for custom version. - IF(EXISTS /opt/inivation/boost/) -@@ -87,7 +92,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.in ${CMAKE_CURRENT - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - - # Cmake find_package() support. --IF(CC_MSVC) -+IF(BUILD_CONFIG_VCPKG) - SET(CMAKE_EXPORT_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) - ELSE() - SET(CMAKE_EXPORT_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) -@@ -103,8 +108,13 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake - ${CMAKE_CURRENT_SOURCE_DIR}/cmakemod/inivation-setup.cmake DESTINATION ${CMAKE_EXPORT_DESTINATION}) - --# External libraries to build --ADD_SUBDIRECTORY(tests/external/cli11) -+IF (BUILD_CONFIG_VCPKG) -+ # Find CLI11 as an installed package -+ FIND_PACKAGE(CLI11 CONFIG REQUIRED) -+ELSE() -+ # External CLI11 checked-out as a submodule -+ ADD_SUBDIRECTORY(tests/external/cli11) -+ENDIF() - - # Install header files. - ADD_SUBDIRECTORY(include) -diff --git a/dv-processing-config.cmake.in b/dv-processing-config.cmake.in -index 4dbf635..5557dd2 100644 ---- a/dv-processing-config.cmake.in -+++ b/dv-processing-config.cmake.in -@@ -53,10 +53,9 @@ CHECK_REQUIRED_COMPONENTS(dv-processing) - # properly. - INCLUDE(@PACKAGE_CMAKE_EXPORT_DESTINATION@/inivation-setup.cmake) - --# MSVC/VCPKG finds this differently. --IF(CC_MSVC) -- FIND_PACKAGE(lz4 CONFIG REQUIRED) --ENDIF() -+# MSVC/VCPKG finds this differently, try to find it quietly, so it does not complain on non-vcpkg installations -+# and find the package correctly when used with VCPKG. -+FIND_PACKAGE(lz4 CONFIG QUIET) - - # Compiler compatibility testing starts GCC has to be at least version 10 - IF(CC_GCC AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "10.0.0") -diff --git a/include/dv-processing/CMakeLists.txt b/include/dv-processing/CMakeLists.txt -index b83f4e4..621b3f2 100644 ---- a/include/dv-processing/CMakeLists.txt -+++ b/include/dv-processing/CMakeLists.txt -@@ -23,7 +23,7 @@ IF(CC_MSVC) - ENDIF() - - # Compression support --IF(CC_MSVC) -+IF(BUILD_CONFIG_VCPKG) - FIND_PACKAGE(lz4 CONFIG REQUIRED) - TARGET_LINK_LIBRARIES(processing INTERFACE lz4::lz4) - ELSE() diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json index 6311f5505fcee1..f5fee4d848c15f 100644 --- a/ports/dv-processing/vcpkg.json +++ b/ports/dv-processing/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dv-processing", - "version": "1.4.0", - "port-version": 1, + "version": "1.5.0", "description": "Generic algorithms for event cameras.", "homepage": "https://gitlab.com/inivation/dv/dv-processing", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 14f768f89a650e..3a293c39059f7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2009,8 +2009,8 @@ "port-version": 2 }, "dv-processing": { - "baseline": "1.4.0", - "port-version": 1 + "baseline": "1.5.0", + "port-version": 0 }, "dx": { "baseline": "1.0.1", diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json index b56c98216033df..6cdb930816c49c 100644 --- a/versions/d-/dv-processing.json +++ b/versions/d-/dv-processing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e45cf567d2617df07999f47cff84636f513a0c1c", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "d46e8c68fbd834385ac3fa859b35e72cb5bc8648", "version": "1.4.0", From 5c65160378f92f4f280d3bd1a7bdd46cc424b587 Mon Sep 17 00:00:00 2001 From: Gregory Popovitch Date: Mon, 1 Aug 2022 14:13:41 -0400 Subject: [PATCH 257/791] [gtl] update version to v1.1.2 (#26084) * [gtl] Update version to v1.1.2 * commit result of running `vcpkg add-version` * update gtl.json update gtl.json * update version * Add homepage * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/gtl/portfile.cmake | 8 ++++++-- ports/gtl/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/gtl.json | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/gtl/portfile.cmake b/ports/gtl/portfile.cmake index ed16730c14f71f..ac553fecbda12b 100644 --- a/ports/gtl/portfile.cmake +++ b/ports/gtl/portfile.cmake @@ -3,14 +3,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/gtl - REF 1.00 - SHA512 842a5e2634919a04fdd87995a8ada2f949c51a070a7c175043e0f9105a93248325023f85b28f9406276c2912a0fb4015a2e9ba30113d4a0214492da0dc5e5716 + REF v1.1.2 + SHA512 f609b965826f738592d85b015c3a5d29830cebc457e21987aaa69ab0fc4336adfd69538d81bd8b46c9467a449d7c25dd92fd3fa0ec86e68e423a4abf2bafa517 HEAD_REF main ) # Use greg7mdp/gtl's own build process, skipping examples and tests vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGTL_BUILD_TESTS=OFF + -DGTL_BUILD_EXAMPLES=OFF + -DGTL_BUILD_BENCHMARKS=OFF ) vcpkg_cmake_install() diff --git a/ports/gtl/vcpkg.json b/ports/gtl/vcpkg.json index b6b93c45f4392d..12a1347cb4eaf0 100644 --- a/ports/gtl/vcpkg.json +++ b/ports/gtl/vcpkg.json @@ -1,7 +1,8 @@ { "name": "gtl", - "version": "1.0.0", + "version": "1.1.2", "description": "Greg's Template Library of useful classes.", + "homepage": "https://github.com/greg7mdp/gtl", "license": "Apache-2.0", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 3a293c39059f7b..09da4b3ba5eea7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2737,7 +2737,7 @@ "port-version": 0 }, "gtl": { - "baseline": "1.0.0", + "baseline": "1.1.2", "port-version": 0 }, "gts": { diff --git a/versions/g-/gtl.json b/versions/g-/gtl.json index 5776144adfa1b4..8268ef67001dff 100644 --- a/versions/g-/gtl.json +++ b/versions/g-/gtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45ab838bcba517295403cbd3d619f7cedca27346", + "version": "1.1.2", + "port-version": 0 + }, { "git-tree": "52665bb6e7f0bbe30ffabc59521a937072ecc9e2", "version": "1.0.0", From 692304eda94362c793f0cfcab74e506d2097b28f Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 20:17:11 +0200 Subject: [PATCH 258/791] [apr-util] unglue macro (#26093) * apr-util unglue macro * v db --- ports/apr-util/portfile.cmake | 1 + ports/apr-util/unglue.patch | 17 +++++++++++++++++ ports/apr-util/vcpkg.json | 3 ++- versions/a-/apr-util.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 ports/apr-util/unglue.patch diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake index d50966c4e761b6..6cafce46626e4e 100644 --- a/ports/apr-util/portfile.cmake +++ b/ports/apr-util/portfile.cmake @@ -12,6 +12,7 @@ if(VCPKG_TARGET_IS_WINDOWS) PATCHES use-vcpkg-expat.patch apr.patch + unglue.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) diff --git a/ports/apr-util/unglue.patch b/ports/apr-util/unglue.patch new file mode 100644 index 00000000000000..5391a7cb0e8184 --- /dev/null +++ b/ports/apr-util/unglue.patch @@ -0,0 +1,17 @@ +diff --git a/include/apu_version.h b/include/apu_version.h +index e4fb2e64e..c6addf142 100644 +--- a/include/apu_version.h ++++ b/include/apu_version.h +@@ -98,9 +98,9 @@ + + /** An alternative formatted string of APR's version */ + /* macro for Win32 .rc files using numeric csv representation */ +-#define APU_VERSION_STRING_CSV APU_MAJOR_VERSION ##, \ +- ##APU_MINOR_VERSION ##, \ +- ##APU_PATCH_VERSION ++#define APU_VERSION_STRING_CSV APU_MAJOR_VERSION , \ ++ APU_MINOR_VERSION , \ ++ APU_PATCH_VERSION + + + #ifndef APU_VERSION_ONLY diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json index 0dbff727e0cade..4b623c0161c2cb 100644 --- a/ports/apr-util/vcpkg.json +++ b/ports/apr-util/vcpkg.json @@ -1,9 +1,10 @@ { "name": "apr-util", "version": "1.6.1", - "port-version": 7, + "port-version": 8, "description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation", "homepage": "https://apr.apache.org/", + "license": "Apache-2.0", "dependencies": [ "apr", "expat", diff --git a/versions/a-/apr-util.json b/versions/a-/apr-util.json index 7eaa48d2048327..e71d874adfe42e 100644 --- a/versions/a-/apr-util.json +++ b/versions/a-/apr-util.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e11acd0b01edac0a064893b89bd9eb2d976f4371", + "version": "1.6.1", + "port-version": 8 + }, { "git-tree": "d758cde4c829f6c3a66a773d517f9e9425227629", "version": "1.6.1", diff --git a/versions/baseline.json b/versions/baseline.json index 09da4b3ba5eea7..2bd14364113bf0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -122,7 +122,7 @@ }, "apr-util": { "baseline": "1.6.1", - "port-version": 7 + "port-version": 8 }, "apsi": { "baseline": "0.8.2", From 48e128816e5395d97efcf78f3c29fb9ee6b21c52 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 21:12:14 +0200 Subject: [PATCH 259/791] [cpprestsdk] Fix narrowing and remove werror (#26095) * cpprestsdk fix narrowing and werror * v db --- ports/cpprestsdk/fix_narrowing.patch | 50 ++++++++++++++++++++++++++++ ports/cpprestsdk/portfile.cmake | 4 ++- ports/cpprestsdk/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/c-/cpprestsdk.json | 5 +++ 5 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 ports/cpprestsdk/fix_narrowing.patch diff --git a/ports/cpprestsdk/fix_narrowing.patch b/ports/cpprestsdk/fix_narrowing.patch new file mode 100644 index 00000000000000..975a759ca96e0c --- /dev/null +++ b/ports/cpprestsdk/fix_narrowing.patch @@ -0,0 +1,50 @@ +diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt +index e15aeb7fc..128f6d6af 100644 +--- a/Release/src/CMakeLists.txt ++++ b/Release/src/CMakeLists.txt +@@ -185,12 +185,12 @@ endif() + + configure_pch(cpprest stdafx.h pch/stdafx.cpp /Zm120) + +-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") ++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT MSVC) + if(WERROR) + target_compile_options(cpprest PRIVATE -Werror) + endif() + target_compile_options(cpprest PRIVATE -pedantic ${WARNINGS}) +-elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") ++elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT MATCHES "MSVC") + if(WERROR) + target_compile_options(cpprest PRIVATE /WX ${WARNINGS}) + endif() +diff --git a/Release/src/streams/fileio_win32.cpp b/Release/src/streams/fileio_win32.cpp +index 057dd9b67..a65439cb7 100644 +--- a/Release/src/streams/fileio_win32.cpp ++++ b/Release/src/streams/fileio_win32.cpp +@@ -616,7 +616,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo, + // pending + return read; + +- case (-1): ++ case ((size_t)(-1)): + // error + delete cb; + return read; +@@ -668,7 +668,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo, + // pending + return read; + +- case (-1): ++ case ((size_t)(-1)): + // error + delete cb; + return read; +@@ -719,7 +719,7 @@ size_t _fill_buffer_fsb(_In_ _file_info_impl* fInfo, + // pending + return read; + +- case (-1): ++ case ((size_t)(-1)): + // error + delete cb; + return read; diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake index 666cb1c0b89a6c..237df1a402be6a 100644 --- a/ports/cpprestsdk/portfile.cmake +++ b/ports/cpprestsdk/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF 122d09549201da5383321d870bed45ecb9e168c5 SHA512 c9ded33d3c67880e2471e479a38b40a14a9ff45d241e928b6339eca697b06ad621846260eca47b6b1b8a2bc9ab7bf4fea8d3e8e795cd430d8839beb530e16dd7 HEAD_REF master - PATCHES fix-find-openssl.patch + PATCHES + fix-find-openssl.patch + fix_narrowing.patch ) set(OPTIONS) diff --git a/ports/cpprestsdk/vcpkg.json b/ports/cpprestsdk/vcpkg.json index 3a4610ef7a2c3e..eca5412f76602b 100644 --- a/ports/cpprestsdk/vcpkg.json +++ b/ports/cpprestsdk/vcpkg.json @@ -1,12 +1,13 @@ { "name": "cpprestsdk", "version": "2.10.18", - "port-version": 1, + "port-version": 2, "description": [ "C++11 JSON, REST, and OAuth library", "The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services." ], "homepage": "https://github.com/Microsoft/cpprestsdk", + "license": "MIT", "dependencies": [ { "name": "boost-asio", diff --git a/versions/baseline.json b/versions/baseline.json index 2bd14364113bf0..c5d712520d12dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1654,7 +1654,7 @@ }, "cpprestsdk": { "baseline": "2.10.18", - "port-version": 1 + "port-version": 2 }, "cpptoml": { "baseline": "v0.1.1", diff --git a/versions/c-/cpprestsdk.json b/versions/c-/cpprestsdk.json index 4855a3314a3878..1cc39935334fc3 100644 --- a/versions/c-/cpprestsdk.json +++ b/versions/c-/cpprestsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1fb46f5d043e3a354bfbc6f77df5df3b321f74b", + "version": "2.10.18", + "port-version": 2 + }, { "git-tree": "b37c56224faff461184f427b95f10dc320d74d50", "version": "2.10.18", From b29fa4b8ef57f6fcce60c073636a907ebd590fa2 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 1 Aug 2022 22:48:35 +0300 Subject: [PATCH 260/791] [glib] Fix x64-linux-dynamic build (#26074) --- ports/glib/portfile.cmake | 2 +- ports/glib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index bbf1fa66a3c57a..e20145df7550db 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -84,7 +84,7 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 4fae9631896a0b..61fb879f2c7a6c 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.72.3", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index c5d712520d12dd..207630f53b82ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2590,7 +2590,7 @@ }, "glib": { "baseline": "2.72.3", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.70.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 263cbaaecbdf06..c8997a2e077b55 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d5171b8b2d18d7a24e54d5a062aa18b5effb3f4", + "version": "2.72.3", + "port-version": 1 + }, { "git-tree": "abff8e76676673462462f949844d3369d93be61d", "version": "2.72.3", From 7cee564be78212a2984db2fcc9252d3a5f9848ed Mon Sep 17 00:00:00 2001 From: Osyotr Date: Mon, 1 Aug 2022 22:49:32 +0300 Subject: [PATCH 261/791] [cgns] Fix x64-linux-dynamic build (#26088) --- ports/cgns/portfile.cmake | 2 +- ports/cgns/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cgns.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 9181d009067e43..e5d160980d1bc3 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -67,7 +67,7 @@ foreach(TOOL ${TOOLS}) file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") endforeach() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json index 04a85921f01c62..ae0bcfc7d5c916 100644 --- a/ports/cgns/vcpkg.json +++ b/ports/cgns/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgns", "version-semver": "4.3.0", + "port-version": 1, "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", "homepage": "http://cgns.org/", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 207630f53b82ac..94865fbf5991e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1354,7 +1354,7 @@ }, "cgns": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "chaiscript": { "baseline": "6.1.0", diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json index 3ba5b6275e4ccd..0542c3bededbcc 100644 --- a/versions/c-/cgns.json +++ b/versions/c-/cgns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1733a3011caebf67ccbe1d48ea08c92e87d186e0", + "version-semver": "4.3.0", + "port-version": 1 + }, { "git-tree": "0d2c412303ae38864d8ff36777cc22bfc404b9b6", "version-semver": "4.3.0", From 768379e8d94414773f0943ecde66ec2ef318a4ee Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 1 Aug 2022 12:53:52 -0700 Subject: [PATCH 262/791] [directx-headers, directxtk, directxtk12, directxtex, directxmesh, uvatlas] ports updated for July 2022 (#26090) * [directx-headers] Update port for Agility SDK 1.606.3 * [directxtex, directxtk12] updated port for upstream release for MinGW support * [directxmesh, directxtk, uvatlas] update ports for July 2022 releases * update baseline --- ports/directx-headers/portfile.cmake | 6 +++--- ports/directx-headers/vcpkg.json | 2 +- ports/directxmesh/portfile.cmake | 14 ++++++------- ports/directxmesh/vcpkg.json | 2 +- ports/directxtex/portfile.cmake | 30 ++++++++++++++-------------- ports/directxtex/vcpkg.json | 2 +- ports/directxtk/portfile.cmake | 20 +++++++++---------- ports/directxtk/vcpkg.json | 2 +- ports/directxtk12/portfile.cmake | 20 +++++++++---------- ports/directxtk12/vcpkg.json | 2 +- ports/uvatlas/portfile.cmake | 14 ++++++------- ports/uvatlas/vcpkg.json | 2 +- versions/baseline.json | 12 +++++------ versions/d-/directx-headers.json | 5 +++++ versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 19 files changed, 94 insertions(+), 64 deletions(-) diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 02dad035541c95..179786010ae1be 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers - REF v1.602.0 - SHA512 75d81191e3e0b60bc901f04fcb9cf53f0faae7f0c196a1b04f2b9199c72243d4dddaeacad29d82ca7ccb209b16d07b4f1b71a58368fccad13c4d8421e0c9f0d9 - HEAD_REF master + REF v1.606.3-r1 + SHA512 a6a9337446f890bb44872ecc9ae0a6feed8e790331ab5bc861e5eea4c552fbbe06655c20b46b8683a76dadf58aaeb0591430e3a4ac2629a41448f1f32f6edc3f + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index b250c966d03b8a..3f98e41faa2775 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directx-headers", - "version": "1.602.0", + "version": "1.606.3", "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 807ef0517f7c7b..18ca6d6f0f669e 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF may2022 - SHA512 f82ac5bf8211cb5699caf79cf2fb13eb23b4c3c8de807bc114966cc8e933b3bdb2c98940c9add74ee9ad0addb1bdf91dd16cbe2efe2db2afd96f69fd3871d556 + REF jul2022 + SHA512 a356aaa85c3af745cdef2126a999a12e4e99d28a71564eeb56463afc3a99cc74e0bfa8505da90170224855cea897af34be3ea28dde3f5c3841f6fcb93f7b5e25 HEAD_REF main ) @@ -30,14 +30,14 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmesh/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxmesh) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/may2022/meshconvert.exe" - FILENAME "meshconvert-may2022.exe" - SHA512 0fcc3728425bc9681bdc4e1fae79a0f3da638d1b43597171e6829fca85cec8e7f1aa30a51c2f9457074c0a7bb9f358da06df666b6ae054266ceb1c9c38874547 + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jul2022/meshconvert.exe" + FILENAME "meshconvert-jul2022.exe" + SHA512 881de2e574c129c1a91f36d93c268ebc2b28d4809d4d6b79f075d3cd728cf7cfdd22541e06a764c35ea2be89666769daf3b98fdcaf1b9334a52ff6672f51705a ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -46,7 +46,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-may2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-jul2022.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index e864903f08c857..036871dbc4fcc7 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-date": "2022-05-09", + "version-date": "2022-07-29", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index f1af64d1dc13ee..d007dd07db9385 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF may2022 - SHA512 b5783c55a1faa9ac616f93d13af91d072e5cef65bcb02c402f2a4d072036135ae610264dc5ebe4e15c56b152c0b3fd0fb87666ab16e74507218906f4210687db + REF jul2022 + SHA512 21b21dfff8bbedabfcb7d3694d750370304382ce0a9847c4ff3c153a3b6a6c5b61fc4051eb95b210e186107092488572757c43e1ca37319e763d49b0bca49dd4 HEAD_REF main ) @@ -62,28 +62,28 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtex/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtex) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texassemble.exe" - FILENAME "texassemble-may2022.exe" - SHA512 22963920f3047533d2ec6d9751f4d2eb4d530e6c4a96099322a070f5f311785d79d07c2e79fd05daa9992deba116f630de14436df4f42b415d7511fd6193241e + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jul2022/texassemble.exe" + FILENAME "texassemble-jul2022.exe" + SHA512 72b47e30f810481f2af00cf45eb5789ae78c3ce0cc385f8168a74f178798cefa69b837060fe0ff4cf8dedaf8d1e489bbf4b3e1453c821df478636aca73f89b43 ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texconv.exe" - FILENAME "texconv-may2022.exe" - SHA512 9f0c9307f00062883be8a2afff0f6428020d9f056db5a2f175ea3ff72e50f6fd5c57b2dbc448fe8352a86837b318bd3874995dc87d741bdeb413060618a0b08f + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jul2022/texconv.exe" + FILENAME "texconv-jul2022.exe" + SHA512 6fe66d90a33510005f3dcc0190aef4e0139d077ee7aeeef015b1e9204149384d46d02e0d9274b68e6f4299b64d3c4eb57fc4bfa6bfefc317699e624ae332abb6 ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/may2022/texdiag.exe" - FILENAME "texdiag-may2022.exe" - SHA512 01fc96ea5cc286dfea097d3b8bedb92d41dbbab949953315e640ee019578c33e2e1b0db476e51576c92763bacfa4cdf270ebad7cac1c59b185d5fdc0752f0393 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/jul2022/texdiag.exe" + FILENAME "texdiag-jul2022.exe" + SHA512 804a361293b5350d722604f5150a72751e1c25642986a505e83e0b33be8f53535ea42b6adbbc0b0b88e16d494012e9d02150c60e0ce0115fba30a84e7c2a14bd ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -94,9 +94,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-may2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index a9699dcb9ff88b..cee0f698309dc1 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-date": "2022-05-09", + "version-date": "2022-07-29", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 42be596dd0bbdd..f1ef0c55a96118 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF jun2022 - SHA512 683adec36945611150393bb198f54a7d1e072cc9b41dd47ca9ee14459babff867d730b7031602383ed9373500f1541a5091021927bc15df59d47a3b2a1b3588c + REF jul2022 + SHA512 1f16d682e2ed7d177ec7ab0f5ecbcfd11f85478eff52db781403c6c1dca8945521da3a5fd926ea46a4d319c94bc0f21eacea7b456da4283ccac21614e3338f58 HEAD_REF main ) @@ -37,16 +37,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/jun2022/MakeSpriteFont.exe" - FILENAME "makespritefont-jun2022.exe" - SHA512 7cdc80e12a4a7be70733d582e4f613055a549345f83e24035cfce42d37568c4934c1bb68df5238f41df9d7fa0e84095aeb227d23450323e31a5d1d68cb505842 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/jul2022/MakeSpriteFont.exe" + FILENAME "makespritefont-jul2022.exe" + SHA512 fd039070fad3dee3fe146d2cd4950f599f680cb4abd370e7c21bedeb8c0a970455ad2eac463fc6d198505b6bbdabebfcc453bf74c317f6a10bf2e2f9a0bfc418 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/jun2022/XWBTool.exe" - FILENAME "xwbtool-jun2022.exe" - SHA512 b5782323e241641a429f66ad1ac511cfdfd6301851474dafdde274a4f93b49877406d5d0ab992097be7afe8db90fdb9488a9d6de5afce7e086df2e66a5bbca12 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/jul2022/XWBTool.exe" + FILENAME "xwbtool-jul2022.exe" + SHA512 6276e17241afc8c0b82789b99667577394eedf001fa2d4b3acdfac847744c3ac5ec9a8072a1e3e9f247386711232aab93f066a0689f4f9f7d84744dc3862ea05 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -56,8 +56,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jun2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jun2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index 6cb78768ca8b75..b0e0e6ed55ec19 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-date": "2022-06-15", + "version-date": "2022-07-29", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index a53e3d9e5c7ca6..92bf31c2359f41 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF jun2022c - SHA512 48c923920634c74fd0e9a40d29a01d8a6afe321cb3e41145f76bdcc63320a5bb1552a52550b975dbd7d238c576bf75e3e7d5024f347e2cce80495f05313a1a94 + REF jul2022 + SHA512 54e58e181fec16f6bc9b27ad9e8267bc23601912f18759d99b278c4086cc0979ff18fe80db8ee7cbb9dfa7e38d0c892b665f005ffbb60f9d0ccdbe69093b6b5d HEAD_REF main ) @@ -27,16 +27,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/directxtk12) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jun2022/MakeSpriteFont.exe" - FILENAME "makespritefont-jun2022.exe" - SHA512 7cdc80e12a4a7be70733d582e4f613055a549345f83e24035cfce42d37568c4934c1bb68df5238f41df9d7fa0e84095aeb227d23450323e31a5d1d68cb505842 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jul2022/MakeSpriteFont.exe" + FILENAME "makespritefont-jul2022.exe" + SHA512 fd039070fad3dee3fe146d2cd4950f599f680cb4abd370e7c21bedeb8c0a970455ad2eac463fc6d198505b6bbdabebfcc453bf74c317f6a10bf2e2f9a0bfc418 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jun2022/XWBTool.exe" - FILENAME "xwbtool-jun2022.exe" - SHA512 b5782323e241641a429f66ad1ac511cfdfd6301851474dafdde274a4f93b49877406d5d0ab992097be7afe8db90fdb9488a9d6de5afce7e086df2e66a5bbca12 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jul2022/XWBTool.exe" + FILENAME "xwbtool-jul2022.exe" + SHA512 6276e17241afc8c0b82789b99667577394eedf001fa2d4b3acdfac847744c3ac5ec9a8072a1e3e9f247386711232aab93f066a0689f4f9f7d84744dc3862ea05 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -46,8 +46,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jun2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jun2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jul2022.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index b82bf8ff1e503d..2438d31f7ad719 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-date": "2022-07-19", + "version-date": "2022-07-29", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 49d16aad5121d8..266b4197013735 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF may2022 - SHA512 132c7570acd14e69f9a9888ce62aaa58f78d7d7e933bd3648af7208689693906fe6d8e17f4f41ba46a5151e09a0012874b0d11b96f30246337208c4f6f5ef8db + REF jul2022 + SHA512 fe857766d598c73badba6eda3128775f9195d0a1a7658e9b48a77dd631da4bbd31ab946bc98f8e9b229a6bc99a785ac3da693cb655be0f6a1393ad176e26b688 HEAD_REF main ) @@ -30,14 +30,14 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/uvatlas/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/uvatlas) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/may2022/uvatlastool.exe" - FILENAME "uvatlastool-may2022.exe" - SHA512 8a58e54881b16dc2e2489cfb605c02d5368bbfe02182c4d64ee1e903496d2ebcfc9cfaca63d602572c2241109c4ee4591aa7bb4f8da65daeead99b8144049b84 + URLS "https://github.com/Microsoft/UVAtlas/releases/download/jul2022/uvatlastool.exe" + FILENAME "uvatlastool-jul2022.exe" + SHA512 3c1f7d25f10a85895d75d4102e127af857c4eae1bb3773b84e0f48e30ba9be517469b1a7504c6859e5b75481fea427052af21f3491f6993bf3dc360829c086b8 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -46,7 +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-may2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-jul2022.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 1f8f5be4fcb138..7af982f77ffe3f 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-date": "2022-05-09", + "version-date": "2022-07-30", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index 94865fbf5991e0..d3e23ce1155dd1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1889,7 +1889,7 @@ "port-version": 0 }, "directx-headers": { - "baseline": "1.602.0", + "baseline": "1.606.3", "port-version": 0 }, "directxmath": { @@ -1897,7 +1897,7 @@ "port-version": 0 }, "directxmesh": { - "baseline": "2022-05-09", + "baseline": "2022-07-29", "port-version": 0 }, "directxsdk": { @@ -1905,15 +1905,15 @@ "port-version": 5 }, "directxtex": { - "baseline": "2022-05-09", + "baseline": "2022-07-29", "port-version": 0 }, "directxtk": { - "baseline": "2022-06-15", + "baseline": "2022-07-29", "port-version": 0 }, "directxtk12": { - "baseline": "2022-07-19", + "baseline": "2022-07-29", "port-version": 0 }, "dirent": { @@ -7381,7 +7381,7 @@ "port-version": 2 }, "uvatlas": { - "baseline": "2022-05-09", + "baseline": "2022-07-30", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index bb915e8257c307..45be4d28eb2bbf 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "561f4b44e30ab8806b2983ebdabeaeeebabb48e0", + "version": "1.606.3", + "port-version": 0 + }, { "git-tree": "f6271f7dc1af5888b39b0443ff7ecc9d01f1db94", "version": "1.602.0", diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index f72dff607aa7d2..43901d14ba0d3b 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a526999086b61e5dc7c587245ae5982ec93c0e5", + "version-date": "2022-07-29", + "port-version": 0 + }, { "git-tree": "bf2c810ddbc4a551cb5fb561092bb6fe67ed986f", "version-date": "2022-05-09", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 9534b07d933458..a9d74afe5f1dac 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e383685c947595287b5fbc51436378981c248793", + "version-date": "2022-07-29", + "port-version": 0 + }, { "git-tree": "269e245ad8428d3a09059bc195bae935613478af", "version-date": "2022-05-09", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 1028d84166d5d4..0015152854e09f 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88703e36f97fb7bb6ea188832dc8b114a32e5a3f", + "version-date": "2022-07-29", + "port-version": 0 + }, { "git-tree": "3cdf135528218c71f3aaf4f2ca69d7bc57b160a4", "version-date": "2022-06-15", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 7a427e9172b019..22c8a5dacf67db 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c42e95e0d216b600b858046a75d0bc80c0cb410", + "version-date": "2022-07-29", + "port-version": 0 + }, { "git-tree": "406076922dc0aec8b45b0024e00b0718fd6eb65f", "version-date": "2022-07-19", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index cfeb42373b7511..532ecadd7d7412 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb57b16dfc29cefbae6f35fd3e09376e0291b2bd", + "version-date": "2022-07-30", + "port-version": 0 + }, { "git-tree": "2ac8444f59bd76ba38a620d4e0fe1a6a64969873", "version-date": "2022-05-09", From c9ab969f8e994f6e808037f64946889b4fcfa4c4 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 1 Aug 2022 13:31:06 -0700 Subject: [PATCH 263/791] [cunit] Fix Linux library name and export CMake (#26047) * [cunit] Fix Linux library name and export CMake * format vcpkg.json * x-add-version * [cunit] Define VERSION/RELEASE Co-authored-by: Robert Schumacher --- ports/cunit/CMakeLists.txt | 33 ++++++++++++--------------------- ports/cunit/portfile.cmake | 26 ++++++++++++++++---------- ports/cunit/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 2 +- versions/c-/cunit.json | 5 +++++ 5 files changed, 48 insertions(+), 35 deletions(-) diff --git a/ports/cunit/CMakeLists.txt b/ports/cunit/CMakeLists.txt index b796355aa73c78..cd82e2343f4b32 100644 --- a/ports/cunit/CMakeLists.txt +++ b/ports/cunit/CMakeLists.txt @@ -1,9 +1,8 @@ cmake_minimum_required (VERSION 3.8.0) -project (libcunit C) +project (cunit C) set(HEADERS_DIR "${PROJECT_SOURCE_DIR}/CUnit/Headers") set(SOURCES_DIR "${PROJECT_SOURCE_DIR}/CUnit/Sources") -set(EXAMPLES_DIR "${PROJECT_SOURCE_DIR}/Examples") if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 -D_CRT_SECURE_NO_WARNINGS) @@ -12,6 +11,7 @@ endif() configure_file( "${HEADERS_DIR}/CUnit.h.in" "${PROJECT_BINARY_DIR}/CUnit.h" + @ONLY ) file(READ "${PROJECT_BINARY_DIR}/CUnit.h" CUNIT_H) @@ -25,7 +25,7 @@ file(WRITE "${PROJECT_BINARY_DIR}/CUnit.h" "${CUNIT_H}") include_directories("${PROJECT_BINARY_DIR}") include_directories(${HEADERS_DIR}) -add_library(libcunit +add_library(cunit "${SOURCES_DIR}/Automated/Automated.c" "${SOURCES_DIR}/Basic/Basic.c" "${SOURCES_DIR}/Console/Console.c" @@ -35,27 +35,18 @@ add_library(libcunit "${SOURCES_DIR}/Framework/TestRun.c" "${SOURCES_DIR}/Framework/Util.c" ) -target_compile_definitions(libcunit PRIVATE -DCU_BUILD_DLL) +target_compile_definitions(cunit PRIVATE -DCU_BUILD_DLL) +target_include_directories(cunit INTERFACE $) -if(BUILD_EXAMPLES) - include_directories(${EXAMPLES_DIR}) - add_executable(AutomatedTest ${EXAMPLES_DIR}/AutomatedTest/AutomatedTest.c "${EXAMPLES_DIR}/ExampleTests.c") - add_executable(BasicTest ${EXAMPLES_DIR}/BasicTest/BasicTest.c "${EXAMPLES_DIR}/ExampleTests.c") - add_executable(ConsoleTest ${EXAMPLES_DIR}/ConsoleTest/ConsoleTest.c "${EXAMPLES_DIR}/ExampleTests.c") +install(TARGETS cunit EXPORT unofficial-cunit-config) - target_link_libraries(AutomatedTest libcunit) - target_link_libraries(BasicTest libcunit) - target_link_libraries(ConsoleTest libcunit) -endif() - -install( - TARGETS libcunit - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +install(EXPORT unofficial-cunit-config + NAMESPACE unofficial::cunit:: + DESTINATION share/unofficial-cunit + FILE unofficial-cunit-config.cmake ) if(NOT DISABLE_INSTALL_HEADERS) - install(DIRECTORY "${HEADERS_DIR}/" DESTINATION include/cunit FILES_MATCHING PATTERN "*.h") - install(FILES "${PROJECT_BINARY_DIR}/CUnit.h" DESTINATION include/cunit) + install(DIRECTORY "${HEADERS_DIR}/" DESTINATION include/CUnit FILES_MATCHING PATTERN "*.h") + install(FILES "${PROJECT_BINARY_DIR}/CUnit.h" DESTINATION include/CUnit) endif() diff --git a/ports/cunit/portfile.cmake b/ports/cunit/portfile.cmake index 88b9be6b5bac40..94893a2c4d71e5 100644 --- a/ports/cunit/portfile.cmake +++ b/ports/cunit/portfile.cmake @@ -1,21 +1,27 @@ +set(VERSION 2.1) +set(RELEASE 3) + vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO cunit/CUnit - REF 2.1-3 - FILENAME "CUnit-2.1-3.tar.bz2" + REF "${VERSION}-${RELEASE}" + FILENAME "CUnit-${VERSION}-${RELEASE}.tar.bz2" SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487 ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DVERSION=${VERSION}" + "-DRELEASE=${RELEASE}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-cunit) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cunit/vcpkg.json b/ports/cunit/vcpkg.json index c3b2d3032e7128..7857b54f7b5b97 100644 --- a/ports/cunit/vcpkg.json +++ b/ports/cunit/vcpkg.json @@ -1,7 +1,18 @@ { "name": "cunit", - "version-string": "2.1.3", - "port-version": 7, + "version": "2.1.3", + "port-version": 8, "description": "CUnit is a lightweight system for writing, administering, and running unit tests in C. It provides C programmers a basic testing functionality with a flexible variety of user interfaces", - "homepage": "https://sourceforge.net/projects/cunit/" + "homepage": "https://sourceforge.net/projects/cunit/", + "license": "LGPL-2.0-only", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d3e23ce1155dd1..75ab9a4279beef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1766,7 +1766,7 @@ }, "cunit": { "baseline": "2.1.3", - "port-version": 7 + "port-version": 8 }, "curl": { "baseline": "7.84.0", diff --git a/versions/c-/cunit.json b/versions/c-/cunit.json index 7b15a6d376928d..454a2cb400ca18 100644 --- a/versions/c-/cunit.json +++ b/versions/c-/cunit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c467d95806ab2016c73520e249b5d82645fda3c", + "version": "2.1.3", + "port-version": 8 + }, { "git-tree": "b108b8daeb1695db997a7ebc1b341e27d4d84ce7", "version-string": "2.1.3", From 55209aae66a040faca4fcdcc76cd85ca19dfa96a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 22:39:44 +0200 Subject: [PATCH 264/791] [fontconfig] fix preprocessor for clang-cl (#26052) * fix fontconfig for clang-cl * v db --- ports/fontconfig/fix-preprocessor-clang-cl.patch | 13 +++++++++++++ ports/fontconfig/portfile.cmake | 1 + ports/fontconfig/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/fontconfig/fix-preprocessor-clang-cl.patch diff --git a/ports/fontconfig/fix-preprocessor-clang-cl.patch b/ports/fontconfig/fix-preprocessor-clang-cl.patch new file mode 100644 index 00000000000000..f5dd4e7777d20c --- /dev/null +++ b/ports/fontconfig/fix-preprocessor-clang-cl.patch @@ -0,0 +1,13 @@ +diff --git a/src/meson.build b/src/meson.build +index 9a6ba2021..5d04f7360 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -33,7 +33,7 @@ fc_sources = [ + cpp = cc.cmd_array() + if cc.get_id() == 'gcc' + cpp += ['-E', '-P'] +-elif cc.get_id() == 'msvc' ++elif cc.get_argument_syntax() == 'msvc' + cpp += ['/EP'] + elif cc.get_id() == 'clang' + cpp += ['-E', '-P'] diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index c760f252dee81e..6959873ae61c25 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_gitlab( no-etc-symlinks.patch libgetopt.patch fix-mingw-gperf-fallback.patch + fix-preprocessor-clang-cl.patch ) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gperf") diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 060fc96400e390..b6e6100746e303 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fontconfig", "version": "2.14.0", - "port-version": 3, + "port-version": 4, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 75ab9a4279beef..b95aadec8f84c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2338,7 +2338,7 @@ }, "fontconfig": { "baseline": "2.14.0", - "port-version": 3 + "port-version": 4 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 0b0f19e69878e9..8f6d47905b113f 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51b89b5deffdfb0ca92218871623ab22738d2178", + "version": "2.14.0", + "port-version": 4 + }, { "git-tree": "edebefba0511e2f8ee4018707fe611d0035c4dd4", "version": "2.14.0", From 9547b761ae0d00995cd11235683a3c6b1320e827 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 22:43:22 +0200 Subject: [PATCH 265/791] [highfive] clang-cl fix flags (#26055) * highfive fix compiler flags for clang-cl * v db --- ports/highfive/fix_compiler_flags.patch | 14 ++++++++++++++ ports/highfive/portfile.cmake | 1 + ports/highfive/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/highfive.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/highfive/fix_compiler_flags.patch diff --git a/ports/highfive/fix_compiler_flags.patch b/ports/highfive/fix_compiler_flags.patch new file mode 100644 index 00000000000000..06a766c6e4b11c --- /dev/null +++ b/ports/highfive/fix_compiler_flags.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/config/CompilerFlagsHelpers.cmake b/CMake/config/CompilerFlagsHelpers.cmake +index 67e7d9fe1..11ae2036c 100644 +--- a/CMake/config/CompilerFlagsHelpers.cmake ++++ b/CMake/config/CompilerFlagsHelpers.cmake +@@ -32,6 +32,9 @@ foreach(COMPILER_LANGUAGE ${SUPPORTED_COMPILER_LANGUAGE_LIST}) + set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_MSVC ON) + elseif(${CMAKE_${COMPILER_LANGUAGE}_COMPILER_ID} MATCHES "Clang") + set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_CLANG ON) ++ if(CMAKE_${COMPILER_LANGUAGE}_COMPILER_FRONTEND_VARIANT MATCHES "MSVC") ++ set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_MSVC ON) ++ endif() + elseif(CMAKE_${COMPILER_LANGUAGE}_COMPILER_ID MATCHES "GNU") + set(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_GCC ON) + else() diff --git a/ports/highfive/portfile.cmake b/ports/highfive/portfile.cmake index f43ab26b58090b..50f6f3fd8b689a 100644 --- a/ports/highfive/portfile.cmake +++ b/ports/highfive/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-dependency-hdf5.patch fix-error-C1128.patch + fix_compiler_flags.patch ) vcpkg_check_features( diff --git a/ports/highfive/vcpkg.json b/ports/highfive/vcpkg.json index c30c52860605e2..47b8d9e1fb298c 100644 --- a/ports/highfive/vcpkg.json +++ b/ports/highfive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "highfive", "version": "2.3", - "port-version": 2, + "port-version": 3, "description": "HighFive is a modern header-only C++/C++11 friendly interface for libhdf5", "homepage": "https://github.com/BlueBrain/HighFive", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index b95aadec8f84c9..68aa435dcd3599 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2830,7 +2830,7 @@ }, "highfive": { "baseline": "2.3", - "port-version": 2 + "port-version": 3 }, "highway": { "baseline": "0.14.2", diff --git a/versions/h-/highfive.json b/versions/h-/highfive.json index eaf02f1bab75a4..ba429d3ee29938 100644 --- a/versions/h-/highfive.json +++ b/versions/h-/highfive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8303489c627f763e4edfea72273d56ce30dcbc02", + "version": "2.3", + "port-version": 3 + }, { "git-tree": "b1ecca066cce62dd0fbdf760151ee0c3ccc70b81", "version": "2.3", From 4ad26901ec8feeb9e5fad4f85d2f6e5d317e9bd2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:05:33 +0200 Subject: [PATCH 266/791] [Flann] disable openmp (#26053) * [flann] disable openmp -> requires a feature. * v db --- ports/flann/portfile.cmake | 1 + ports/flann/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flann.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index ce9bb2d3bc0de5..78d4d27695c8a9 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_cmake_configure( -DBUILD_DOC=OFF -DBUILD_PYTHON_BINDINGS=OFF -DBUILD_MATLAB_BINDINGS=OFF + -DUSE_OPENMP=OFF OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) diff --git a/ports/flann/vcpkg.json b/ports/flann/vcpkg.json index 782fb321b00d64..ed0622359e80c0 100644 --- a/ports/flann/vcpkg.json +++ b/ports/flann/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flann", "version-date": "2019-04-07", - "port-version": 5, + "port-version": 6, "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 68aa435dcd3599..5589ac67b8369d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2274,7 +2274,7 @@ }, "flann": { "baseline": "2019-04-07", - "port-version": 5 + "port-version": 6 }, "flash-runtime-extensions": { "baseline": "2.4", diff --git a/versions/f-/flann.json b/versions/f-/flann.json index 71d955c8c67541..d951e22e012f4f 100644 --- a/versions/f-/flann.json +++ b/versions/f-/flann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "300415ad416640a5b4a4f0895a3250b306726181", + "version-date": "2019-04-07", + "port-version": 6 + }, { "git-tree": "b31eace0fd51c64ee799affea9ef2127dab68a25", "version-date": "2019-04-07", From 292b2445689ed3146d9d1bf6e341e42f51dde002 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:21:17 +0200 Subject: [PATCH 267/791] [Cairo] fix clang-cl build (#26056) * [cairo] fix clang-cl build * v db --- ports/cairo/fix_clang-cl_build.patch | 37 ++++++++++++++++++++++++++++ ports/cairo/portfile.cmake | 6 +++++ ports/cairo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cairo.json | 5 ++++ 5 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 ports/cairo/fix_clang-cl_build.patch diff --git a/ports/cairo/fix_clang-cl_build.patch b/ports/cairo/fix_clang-cl_build.patch new file mode 100644 index 00000000000000..133afb7eb50baa --- /dev/null +++ b/ports/cairo/fix_clang-cl_build.patch @@ -0,0 +1,37 @@ +diff --git a/util/cairo-script/cairo-script-objects.c b/util/cairo-script/cairo-script-objects.c +index 2d7937be3..4d55ca848 100644 +--- a/util/cairo-script/cairo-script-objects.c ++++ b/util/cairo-script/cairo-script-objects.c +@@ -127,7 +127,7 @@ csi_array_append (csi_t *ctx, + return _csi_stack_push (ctx, &array->stack, csi_object_reference (obj)); + } + +-inline csi_status_t ++csi_status_t + _csi_array_execute (csi_t *ctx, csi_array_t *array) + { + csi_integer_t i; +diff --git a/meson.build b/meson.build +index 7b20c0c48..9cb4a82ba 100644 +--- a/meson.build ++++ b/meson.build +@@ -38,7 +38,7 @@ cc = meson.get_compiler('c') + + # Compiler flags + cflags = [] +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + cflags += [ + '-Wmissing-declarations', + '-Werror-implicit-function-declaration', +@@ -159,8 +159,7 @@ check_headers = [ + + check_types = [ + ['uint64_t', {'headers': ['stdint.h']}], +- ['uint128_t', {'headers': ['stdint.h']}], +- ['__uint128_t'] ++ ['uint128_t', {'headers': ['stdint.h']}] + ] + + check_funcs = [ + \ No newline at end of file diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index 02d11851124a35..737f310cf8a08a 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -1,3 +1,8 @@ + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES fix_clang-cl_build.patch) +endif() + vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH @@ -9,6 +14,7 @@ vcpkg_from_gitlab( cairo_static_fix.patch disable-atomic-ops-check.patch # See https://gitlab.freedesktop.org/cairo/cairo/-/issues/554 mingw-dllexport.patch + ${PATCHES} ) if("fontconfig" IN_LIST FEATURES) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index c185a2915e56dc..e5e135c2c1f1b4 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.6", - "port-version": 3, + "port-version": 4, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "license": "MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 5589ac67b8369d..5ceccdbc47944f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1250,7 +1250,7 @@ }, "cairo": { "baseline": "1.17.6", - "port-version": 3 + "port-version": 4 }, "cairomm": { "baseline": "1.16.1", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index b59decf711f12f..0e83f32c8f438e 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eac156360b2a89a655152bafd92c3e285adc473e", + "version": "1.17.6", + "port-version": 4 + }, { "git-tree": "c339d543f41d311c7d4282ca1efa4e400eb30b73", "version": "1.17.6", From 4b155dfc75ac90e966a49729fe53e231383dfeb9 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 1 Aug 2022 23:33:12 +0200 Subject: [PATCH 268/791] [hash-library] Install config file (#26072) * [hash-library] Install config file * version * move config file * version --- ports/hash-library/CMakeLists.txt | 3 +++ ports/hash-library/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hash-library.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/hash-library/CMakeLists.txt b/ports/hash-library/CMakeLists.txt index dbc1d8ea73d2cf..abc69f1e0b82eb 100644 --- a/ports/hash-library/CMakeLists.txt +++ b/ports/hash-library/CMakeLists.txt @@ -43,3 +43,6 @@ install( NAMESPACE unofficial:: DESTINATION share/unofficial-hash-library ) + +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-hash-library-config.cmake" "include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-hash-library-targets.cmake)\n") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-hash-library-config.cmake" DESTINATION share/unofficial-hash-library) diff --git a/ports/hash-library/vcpkg.json b/ports/hash-library/vcpkg.json index 0f3ad3dc7ceffe..7c771cc33bac94 100644 --- a/ports/hash-library/vcpkg.json +++ b/ports/hash-library/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hash-library", "version": "8", - "port-version": 1, + "port-version": 2, "description": "Portable C++ hashing library", "homepage": "https://create.stephan-brumme.com/hash-library/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 5ceccdbc47944f..8ffa7a9c841cb1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2790,7 +2790,7 @@ }, "hash-library": { "baseline": "8", - "port-version": 1 + "port-version": 2 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/hash-library.json b/versions/h-/hash-library.json index 49ef797b934559..b4c3383829e64c 100644 --- a/versions/h-/hash-library.json +++ b/versions/h-/hash-library.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3e49529dd25b60564de8ceed9485e17e8a7f8da", + "version": "8", + "port-version": 2 + }, { "git-tree": "fad55dc152114a3f71c5eafd33a3facd7e3a2286", "version": "8", From 6c6d01f07b5e5c5291858b0b512022a0eaa26780 Mon Sep 17 00:00:00 2001 From: Inhzus Date: Tue, 2 Aug 2022 05:59:34 +0800 Subject: [PATCH 269/791] [openssl] remove no-stdio for iOS (#26023) * [openssl] remove no-stdio option for iOS building * [openssl] 3.0.5#2, remove no-stdio option for iOS building Co-authored-by: xiling.sz --- ports/openssl/unix/CMakeLists.txt | 2 +- ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 9cb6a5325dece5..1ad224edf230f0 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -23,7 +23,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") message(FATAL_ERROR "Unknown iOS target architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() # disable that makes linkage error (e.g. require stderr usage) - list(APPEND DISABLES no-stdio no-ui no-asm) + list(APPEND DISABLES no-ui no-asm) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") set(PLATFORM darwin64-arm64-cc) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 51f2ababfdd59b..d5a033ff3a667f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.5", - "port-version": 1, + "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", diff --git a/versions/baseline.json b/versions/baseline.json index 8ffa7a9c841cb1..56e3fd4df130b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5254,7 +5254,7 @@ }, "openssl": { "baseline": "3.0.5", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 63dafbbedbc378..416d94297b95d0 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1172be56343ba751b0fe10a0fbb6acedc7871e65", + "version": "3.0.5", + "port-version": 2 + }, { "git-tree": "3b7cc4dec346a7593959636aa8cc266240d92b7f", "version": "3.0.5", From 48369f2a2aa00f7311ca8417cfd0fbda4bcc41e9 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 2 Aug 2022 00:14:44 +0200 Subject: [PATCH 270/791] [vcpkg_download_distfile] Make file name more unique (#25607) * [vcpkg_download_distfile] Add parameter `FILE_DISAMBIGUATOR` * Add argument checks * Make unparse args a fatal error * Remove trailing ; * Append instead of prepend hash * Always append commit hash * Only append file hash if hash differs from already installed file with same name --- scripts/cmake/vcpkg_download_distfile.cmake | 30 ++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 5277129f824480..2092d3f2a0fb32 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -1,3 +1,10 @@ +function(z_vcpkg_check_hash result file_path sha512) + file(SHA512 "${file_path}" file_hash) + string(TOLOWER "${sha512}" sha512_lower) + string(COMPARE EQUAL "${file_hash}" "${sha512_lower}" hash_match) + set("${result}" "${hash_match}" PARENT_SCOPE) +endfunction() + function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 skip_sha512) if(_VCPKG_INTERNAL_NO_HASH_CHECK) # When using the internal hash skip, do not output an explicit message. @@ -8,9 +15,10 @@ function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 return() endif() - file(SHA512 "${file_path}" file_hash) - string(TOLOWER "${sha512}" sha512_lower) - if(NOT "${file_hash}" STREQUAL "${sha512_lower}") + set(hash_match OFF) + z_vcpkg_check_hash(hash_match "${file_path}" "${sha512}") + + if(NOT hash_match) message(FATAL_ERROR "\nFile does not have expected hash:\n" " File path: [ ${file_path} ]\n" @@ -151,6 +159,22 @@ If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") endif() set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}") + + if(EXISTS "${downloaded_file_path}" AND NOT arg_SKIP_SHA512) + set(hash_match OFF) + z_vcpkg_check_hash(hash_match "${downloaded_file_path}" "${arg_SHA512}") + + if(NOT hash_match) + get_filename_component(filename_component "${arg_FILENAME}" NAME_WE) + get_filename_component(extension_component "${arg_FILENAME}" EXT) + get_filename_component(directory_component "${arg_FILENAME}" DIRECTORY) + + string(SUBSTRING "${arg_SHA512}" 0 8 hash) + set(arg_FILENAME "${directory_component}${filename_component}-${hash}${extension_component}") + set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}") + endif() + endif() + set(download_file_path_part "${DOWNLOADS}/temp/${arg_FILENAME}") # Works around issue #3399 From 7a56e3ac26791278a3adb488834cc4095200b343 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 3 Aug 2022 01:20:36 +0800 Subject: [PATCH 271/791] [simdjson] Update to 2.2.2 (#26105) * [simdjson] Update to 2.2.2 * [simdjson] Bump version --- ports/simdjson/portfile.cmake | 4 ++-- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 6b33989f738985..2de973ea890832 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 1075e8609c4afa253162d441437af929c29e31bb # v2.2.0 + REF 933c2ebeacf9a1df12acd9a6781e590cad2f81f7 # v2.2.2 HEAD_REF master - SHA512 c479a1a5f63686b3852a8407d3cb3f6ebf418dde40000c96bf973ebb2d31095ecd3e6a5353b8bdffd57f26179b6668d8ac39bfdb012d8b04ec6115cc39495b66 + SHA512 6dda3fbbba7e788adc7b29710c2b08c428a180fadd298c4129a5856e65de1d947b38ecff0098fcd29ad98923e14910ba77eaedbd3d3a9fa3a0c49c686ecbb1b4 ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index ef043d24381816..81540da7ee756f 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-semver": "2.2.0", + "version-semver": "2.2.2", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 56e3fd4df130b8..8b1fb7400313f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6613,7 +6613,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "2.2.0", + "baseline": "2.2.2", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index de568761a40252..99a81134294dde 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c24527f443a4881e16cb242e4b323904c0318d4", + "version-semver": "2.2.2", + "port-version": 0 + }, { "git-tree": "2bc3bd74a2cb0719ba123f23538e9e974f88c320", "version-semver": "2.2.0", From 1707f9ba577afa35ad8b3541d6108ebcb7924970 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 2 Aug 2022 10:24:21 -0700 Subject: [PATCH 272/791] [google-cloud-cpp] update to latest release (v2.1.0) (#26110) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 377d9834576dbb..d941ca12c92934 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v2.0.1 - SHA512 3e9315ac18d1c06b8d38ac20b389d858b83dbd6058bb697a9f4d7d0e35ae31d9d79856239380c78ea77714c576675ba361b59213d995ff5ce33f11c74647b715 + REF v2.1.0 + SHA512 a1c4a54b420e64bd12c4a85943c6617b310dff359f9b1b744fcaf7ece92c9327d77ab36b6dacf94b3e2b3d6c2a183a46089437736c34e1af55e3c319544c14b3 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 4a38570c4af6ef..1b994cd9ae5567 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.0.1", + "version": "2.1.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8b1fb7400313f4..9eeace0268683c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2641,7 +2641,7 @@ "port-version": 0 }, "google-cloud-cpp": { - "baseline": "2.0.1", + "baseline": "2.1.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 0c7b0fd5b39db1..bd5692e5ed0a3b 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a68fd18fa28b5bbe4807c7ed32ed45c0d4392dd1", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "80997c40db6cb1d4e51f77875f75bf3a8046680f", "version": "2.0.1", From 87e46921ccf13eb3e98292777b09c434cce2d72f Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 2 Aug 2022 22:34:20 +0300 Subject: [PATCH 273/791] [docs] Add doc entry for `VCPKG_FIXUP_ELF_RPATH` (#26040) * Add doc entry for `VCPKG_FIXUP_ELF_RPATH` * Update spelling Co-authored-by: Javier Matos Denizac Co-authored-by: Javier Matos Denizac --- docs/users/triplets.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index f3ce26a302e34f..39ecdde5151977 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -191,6 +191,11 @@ Valid values are, for example, `14.25` or `14.27.29110`. If `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` is used, VCPKG will not setup the Visual Studio environment. Setting `VCPKG_LOAD_VCVARS_ENV` to (true|1|on) changes this behavior so that the Visual Studio environment is setup following the same rules as if `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` was not set. +## Linux Variables + +### VCPKG_FIXUP_ELF_RPATH +When this option is set to (true|1|on), vcpkg will add `$ORIGIN` and `$ORIGIN/` to the `RUNPATH` header of executables and shared libraries. This allows packages to be relocated on Linux. + ## MacOS Variables ### VCPKG_INSTALL_NAME_DIR From 933aa19b26859330872a8c5e6719952ba721914f Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 3 Aug 2022 01:47:10 +0200 Subject: [PATCH 274/791] [linmath] Add port (#26069) * add port for linmath.h * format manifest and x-add version linmath * Update version database * set ref to latest commit id * Update version database * Update ref * version Co-authored-by: Ryan --- ports/linmath/portfile.cmake | 12 ++++++++++++ ports/linmath/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/l-/linmath.json | 9 +++++++++ 4 files changed, 32 insertions(+) create mode 100644 ports/linmath/portfile.cmake create mode 100644 ports/linmath/vcpkg.json create mode 100644 versions/l-/linmath.json diff --git a/ports/linmath/portfile.cmake b/ports/linmath/portfile.cmake new file mode 100644 index 00000000000000..40550a3249a2b0 --- /dev/null +++ b/ports/linmath/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO datenwolf/linmath.h + REF 3eef82841046507e16a0f6194a61cee2eadd34b3 + SHA512 cd8bc9c29b984cbb2fb1a1e743566e8f099d243c294658e84980cdbd83c881122f1abee68c50139ee9fddaa96f22f52eeae8e26dc86caa114cd11ebe5644a4db + HEAD_REF master +) + +# This is a header only library +file(INSTALL "${SOURCE_PATH}/linmath.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/linmath.h") + +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/linmath/vcpkg.json b/ports/linmath/vcpkg.json new file mode 100644 index 00000000000000..30386c573a9a1a --- /dev/null +++ b/ports/linmath/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "linmath", + "version-date": "2022-07-30", + "description": "linmath.h -- A small library for linear math as required for computer graphics", + "homepage": "https://github.com/datenwolf/linmath.h", + "license": "WTFPL" +} diff --git a/versions/baseline.json b/versions/baseline.json index 9eeace0268683c..2c75ffdaee5783 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4316,6 +4316,10 @@ "baseline": "4754bee2d8eb3", "port-version": 2 }, + "linmath": { + "baseline": "2022-07-30", + "port-version": 0 + }, "lionkor-commandline": { "baseline": "2.0.0", "port-version": 0 diff --git a/versions/l-/linmath.json b/versions/l-/linmath.json new file mode 100644 index 00000000000000..4c8bbaa50c900e --- /dev/null +++ b/versions/l-/linmath.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0ecd0a63de52eff819e837a8fe44856b07228376", + "version-date": "2022-07-30", + "port-version": 0 + } + ] +} From 6a7b3e163835420e96b5c7e043b8d59606d5965b Mon Sep 17 00:00:00 2001 From: Sandy Date: Wed, 3 Aug 2022 01:58:29 -0400 Subject: [PATCH 275/791] [sdl2] Add patch fixing non-threaded emscripten build (#26070) From https://github.com/libsdl-org/SDL/pull/5773 --- ...efined-symbol-errors-in-non-threaded.patch | 129 ++++++++++++++++++ ports/sdl2/portfile.cmake | 1 + ports/sdl2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 + 5 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch diff --git a/ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch b/ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch new file mode 100644 index 00000000000000..974acf88fac244 --- /dev/null +++ b/ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch @@ -0,0 +1,129 @@ +diff --git a/src/video/emscripten/SDL_emscriptenframebuffer.c b/src/video/emscripten/SDL_emscriptenframebuffer.c +index 372c6f5ac85..03fea04efa3 100644 +--- a/src/video/emscripten/SDL_emscriptenframebuffer.c ++++ b/src/video/emscripten/SDL_emscriptenframebuffer.c +@@ -59,10 +59,19 @@ int Emscripten_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * form + return 0; + } + +-static void +-Emscripten_UpdateWindowFramebufferWorker(SDL_Surface* surface) ++int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects) + { +- EM_ASM_INT({ ++ SDL_Surface *surface; ++ ++ SDL_WindowData *data = (SDL_WindowData *) window->driverdata; ++ surface = data->surface; ++ if (!surface) { ++ return SDL_SetError("Couldn't find framebuffer surface for window"); ++ } ++ ++ /* Send the data to the display */ ++ ++ MAIN_THREAD_EM_ASM({ + var w = $0; + var h = $1; + var pixels = $2; +@@ -147,31 +156,7 @@ Emscripten_UpdateWindowFramebufferWorker(SDL_Surface* surface) + } + + SDL2.ctx.putImageData(SDL2.image, 0, 0); +- return 0; + }, surface->w, surface->h, surface->pixels); +-} +- +-int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects) +-{ +- SDL_Surface *surface; +- +- SDL_WindowData *data = (SDL_WindowData *) window->driverdata; +- surface = data->surface; +- if (!surface) { +- return SDL_SetError("Couldn't find framebuffer surface for window"); +- } +- +- /* Send the data to the display */ +- +- if (emscripten_is_main_runtime_thread()) { +- Emscripten_UpdateWindowFramebufferWorker(surface); +- } else { +- emscripten_sync_run_in_main_runtime_thread( +- EM_FUNC_SIG_VI, +- Emscripten_UpdateWindowFramebufferWorker, +- (uint32_t)surface +- ); +- } + + if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { + /* give back control to browser for screen refresh */ +diff --git a/src/video/emscripten/SDL_emscriptenmouse.c b/src/video/emscripten/SDL_emscriptenmouse.c +index e4148072503..38e394ac104 100644 +--- a/src/video/emscripten/SDL_emscriptenmouse.c ++++ b/src/video/emscripten/SDL_emscriptenmouse.c +@@ -63,10 +63,20 @@ Emscripten_CreateDefaultCursor() + return Emscripten_CreateCursorFromString("default", SDL_FALSE); + } + +-static const char* +-Emscripten_GetCursorUrl(int w, int h, int hot_x, int hot_y, void* pixels) ++ ++static SDL_Cursor* ++Emscripten_CreateCursor(SDL_Surface* surface, int hot_x, int hot_y) + { +- return (const char *)EM_ASM_INT({ ++ const char *cursor_url = NULL; ++ SDL_Surface *conv_surf; ++ ++ conv_surf = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_ABGR8888, 0); ++ ++ if (!conv_surf) { ++ return NULL; ++ } ++ ++ cursor_url = (const char *)MAIN_THREAD_EM_ASM_INT({ + var w = $0; + var h = $1; + var hot_x = $2; +@@ -114,40 +124,7 @@ Emscripten_GetCursorUrl(int w, int h, int hot_x, int hot_y, void* pixels) + stringToUTF8(url, urlBuf, url.length + 1); + + return urlBuf; +- }, w, h, hot_x, hot_y, pixels); +-} +- +-static SDL_Cursor* +-Emscripten_CreateCursor(SDL_Surface* surface, int hot_x, int hot_y) +-{ +- const char *cursor_url = NULL; +- SDL_Surface *conv_surf; +- +- conv_surf = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_ABGR8888, 0); +- +- if (!conv_surf) { +- return NULL; +- } +- +- if (emscripten_is_main_runtime_thread()) { +- cursor_url = Emscripten_GetCursorUrl( +- surface->w, +- surface->h, +- hot_x, +- hot_y, +- conv_surf->pixels +- ); +- } else { +- cursor_url = (const char *)emscripten_sync_run_in_main_runtime_thread( +- EM_FUNC_SIG_IIIIIII, +- Emscripten_GetCursorUrl, +- surface->w, +- surface->h, +- hot_x, +- hot_y, +- conv_surf->pixels +- ); +- } ++ }, surface->w, surface->h, hot_x, hot_y, conv_surf->pixels); + + SDL_FreeSurface(conv_surf); + diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 489ee17b14aa61..decda844699ed5 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( 0002-sdl2-skip-ibus-on-linux.patch 0003-sdl2-disable-sdlmain-target-search-on-uwp.patch 0004-Define-crt-macros.patch + 0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 660cbe9e1714c7..60d84570be32a8 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version": "2.0.22", - "port-version": 1, + "port-version": 2, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 2c75ffdaee5783..996c8a7cb9864a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6490,7 +6490,7 @@ }, "sdl2": { "baseline": "2.0.22", - "port-version": 1 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 2d5eb6aa4acf46..f9218721df854d 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c14a0021322c01cb256a4a54ea48a9ddf8023622", + "version": "2.0.22", + "port-version": 2 + }, { "git-tree": "879012d1bbd3ae67fc697109eedbe6ff713c2c34", "version": "2.0.22", From f06a2f2b495d531366e2038d363aa65043a9322b Mon Sep 17 00:00:00 2001 From: Bryan B Date: Tue, 2 Aug 2022 23:01:19 -0700 Subject: [PATCH 276/791] [gpgmm] Add gpgmm. Highly experimental. (#26045) --- ports/gpgmm/portfile.cmake | 30 ++++++++++++++++++++++++++++++ ports/gpgmm/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gpgmm.json | 9 +++++++++ 4 files changed, 61 insertions(+) create mode 100644 ports/gpgmm/portfile.cmake create mode 100644 ports/gpgmm/vcpkg.json create mode 100644 versions/g-/gpgmm.json diff --git a/ports/gpgmm/portfile.cmake b/ports/gpgmm/portfile.cmake new file mode 100644 index 00000000000000..7a6f054c13e98a --- /dev/null +++ b/ports/gpgmm/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/gpgmm + REF v0.0.4 + SHA512 2ffc3c8299f2d10cb1c0013cd306ba45781a644fa0aa426ef1dfa616e4b53671461a376f65b7068b1ff8a4a2d1a6f9539664174eb5830ea6a760ef5e5d0fc6b0 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DGPGMM_STANDALONE=OFF + -DGPGMM_ENABLE_TESTS=OFF + -DGPGMM_ENABLE_VK=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(GLOB GPGMM_INCLUDE "${SOURCE_PATH}/src/include/*.h") +file(COPY ${GPGMM_INCLUDE} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gpgmm/vcpkg.json b/ports/gpgmm/vcpkg.json new file mode 100644 index 00000000000000..1786fab4056a11 --- /dev/null +++ b/ports/gpgmm/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "gpgmm", + "version": "0.0.4", + "description": "GPGMM is a General-Purpose GPU Memory Management library. It provides a common set of GPU memory routines optimized for GPUs. The library helps developers manage video memory by implementing the necessary functionality across components based on Vulkan or D3D12", + "homepage": "https://github.com/intel/GPGMM/", + "license": "Apache-2.0", + "supports": "windows & !(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 996c8a7cb9864a..0c0daaa2968a9c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2668,6 +2668,10 @@ "baseline": "1.14.0", "port-version": 2 }, + "gpgmm": { + "baseline": "0.0.4", + "port-version": 0 + }, "gppanel": { "baseline": "2020-05-20", "port-version": 2 diff --git a/versions/g-/gpgmm.json b/versions/g-/gpgmm.json new file mode 100644 index 00000000000000..9cc971b5b24e67 --- /dev/null +++ b/versions/g-/gpgmm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "588c2c48227d309001811deaab846ce36476c3c9", + "version": "0.0.4", + "port-version": 0 + } + ] +} From f594392b9de3954361d4b25705acc45a11b5a494 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 Aug 2022 08:10:06 +0200 Subject: [PATCH 277/791] [harfbuzz] always fix pc files (#26098) * harfbuzz always fix pc files * v db --- ports/harfbuzz/portfile.cmake | 2 +- ports/harfbuzz/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 4d44a10ad48edb..745fafcf8b14a9 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -56,7 +56,7 @@ vcpkg_install_meson() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_TARGET_IS_WINDOWS) file(GLOB PC_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/*.pc") diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index e6d81578895644..00ffdb46db05eb 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "harfbuzz", "version": "5.0.1", + "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index 0c0daaa2968a9c..9f359145f497ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2790,7 +2790,7 @@ }, "harfbuzz": { "baseline": "5.0.1", - "port-version": 0 + "port-version": 1 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index e36e45408780fd..ecf2a9a040df33 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "890fd1dc4836a76fac4de6ee409c762ac0afe587", + "version": "5.0.1", + "port-version": 1 + }, { "git-tree": "bfe57115dd9a78a72cbbaadf756e83bbbff449ed", "version": "5.0.1", From d23405ca34bafe90d98dcb2bc058f9559b303d3c Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Wed, 3 Aug 2022 08:17:02 +0200 Subject: [PATCH 278/791] [mp-units] Configure only src folder (#26085) * [mp-units] Configure only src folder * [mp-units] Configure only src folder + add license --- ports/mp-units/cmake.patch | 30 ------------------------------ ports/mp-units/portfile.cmake | 3 +-- ports/mp-units/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/m-/mp-units.json | 5 +++++ 5 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 ports/mp-units/cmake.patch diff --git a/ports/mp-units/cmake.patch b/ports/mp-units/cmake.patch deleted file mode 100644 index d2d4a1a54c4557..00000000000000 --- a/ports/mp-units/cmake.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b18a30a96..d89248aa1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,11 +66,21 @@ conan_init(cmake) - add_subdirectory(src) - - # add usage example --add_subdirectory(example) -+option(BUILD_EXAMPLES "Build usage examples" OFF) -+if(BUILD_EXAMPLES) -+ add_subdirectory(example) -+endif() - - # generate project documentation --add_subdirectory(docs) -+option(BUILD_DOCS "Generate docs" OFF) -+if(BUILD_DOCS) -+ add_subdirectory(docs) -+endif() - - # add unit tests --enable_testing() --add_subdirectory(test) -+option(BUILD_TESTING "Build tests" OFF) -+if(BUILD_TESTING) -+ set_warnings(mp-units) -+ enable_testing() -+ add_subdirectory(test) -+endif() diff --git a/ports/mp-units/portfile.cmake b/ports/mp-units/portfile.cmake index f608f1af1e9c6d..04236589db8e7a 100644 --- a/ports/mp-units/portfile.cmake +++ b/ports/mp-units/portfile.cmake @@ -4,12 +4,11 @@ vcpkg_from_github( REF v0.7.0 SHA512 72175f34f358d0741650ce9c8a7b28fced90cc45ddd3f1662ae1cb9ff7d31403ff742ee07ab4c96bd2d95af714d9111a888cf6acccb91e568e12d1ef663b2f64 PATCHES - cmake.patch config.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/src" ) vcpkg_cmake_install() diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json index e4cc95da2ecd6a..7454612bcdc6ce 100644 --- a/ports/mp-units/vcpkg.json +++ b/ports/mp-units/vcpkg.json @@ -1,8 +1,10 @@ { "name": "mp-units", "version-semver": "0.7.0", + "port-version": 1, "description": "mp-units - A Units Library for C++", "homepage": "https://github.com/mpusz/units", + "license": "MIT", "dependencies": [ "fmt", "gsl-lite", diff --git a/versions/baseline.json b/versions/baseline.json index 9f359145f497ab..a9932b8baa1de3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4710,7 +4710,7 @@ }, "mp-units": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "mp3lame": { "baseline": "3.100", diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json index a8e54c22c1564d..ef5ebfecc2302f 100644 --- a/versions/m-/mp-units.json +++ b/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4bce95b7e67f66db9d613e7e3601c2b90cec665", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "ed05b65c897d6508b0b5f88f8a97373cf8fd8715", "version-semver": "0.7.0", From 1b7528488ce517fef7262965a178672c75162b67 Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Wed, 3 Aug 2022 08:18:11 +0200 Subject: [PATCH 279/791] [librdkafka] Upgrade version up to 1.9.2 (#26126) * Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * [librdkafka] Upgrade up to 1.9.2 * [librdkafka] Upgrade up to 1.9.2 * [librdkafka] Upgrade up to 1.9.2 Co-authored-by: Alexander Smyslov Co-authored-by: Smyslov Alexander Nikolayevich --- ports/librdkafka/portfile.cmake | 4 ++-- ports/librdkafka/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/librdkafka.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 6c0545408c1a6c..88229f55d1f806 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO edenhill/librdkafka - REF v1.9.0 - SHA512 d7bff9ef29befa2cb35b52003f7b7da4425f284600dd268b268a36fb1b915917b26cb1a3e78da40eec78cbb12e2f745d2c1e88ac82f19d2beb38aa20b511438f + REF v1.9.2 + SHA512 f067b227bc784e1dee61261d540632e54a4e5849934d1f55571979fea6b3c6858c27bcd397cf33fbee2409df12b149bb78f201f33646d14b5288a33147a9c9dc HEAD_REF master PATCHES lz4.patch diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index f5ef70938d4941..80f2b47050e517 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,7 +1,6 @@ { "name": "librdkafka", - "version": "1.9.0", - "port-version": 1, + "version": "1.9.2", "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index a9932b8baa1de3..fdf0df6235ad2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4017,8 +4017,8 @@ "port-version": 10 }, "librdkafka": { - "baseline": "1.9.0", - "port-version": 1 + "baseline": "1.9.2", + "port-version": 0 }, "libressl": { "baseline": "3.4.2", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index 3bdd5ea43fda36..0fe173cf52c97d 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec1e8bdb3b0474f51cb416593474395c97ace7e2", + "version": "1.9.2", + "port-version": 0 + }, { "git-tree": "2b06cb5f9952eb1e853ea372a57551fc1b40e009", "version": "1.9.0", From 2c844a929b512a0826014e1614c25ec0f551bd26 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 3 Aug 2022 08:18:23 +0200 Subject: [PATCH 280/791] [sentry-native] Update to 0.5.0 (#26131) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 6 +++--- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 86a8f39101ce53..0c685cc02f1f9c 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.18/sentry-native.zip" - FILENAME "sentry-native-0.4.18.zip" - SHA512 4363961a4a1560cc8777932c890231013cd73a48c51a9d9ce8175b541674da007d3bfd0ed2c50d72da2d75aa49a9004a4ea6638c4754cf29568dd66ebdb596db + URLS "https://github.com/getsentry/sentry-native/releases/download/0.5.0/sentry-native.zip" + FILENAME "sentry-native-0.5.0.zip" + SHA512 54ee5fcbcd58cb70d7acc55a91ef6eb19751321b35d8fd3b0173fe52b1034023dbeb5c891554615b1277e1a1644b25c28ba0c4712839765dd790e3055ab0e79c ) vcpkg_extract_source_archive_ex( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index eb65f61c7f67d4..0fecfcb8ad5506 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version": "0.4.18", + "version": "0.5.0", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index fdf0df6235ad2d..57886a2086d19f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6537,7 +6537,7 @@ "port-version": 1 }, "sentry-native": { - "baseline": "0.4.18", + "baseline": "0.5.0", "port-version": 0 }, "septag-dmon": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 908eafa5b0d48e..ba504217240b30 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "731787acd156ff3881f9ee1cc7c17d70bc1a8ce0", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "2d63a9c2ec32267974a30485bf6f64ca57f1a2f8", "version": "0.4.18", From a79bb7b608398c8bf1518d42306ccefa8f167b5c Mon Sep 17 00:00:00 2001 From: Maxim Ivanov Date: Wed, 3 Aug 2022 08:20:19 +0200 Subject: [PATCH 281/791] [curl] Fix SSL on iOS (#26060) * Fix SSL on iOS Enables secure transport SSL backend on iOS. When CURL_CA_BUNDLE is set (defaults to /etc/ssl/cert.pem) curl sets it as CA for every request, but on iOS this file is missing and curl's `sectransp` SSL implementation can't deal with it, failing the request completely. This change makes CURL_CA_BUNDLE to be unset, much like CURL_CA_PATH so that `sectransp` uses system CA store. * Update versions/c-/curl.json Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/curl/portfile.cmake | 4 ++-- ports/curl/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 51a38dc525203b..f8a1f7e2b00442 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -22,7 +22,7 @@ foreach(feature IN ITEMS "schannel" "sspi" "tool" "winldap") endif() endforeach() -if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) +if("sectransp" IN_LIST FEATURES AND NOT (VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)) message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") endif() @@ -61,7 +61,7 @@ if("idn2" IN_LIST FEATURES) endif() if("sectransp" IN_LIST FEATURES) - list(APPEND OPTIONS -DCURL_CA_PATH=none) + list(APPEND OPTIONS -DCURL_CA_PATH=none -DCURL_CA_BUNDLE=none) endif() # UWP targets diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 35a83ce1a8cb01..24b5adfcc7a40f 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "curl", "version": "7.84.0", + "port-version": 1, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, @@ -131,7 +132,7 @@ "features": [ "sectransp" ], - "platform": "osx" + "platform": "osx | ios" }, { "name": "curl", @@ -147,7 +148,7 @@ "features": [ "openssl" ], - "platform": "(uwp | !windows) & !osx & !mingw" + "platform": "(uwp | !windows) & !(osx | ios) & !mingw" } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 57886a2086d19f..f7cf66db09a754 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1770,7 +1770,7 @@ }, "curl": { "baseline": "7.84.0", - "port-version": 0 + "port-version": 1 }, "curlpp": { "baseline": "2018-06-15", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 52fa7e632520d0..7099572d11c604 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d64a4ac7f080159be045ccbf0a7fa81ef859cfa", + "version": "7.84.0", + "port-version": 1 + }, { "git-tree": "984e0a92df662f6022989c2b5889e7d9f1c133d5", "version": "7.84.0", From 5bb332b432e0fa3899de1a2ef8fc4c10c435408d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 Aug 2022 08:21:20 +0200 Subject: [PATCH 282/791] [cjson] respect toolchain flags (#26094) * cjson respect toolchain flags and add license * v db --- ports/cjson/portfile.cmake | 1 + ports/cjson/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/cjson.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake index 340de48e5b4f76..db548215426c7a 100644 --- a/ports/cjson/portfile.cmake +++ b/ports/cjson/portfile.cmake @@ -29,6 +29,7 @@ vcpkg_cmake_configure( -DENABLE_HIDDEN_SYMBOLS=${DENABLE_HIDDEN_SYMBOLS} -DENABLE_TARGET_EXPORT=ON # Export CMake config files -DENABLE_CJSON_TEST=OFF + -DENABLE_CUSTOM_COMPILER_FLAGS=OFF -DENABLE_FUZZING=OFF ${FEATURE_OPTIONS} ) diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json index cfdfb121e120b9..0a8e10b1dcd8d5 100644 --- a/ports/cjson/vcpkg.json +++ b/ports/cjson/vcpkg.json @@ -1,9 +1,10 @@ { "name": "cjson", "version": "1.7.15", - "port-version": 1, + "port-version": 2, "description": "Ultralightweight JSON parser in ANSI C", "homepage": "https://github.com/DaveGamble/cJSON", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index f7cf66db09a754..e46e1cfe191985 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1406,7 +1406,7 @@ }, "cjson": { "baseline": "1.7.15", - "port-version": 1 + "port-version": 2 }, "clamav": { "baseline": "0.103.0", diff --git a/versions/c-/cjson.json b/versions/c-/cjson.json index d8f68b8d1d1e6a..f2f67dd1a70b47 100644 --- a/versions/c-/cjson.json +++ b/versions/c-/cjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "025e76be26389108c3e0cf79e5ed1ea589c7b90e", + "version": "1.7.15", + "port-version": 2 + }, { "git-tree": "cb79fc0bdbc6754cf6c267d97e2825655929351b", "version": "1.7.15", From bf1a252f85b8e3655a49385e60d020137c9e89d6 Mon Sep 17 00:00:00 2001 From: crisboarna Date: Wed, 3 Aug 2022 20:21:37 +0300 Subject: [PATCH 283/791] [libjuice] chore(version): updated to 1.0.3 (#26142) * feat(libjuice): bumped version to 1.0.3 * feat(libjuice): bumped version to 1.0.3 * feat(libjuice): bumped version to 1.0.3 * feat(libjuice): bumped version to 1.0.3 * feat(libjuice): bumped version to 1.0.3 --- ports/libjuice/portfile.cmake | 4 ++-- ports/libjuice/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjuice.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index 5d78756e117eff..59413249f59170 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF e7218e30fef3cd4437355aca817fa0980863973a #v1.0.2 - SHA512 b54c827774509915e98faec9891b5121ff50c01c33081480b805ca2f0910f26446cb75d7f721a0b8dfcc87ea7988c7020793befd2788ed132c0f608d434c7eca + REF 89bc87dd526849dc786ad6e986ad70efc4e37382 #v1.0.3 + SHA512 5ea1e327d53d40482f27e1709a1669472a8b213208431396ea2c89829db82a989e17af03e655138dd5f2c4610d6ae862fbab66525cb7a61d13d6486fb7fd87ab HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index e5ddc0e56d6e92..6b83db0c38fd84 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "1.0.2", + "version": "1.0.3", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index e46e1cfe191985..5c4ef10239bd84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3761,7 +3761,7 @@ "port-version": 3 }, "libjuice": { - "baseline": "1.0.2", + "baseline": "1.0.3", "port-version": 0 }, "libjxl": { diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 992eec8b03266d..7681b9a2a3982a 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14dfa625a6a7c50182396dca9eae0ec9a38c01ab", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "0d17a1b43666a1d6a177ed4a0d434f92e16ea791", "version": "1.0.2", From 48f5177c574ec0ebf1f74533c37d842bb3a983e2 Mon Sep 17 00:00:00 2001 From: crisboarna Date: Wed, 3 Aug 2022 20:22:54 +0300 Subject: [PATCH 284/791] [libdatachannel] chore(version): updated to 0.17.9 (#26141) * feat(libdatachannel): update hash * feat(libdatachannel): update versions * feat(libdatachannel): update port version * feat(libjuice): bumped version to 0.17.9 * feat(libjuice): bumped version to 0.17.9 --- ports/libdatachannel/portfile.cmake | 4 ++-- ports/libdatachannel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 5f417f589605d3..0c0cfb5d75e619 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF 2b1c7382520ffe0a27b60e409250875ec757526c #v0.17.8 - SHA512 1a440763e3a7738e87a15370159283ab83a566f1a728f8e267b41b643c80c9cf47b106895c715300494072298ab3399f905ce43973d17099d268cd1f1b8f3fc3 + REF f8ac6955e3cd673ac23a2172cd7dc42fc013b7b3 #v0.17.9 + SHA512 3a8e3a47032a1fad770639c1bac266388c87046432cd44b391f146820cf3d3a871834e104deb9fb6fa901d6f82eba8aea0baa0b0eeb7cfb24808c408b020407b HEAD_REF master PATCHES ${PATCHES} diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 00198cb565fa3a..91c3ed175a9863 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.17.8", + "version-semver": "0.17.9", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 5c4ef10239bd84..f395039b6065cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3553,7 +3553,7 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.17.8", + "baseline": "0.17.9", "port-version": 0 }, "libdatrie": { diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 340da207d5b900..931bf410d42ff8 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91ca5987e29fac6963c6ee8d6c4f91ecb621dd81", + "version-semver": "0.17.9", + "port-version": 0 + }, { "git-tree": "0770e9b271c6d1eb630a403f754c2dd2ee93f1c6", "version-semver": "0.17.8", From cdd1edc286b6599ca93faefe81dc50ed09838448 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 4 Aug 2022 01:26:21 +0800 Subject: [PATCH 285/791] [wxwidgets] Add feature fonts (#26113) * add feature fonts * update * add dependedcies * update --- ports/wxwidgets/portfile.cmake | 1 + ports/wxwidgets/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 1e2b2d15d72014..4d3aef825c8ce6 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -35,6 +35,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES sound wxUSE_SOUND + fonts wxUSE_PRIVATE_FONTS ) set(OPTIONS_RELEASE "") diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 54eeafebf54a5a..a44afe12e6d2cf 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wxwidgets", "version": "3.2.0", + "port-version": 1, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", @@ -42,6 +43,19 @@ "example": { "description": "Example source code and CMake project" }, + "fonts": { + "description": "Enable to use the font functionality of wxWidgets", + "dependencies": [ + { + "name": "fontconfig", + "platform": "!windows & !osx" + }, + { + "name": "pango", + "platform": "!windows & !osx" + } + ] + }, "sound": { "description": "Build wxSound support", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f395039b6065cd..f9580d9264a2ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7682,7 +7682,7 @@ }, "wxwidgets": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index de0d1ba03679b1..b9ea32ebfa5d93 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d78ddc0e26a382e0eeca82b767dfbed70dda82e", + "version": "3.2.0", + "port-version": 1 + }, { "git-tree": "204fda7008c12569ddf44a935b32bbe5df87cef4", "version": "3.2.0", From ec2ab620f8a00a2e01a7f186f5e228c7e2ac278e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 Aug 2022 19:30:09 +0200 Subject: [PATCH 286/791] [snappy] fix clang-cl builds (#26057) * snappy fix clang-cl builds * v db * CI Retriger --- ports/snappy/fix_clang-cl_build.patch | 13 +++++++++++++ ports/snappy/portfile.cmake | 2 ++ ports/snappy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/snappy.json | 5 +++++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/snappy/fix_clang-cl_build.patch diff --git a/ports/snappy/fix_clang-cl_build.patch b/ports/snappy/fix_clang-cl_build.patch new file mode 100644 index 00000000000000..b981e3076a4fde --- /dev/null +++ b/ports/snappy/fix_clang-cl_build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 672561e62..b6930b834 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,7 @@ if(NOT CMAKE_CXX_STANDARD) + endif(NOT CMAKE_CXX_STANDARD) + + # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake +-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++if(MSVC) + # Use the highest warning level for Visual Studio. + set(CMAKE_CXX_WARNING_LEVEL 4) + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake index 45b8c706db2d64..6660b86efd4627 100644 --- a/ports/snappy/portfile.cmake +++ b/ports/snappy/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 1.1.9 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 HEAD_REF master + PATCHES + fix_clang-cl_build.patch ) vcpkg_cmake_configure( diff --git a/ports/snappy/vcpkg.json b/ports/snappy/vcpkg.json index 593b023434c80b..ecc8a2aea534e6 100644 --- a/ports/snappy/vcpkg.json +++ b/ports/snappy/vcpkg.json @@ -1,7 +1,7 @@ { "name": "snappy", "version": "1.1.9", - "port-version": 1, + "port-version": 2, "description": "A fast compressor/decompressor.", "homepage": "https://github.com/google/snappy", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f9580d9264a2ca..f9a9391151f5e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6674,7 +6674,7 @@ }, "snappy": { "baseline": "1.1.9", - "port-version": 1 + "port-version": 2 }, "sndfile": { "baseline": "0", diff --git a/versions/s-/snappy.json b/versions/s-/snappy.json index 5e6b9bad1909a3..0ee914f721abba 100644 --- a/versions/s-/snappy.json +++ b/versions/s-/snappy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7122115f0f35f7f90f7a7adc1d15a4b6f7af5315", + "version": "1.1.9", + "port-version": 2 + }, { "git-tree": "c92c17d378451a07e9cc974fa31893d1cae61b66", "version": "1.1.9", From 02a26abda5cac9bb4e27aea509192e98cc797fa4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 3 Aug 2022 19:40:07 +0200 Subject: [PATCH 287/791] [gstreamer] fix clang-cl builds (#26096) * gstreamer fix clang-cl * v db --- ports/gstreamer/fix-clang-cl-bad.patch | 111 +++++++++++++++++++ ports/gstreamer/fix-clang-cl-base.patch | 22 ++++ ports/gstreamer/fix-clang-cl-good.patch | 22 ++++ ports/gstreamer/fix-clang-cl-gstreamer.patch | 57 ++++++++++ ports/gstreamer/fix-clang-cl-ugly.patch | 13 +++ ports/gstreamer/fix-clang-cl.patch | 22 ++++ ports/gstreamer/portfile.cmake | 11 +- ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 + 10 files changed, 260 insertions(+), 7 deletions(-) create mode 100644 ports/gstreamer/fix-clang-cl-bad.patch create mode 100644 ports/gstreamer/fix-clang-cl-base.patch create mode 100644 ports/gstreamer/fix-clang-cl-good.patch create mode 100644 ports/gstreamer/fix-clang-cl-gstreamer.patch create mode 100644 ports/gstreamer/fix-clang-cl-ugly.patch create mode 100644 ports/gstreamer/fix-clang-cl.patch diff --git a/ports/gstreamer/fix-clang-cl-bad.patch b/ports/gstreamer/fix-clang-cl-bad.patch new file mode 100644 index 00000000000000..92e96f3c44c02c --- /dev/null +++ b/ports/gstreamer/fix-clang-cl-bad.patch @@ -0,0 +1,111 @@ +diff --git a/ext/dts/meson.build b/ext/dts/meson.build +index 8ab3fc917..c19aa2264 100644 +--- a/ext/dts/meson.build ++++ b/ext/dts/meson.build +@@ -15,7 +15,7 @@ if not dca_dep.found() + endif + + no_warn_c_args = [] +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + # autotools didn't use the libdca pkg-config cflags, and they + # can point to a non-existing location (/usr/include/dca) + no_warn_c_args = ['-Wno-missing-include-dirs'] +diff --git a/gst-libs/gst/d3d11/meson.build b/gst-libs/gst/d3d11/meson.build +index 4a844ef75..cd97e8f7a 100644 +--- a/gst-libs/gst/d3d11/meson.build ++++ b/gst-libs/gst/d3d11/meson.build +@@ -174,7 +174,7 @@ endif + + # MinGW 32bits compiler seems to be complaining about redundant-decls + # when ComPtr is in use. Let's just disable the warning +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + extra_args = cc.get_supported_arguments([ + '-Wno-redundant-decls', + ]) +diff --git a/meson.build b/meson.build +index 7cab556e0..35531110b 100644 +--- a/meson.build ++++ b/meson.build +@@ -45,7 +45,7 @@ endif + + cdata = configuration_data() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +diff --git a/sys/asio/meson.build b/sys/asio/meson.build +index 3006d26ce..1afbd0022 100644 +--- a/sys/asio/meson.build ++++ b/sys/asio/meson.build +@@ -15,7 +15,7 @@ endif + + # FIXME: non-msvc is not tested, and unlikely supported yet because of + # tool-chain issue +-if cxx.get_id() != 'msvc' ++if cxx.get_argument_syntax() != 'msvc' + if asio_option.enabled() + error('asio plugin can only be built with MSVC') + else +diff --git a/sys/d3d11/meson.build b/sys/d3d11/meson.build +index 43f213d9c..9c9e9b535 100644 +--- a/sys/d3d11/meson.build ++++ b/sys/d3d11/meson.build +@@ -102,7 +102,7 @@ endif + + # MinGW 32bits compiler seems to be complaining about redundant-decls + # when ComPtr is in use. Let's just disable the warning +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + extra_mingw_args = cc.get_supported_arguments([ + '-Wno-redundant-decls', + ]) +diff --git a/sys/decklink/meson.build b/sys/decklink/meson.build +index d869e79a4..c7b37a7c6 100644 +--- a/sys/decklink/meson.build ++++ b/sys/decklink/meson.build +@@ -18,7 +18,7 @@ decklink_libs = [] + + if host_system == 'windows' + decklink_sources += ['win/DeckLinkAPIDispatch.cpp', 'win/DeckLinkAPI_i.c'] +- if cxx.get_id() == 'msvc' ++ if cxx.get_argument_syntax() == 'msvc' + # FIXME: Use commsuppwd.lib for debug builds? + comutil_dep = cxx.find_library('comsuppw', required : get_option('decklink')) + if comutil_dep.found() +diff --git a/sys/mediafoundation/meson.build b/sys/mediafoundation/meson.build +index 828954909..af570f9ff 100644 +--- a/sys/mediafoundation/meson.build ++++ b/sys/mediafoundation/meson.build +@@ -48,7 +48,7 @@ if host_system != 'windows' or mf_option.disabled() + subdir_done() + endif + +-if cc.get_id() != 'msvc' ++if cc.get_argument_syntax() != 'msvc' + if mf_option.enabled() + error('mediafoundation plugin can only be built with MSVC') + endif +diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build +index a77160049..7c834d8ed 100644 +--- a/sys/msdk/meson.build ++++ b/sys/msdk/meson.build +@@ -139,13 +139,13 @@ if have_mfx_ver134 + endif + + if host_machine.system() == 'windows' +- if cc.get_id() != 'msvc' and msdk_option.enabled() ++ if cc.get_argument_syntax() != 'msvc' and msdk_option.enabled() + error('msdk plugin can only be built with MSVC') + endif + legacy_stdio_dep = cc.find_library('legacy_stdio_definitions', required: get_option('msdk')) + d3d11_dep = cc.find_library('d3d11', required: get_option('msdk')) + msdk_deps = declare_dependency(dependencies: [d3d11_dep, legacy_stdio_dep]) +- msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_id() == 'msvc' ++ msdk_deps_found = d3d11_dep.found() and legacy_stdio_dep.found() and cc.get_argument_syntax() == 'msvc' + else + libva_dep = dependency('libva', required: get_option('msdk')) + libva_drm_dep = dependency('libva-drm', required: get_option('msdk')) diff --git a/ports/gstreamer/fix-clang-cl-base.patch b/ports/gstreamer/fix-clang-cl-base.patch new file mode 100644 index 00000000000000..4c406427dc5aa1 --- /dev/null +++ b/ports/gstreamer/fix-clang-cl-base.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 495671ebb..fff3ea518 100644 +--- a/meson.build ++++ b/meson.build +@@ -43,7 +43,7 @@ plugins = [] + + cc = meson.get_compiler('c') + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -75,7 +75,7 @@ endif + core_conf = configuration_data() + + # Symbol visibility +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + export_define = '__declspec(dllexport) extern' + elif cc.has_argument('-fvisibility=hidden') + add_project_arguments('-fvisibility=hidden', language: 'c') diff --git a/ports/gstreamer/fix-clang-cl-good.patch b/ports/gstreamer/fix-clang-cl-good.patch new file mode 100644 index 00000000000000..d2ed46e83ffe59 --- /dev/null +++ b/ports/gstreamer/fix-clang-cl-good.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 64705379f..0c55b9732 100644 +--- a/meson.build ++++ b/meson.build +@@ -30,7 +30,7 @@ plugins = [] + cc = meson.get_compiler('c') + host_system = host_machine.system() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -183,7 +183,7 @@ cdata.set('SIZEOF_OFF_T', cc.sizeof('off_t')) + # Here be fixmes. + # FIXME: check if this is correct + cdata.set('HAVE_CPU_X86_64', host_machine.cpu() == 'amd64') +-cdata.set('HAVE_GCC_ASM', cc.get_id() != 'msvc') ++cdata.set('HAVE_GCC_ASM', cc.get_argument_syntax() != 'msvc') + cdata.set_quoted('VERSION', gst_version) + cdata.set_quoted('PACKAGE_VERSION', gst_version) + cdata.set_quoted('GST_LICENSE', 'LGPL') diff --git a/ports/gstreamer/fix-clang-cl-gstreamer.patch b/ports/gstreamer/fix-clang-cl-gstreamer.patch new file mode 100644 index 00000000000000..928a5785fe8d89 --- /dev/null +++ b/ports/gstreamer/fix-clang-cl-gstreamer.patch @@ -0,0 +1,57 @@ +diff --git a/gst/parse/meson.build b/gst/parse/meson.build +index 35ed6f2f4..5e38e49ea 100644 +--- a/gst/parse/meson.build ++++ b/gst/parse/meson.build +@@ -16,7 +16,7 @@ else + endif + + flex_cdata.set('FLEX', flex.path()) +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + flex_cdata.set('FLEX_ARGS', '--nounistd') + else + flex_cdata.set('FLEX_ARGS', '') +diff --git a/meson.build b/meson.build +index 772809e15..70b1eafc5 100644 +--- a/meson.build ++++ b/meson.build +@@ -36,7 +36,7 @@ cc = meson.get_compiler('c') + + cdata = configuration_data() + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it +@@ -61,7 +61,7 @@ endif + + # Symbol visibility + have_visibility_hidden = false +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + export_define = '__declspec(dllexport) extern' + elif cc.has_argument('-fvisibility=hidden') + add_project_arguments('-fvisibility=hidden', language: 'c') +@@ -313,8 +313,10 @@ static __uint128_t v2 = 10; + static __uint128_t u; + u = v1 / v2; + }''' +-if cc.compiles(uint128_t_src, name : '__uint128_t available') +- cdata.set('HAVE_UINT128_T', 1) ++if cc.get_argument_syntax() != 'msvc' ++ if cc.compiles(uint128_t_src, name : '__uint128_t available') ++ cdata.set('HAVE_UINT128_T', 1) ++ endif + endif + + # All supported platforms have long long now +@@ -322,7 +324,7 @@ cdata.set('HAVE_LONG_LONG', 1) + + # We only want to use the __declspec(dllexport/import) dance in GST_EXPORT when + # building with MSVC +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 1) + else + cdata.set('GSTCONFIG_BUILT_WITH_MSVC', 0) diff --git a/ports/gstreamer/fix-clang-cl-ugly.patch b/ports/gstreamer/fix-clang-cl-ugly.patch new file mode 100644 index 00000000000000..ae83ee48294796 --- /dev/null +++ b/ports/gstreamer/fix-clang-cl-ugly.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 14be48c4c..83d019874 100644 +--- a/meson.build ++++ b/meson.build +@@ -31,7 +31,7 @@ if have_cxx + cxx = meson.get_compiler('cpp') + endif + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + msvc_args = [ + # Ignore several spurious warnings for things gstreamer does very commonly + # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it diff --git a/ports/gstreamer/fix-clang-cl.patch b/ports/gstreamer/fix-clang-cl.patch new file mode 100644 index 00000000000000..d6eded2f573279 --- /dev/null +++ b/ports/gstreamer/fix-clang-cl.patch @@ -0,0 +1,22 @@ +diff --git a/meson.build b/meson.build +index 1316366ed..daeaf3cb1 100644 +--- a/meson.build ++++ b/meson.build +@@ -62,7 +62,7 @@ endif + # Ensure that MSVC interprets all source code as UTF-8. Only do this when we're + # not a subproject, because subprojects are not allowed to call + # add_global_arguments(). +-if not meson.is_subproject() and cc.get_id() == 'msvc' ++if not meson.is_subproject() and cc.get_argument_syntax() == 'msvc' + add_global_arguments( + cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8 + language: ['c', 'cpp']) +@@ -316,7 +316,7 @@ if get_option('default_library') == 'static' + if cc.has_link_argument(link_arg) + gstfull_link_args += link_arg + link_deps += symbol_map +- elif cc.get_id() == 'msvc' ++ elif cc.get_argument_syntax() == 'msvc' + warning('FIXME: Provide a def file to publish the public symbols') + else + error('Failed to link with version script (' + symbol_map + '), check logs for details') diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 25cfb74b8fcb9c..c247ff86e2c4d4 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 HEAD_REF master - PATCHES gstreamer-disable-hot-doc.patch + PATCHES gstreamer-disable-hot-doc.patch fix-clang-cl.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_SOURCE_PATH @@ -12,7 +12,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 HEAD_REF master - PATCHES gstreamer-disable-no-unused.patch + PATCHES gstreamer-disable-no-unused.patch fix-clang-cl-gstreamer.patch ) if(VCPKG_TARGET_IS_WINDOWS) list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch) @@ -25,7 +25,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 d2005e6a3bda5f08395b131347e8f4054c2469e04e65d1acc1a1572bf10d81d4dad4e43d6a8600346b6175a2310f81157a0cd27398ef69b5363b16346febfb39 HEAD_REF master - PATCHES ${PLUGIN_BASE_PATCHES} + PATCHES ${PLUGIN_BASE_PATCHES} fix-clang-cl-base.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_GOOD_SOURCE_PATH @@ -33,7 +33,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 71e9f36d407db3b75d9a68f6447093aa011b2b586b06e0a1bb79c7db37c9114de505699e99a4dad06d8d9c742e91f48dd35457283babe440f88a9e40d3da465b HEAD_REF master - PATCHES ${PLUGIN_GOOD_PATCHES} + PATCHES ${PLUGIN_GOOD_PATCHES} fix-clang-cl-good.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_BAD_SOURCE_PATH @@ -41,6 +41,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 f63ca3abf380bba92dca4ac3a51cba5ea95093693cf64d167a7a9c0bf6341c35a74fd42332673dbd1581ea70da0a35026aa3e2ce99b5e573268ccb55b5491c1d HEAD_REF master + PATCHES fix-clang-cl-bad.patch ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_UGLY_SOURCE_PATH @@ -48,7 +49,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a HEAD_REF master - PATCHES ${PLUGIN_UGLY_PATCHES} + PATCHES ${PLUGIN_UGLY_PATCHES} fix-clang-cl-ugly.patch ) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 43bfd15e654f30..0c7b5d83d14e9b 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 5, + "port-version": 6, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f9a9391151f5e3..2f4865261751d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2726,7 +2726,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 5 + "port-version": 6 }, "gtest": { "baseline": "1.12.1", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 4accf168ca7504..f475f0a1ba9894 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38", + "version": "1.19.2", + "port-version": 6 + }, { "git-tree": "0524a22dbda0c09201b9c677b6f72dbce870d6df", "version": "1.19.2", From 7122b744575254e989228d3a507a6e4ccca9e1b2 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 3 Aug 2022 20:58:02 +0200 Subject: [PATCH 288/791] [libmariadb] Fix features (#26077) * [libmariadb] Fix features * format * version * Fix license + features * format * version --- ports/libmariadb/portfile.cmake | 12 ++++-------- ports/libmariadb/vcpkg.json | 5 ++++- versions/baseline.json | 2 +- versions/l-/libmariadb.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 5ec7726802d862..de0692c18490a5 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -1,4 +1,4 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/libmysql") +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/libmysql") message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") endif() @@ -6,10 +6,6 @@ if("openssl" IN_LIST FEATURES AND "schannel" IN_LIST FEATURES) message(FATAL_ERROR "Only one SSL backend must be selected.") endif() -if("schannel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature schannel not supported on non-Windows platforms.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariadb-corporation/mariadb-connector-c @@ -29,7 +25,7 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES + FEATURES iconv WITH_ICONV mariadbclient VCPKG_MARIADBCLIENT ) @@ -46,7 +42,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DINSTALL_INCLUDEDIR=include/mysql # legacy port decisiong + -DINSTALL_INCLUDEDIR=include/mysql # legacy port decisiong -DINSTALL_LIBDIR=lib -DINSTALL_PLUGINDIR=plugins/${PORT} -DWITH_UNIT_TESTS=OFF @@ -69,9 +65,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libmariadb.pc" " -lmariadb" " -llibmariadb") endif() endif() + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# copy license file file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json index 6d0742e7fd14f0..f7e0a754eb4f01 100644 --- a/ports/libmariadb/vcpkg.json +++ b/ports/libmariadb/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libmariadb", "version-semver": "3.1.15", + "port-version": 1, "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", + "license": "LGPL-2.1-or-later", "supports": "!uwp", "dependencies": [ { @@ -35,7 +37,8 @@ ] }, "schannel": { - "description": "SSL support (Secure Channel)" + "description": "SSL support (Secure Channel)", + "supports": "windows | mingw" }, "ssl": { "description": "Default SSL backend", diff --git a/versions/baseline.json b/versions/baseline.json index 2f4865261751d3..612e936d1048df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3818,7 +3818,7 @@ }, "libmariadb": { "baseline": "3.1.15", - "port-version": 0 + "port-version": 1 }, "libmaxminddb": { "baseline": "1.4.3", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index 2a3c4716b4dcd0..ffe7b80bf4569b 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06122c8b00cc582d3ee36072fcbd03fa9385f238", + "version-semver": "3.1.15", + "port-version": 1 + }, { "git-tree": "c51d4e78081ee708c1cdebeaaa201aa0064079e3", "version-semver": "3.1.15", From 14ce35f4526fd99ba48416450daff43281e22085 Mon Sep 17 00:00:00 2001 From: jureviciusr Date: Thu, 4 Aug 2022 01:28:45 +0300 Subject: [PATCH 289/791] [Libcaer] Update to latest version (#25934) * Libcaer update * Libcaer portfile version update * Updating head * Libcaer version update * Renaming references to avoid caching problems * [libcaer] Version bump * Removing redundant dash in version string * [libcaer] version bump * Fixing duplicate version * Updating in regards to comments * Add versions Co-authored-by: Rokas Jurevicius --- ports/libcaer/libcaer-static-build.patch | 74 ------------------------ ports/libcaer/portfile.cmake | 10 ++-- ports/libcaer/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libcaer.json | 5 ++ 5 files changed, 12 insertions(+), 84 deletions(-) delete mode 100644 ports/libcaer/libcaer-static-build.patch diff --git a/ports/libcaer/libcaer-static-build.patch b/ports/libcaer/libcaer-static-build.patch deleted file mode 100644 index 2070184aaca7b7..00000000000000 --- a/ports/libcaer/libcaer-static-build.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3b1937a..b9bc122 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ OPTION(ENABLE_SERIALDEV "Enable support for serial port devices using libserialp - OPTION(ENABLE_OPENCV "Enable support for frame enhancements using OpenCV" OFF) - OPTION(UDEV_INSTALL "Install udev rules on Linux" ON) - OPTION(EXAMPLES_INSTALL "Build and install examples" OFF) -+OPTION(ENABLE_BINDIR_INSTALLATION "Split archive and binary installation targets [required for vcpkg installation]" OFF) -+OPTION(BUILD_SHARED_LIBS "Build libcaer as a shared library" ON) - - # Cross-compile support - IF(NOT USER_LOCAL_PREFIX) -@@ -50,7 +52,7 @@ MESSAGE(STATUS "Base libraries: ${BASE_LIBS}") - INCLUDE(FindPkgConfig) - - # Required: basic USB devices support --IF(CC_MSVC) -+IF(ENABLE_BINDIR_INSTALLATION) - FIND_PACKAGE(libusb CONFIG REQUIRED) - ELSE() - PKG_CHECK_MODULES( -@@ -98,7 +100,7 @@ INCLUDE(CMakePackageConfigHelpers) - WRITE_BASIC_CONFIG_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMajorVersion) - SET(include_dirs ${CMAKE_INSTALL_INCLUDEDIR}) --IF(CC_MSVC) -+IF(ENABLE_BINDIR_INSTALLATION) - SET(export_destination ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) - ELSE() - SET(export_destination ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 377a556..8461627 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -19,6 +19,10 @@ IF(NOT CC_MSVC) - SET(LIBCAER_COMPILE_OPTIONS "-Wno-unused-function") - ENDIF() - -+IF(OS_MACOS) -+ LIST(APPEND LIBCAER_COMPILE_OPTIONS "-Wno-implicit-function-declaration") -+ENDIF() -+ - SET(LIBCAER_LINK_LIBRARIES_PRIVATE ${BASE_LIBS}) - - IF(OS_LINUX) -@@ -54,6 +58,9 @@ ENDIF() - - IF(CC_MSVC) - LIST(APPEND LIBCAER_SOURCES ../thirdparty/simple-stdatomic/stdatomic.c) -+ENDIF() -+ -+IF(ENABLE_BINDIR_INSTALLATION) - INCLUDE_DIRECTORIES(${LIBUSB_INCLUDE_DIRS}) - LIST(APPEND LIBCAER_LINK_LIBRARIES_PRIVATE ${LIBUSB_LIBRARIES}) - ELSE() -@@ -63,7 +70,7 @@ ENDIF() - # Set full RPATH - SET(CMAKE_INSTALL_RPATH ${USER_LOCAL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) - --ADD_LIBRARY(caer SHARED ${LIBCAER_SOURCES}) -+ADD_LIBRARY(caer ${LIBCAER_SOURCES}) - IF(CC_MSVC) - # This flag needs to be propagated down to depending targets to avoid compilation errors - TARGET_COMPILE_OPTIONS(caer INTERFACE -DWIN32_LEAN_AND_MEAN=ON) -@@ -94,7 +101,7 @@ IF(ENABLE_STATIC) - - SET_TARGET_PROPERTIES(caerStatic PROPERTIES OUTPUT_NAME caer) - -- IF(OS_WINDOWS) -+ IF(ENABLE_BINDIR_INSTALLATION) - INSTALL( - TARGETS caerStatic - EXPORT libcaer-exports diff --git a/ports/libcaer/portfile.cmake b/ports/libcaer/portfile.cmake index ac2335e242ea0f..109b423972c90d 100644 --- a/ports/libcaer/portfile.cmake +++ b/ports/libcaer/portfile.cmake @@ -2,11 +2,9 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com/inivation/ OUT_SOURCE_PATH SOURCE_PATH REPO dv/libcaer - REF 3.3.14 - SHA512 6e91ebd20796b59c51ebb10be58d12577f3b6370425bbeffcf1a96ff91ad9f3ffaefb2741d0a932b241f2664c157d77158cf475b0f7e39ba208d5482f408fc8b - HEAD_REF ab9470e8900364822fb74ad3c1e99fa4088914df - PATCHES - libcaer-static-build.patch + REF 933dfa60a138091afb03014f8c24183bab7bba4e + SHA512 6e74e308833ca3c923b318a42bab30edb04f763cdd5b243701416b72278d7315fdd8a62ebb87b704212507f76c3e45bc9728df17ea2d1eab5133dfcf550c8c35 + HEAD_REF master ) vcpkg_cmake_configure( @@ -14,7 +12,7 @@ vcpkg_cmake_configure( OPTIONS -DENABLE_OPENCV=ON -DEXAMPLES_INSTALL=OFF - -DENABLE_BINDIR_INSTALLATION=ON + -DBUILD_CONFIG_VCPKG=ON ) vcpkg_cmake_install() diff --git a/ports/libcaer/vcpkg.json b/ports/libcaer/vcpkg.json index 854ddb30067297..e2801c57c73f2b 100644 --- a/ports/libcaer/vcpkg.json +++ b/ports/libcaer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libcaer", - "version": "3.3.14", - "port-version": 1, + "version-date": "2022-07-25", "description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.", "homepage": "https://gitlab.com/inivation/dv/libcaer", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 612e936d1048df..bb71fe2d90f1b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3501,8 +3501,8 @@ "port-version": 1 }, "libcaer": { - "baseline": "3.3.14", - "port-version": 1 + "baseline": "2022-07-25", + "port-version": 0 }, "libcanberra": { "baseline": "0.30", diff --git a/versions/l-/libcaer.json b/versions/l-/libcaer.json index 6b35b88bb30c0c..ef505c428f1728 100644 --- a/versions/l-/libcaer.json +++ b/versions/l-/libcaer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b5ee918213a05dc43d5e7f3eb33b2961609c430", + "version-date": "2022-07-25", + "port-version": 0 + }, { "git-tree": "275713cf9dbdd13533fe379ad7f8c81fcf9a895c", "version": "3.3.14", From 6a29f32abbefd09581e1bd4898db761f8c9cc9cf Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 4 Aug 2022 01:00:49 +0200 Subject: [PATCH 290/791] [avisynthplus] fix clang-cl/intel with ninja generator (#26092) * avisynthplus fix for clang-cl * v db --- ports/avisynthplus/clang-cl.patch | 20 ++++++++++++++++++++ ports/avisynthplus/portfile.cmake | 2 ++ ports/avisynthplus/vcpkg.json | 3 ++- versions/a-/avisynthplus.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 ports/avisynthplus/clang-cl.patch diff --git a/ports/avisynthplus/clang-cl.patch b/ports/avisynthplus/clang-cl.patch new file mode 100644 index 00000000000000..c5cf087f80b1fa --- /dev/null +++ b/ports/avisynthplus/clang-cl.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d60332e63..0216970fc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,7 +188,15 @@ endif() + endif() + ENDIF() + ++ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") ++ set(CLANG_IN_VS "1") ++ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") ++ set(IntelLLVM_IN_VS "1") ++ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC") ++ set(IntelClassic_IN_VS "1") ++ endif() ++ + IF(CLANG_IN_VS STREQUAL "1") + #these are unknown + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions") + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions") diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index 4851bb0f9b70f1..5e018b73c2e478 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v3.7.2 SHA512 82cf2afed4cc53c0e09d367ff3df1db0e9ac17ff2458e4660c646430d8e72f472b072a3910c9595b26eb5ac89c82fe74699acab3869014f87d8e2738b81568a1 HEAD_REF master + PATCHES + clang-cl.patch # the normal lookup is not working since it doesn't take Ninja as a Generator into account ) vcpkg_download_distfile(GHC_ARCHIVE diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index f2a64817c1081b..26af95e8ea038c 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "avisynthplus", - "version-semver": "3.7.2", + "version": "3.7.2", + "port-version": 1, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "https://avs-plus.net/", "license": "GPL-2.0", diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index fa886037d29c6e..feb78b21b2ff3b 100644 --- a/versions/a-/avisynthplus.json +++ b/versions/a-/avisynthplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10f62c32226c4f588e4524ebe1ffc36a2ad2165a", + "version": "3.7.2", + "port-version": 1 + }, { "git-tree": "e3749b45c163c78cdd03a7e47223634ba17ab58f", "version-semver": "3.7.2", diff --git a/versions/baseline.json b/versions/baseline.json index bb71fe2d90f1b1..6bd189f349b4cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -254,7 +254,7 @@ }, "avisynthplus": { "baseline": "3.7.2", - "port-version": 0 + "port-version": 1 }, "avro-c": { "baseline": "1.11.0", From 42886097a9ec862df69b8a345c7020a10a243d56 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 3 Aug 2022 18:59:19 -0700 Subject: [PATCH 291/791] [glib] Support static build on Windows. (#25937) * [glib] Support static build on Windows. As suggested by @Neumann-A * Remove ci.baseline.txt entries. * ci.baseline.txt updates. REGRESSION: atk:x64-windows-static failed with BUILD_FAILED. If expected, add atk:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: gdk-pixbuf:x64-windows-static failed with BUILD_FAILED. If expected, add gdk-pixbuf:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: glibmm:x64-windows-static failed with BUILD_FAILED. If expected, add glibmm:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: glibmm:x64-windows-static-md failed with BUILD_FAILED. If expected, add glibmm:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: gstreamer:x64-windows-static failed with BUILD_FAILED. If expected, add gstreamer:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: gstreamer:x64-windows-static-md failed with BUILD_FAILED. If expected, add gstreamer:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: lcm:x64-windows-static-md failed with BUILD_FAILED. If expected, add lcm:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: libgxps:x64-windows-static-md failed with BUILD_FAILED. If expected, add libgxps:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. Previously blocked by glib supports expression. REGRESSION: mfl:x64-windows-static-md failed with BUILD_FAILED. If expected, add mfl:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. This was not blocked before but it's an ICE; I'm going to hope it's intermittent I guess? Drive by fixed alphabetizing boringssl. * [mfl] Skip ICE. * openscap was previously blocked by the supports, the others are just extending the static-md skip to static. --- ports/glib/portfile.cmake | 6 --- ports/glib/vcpkg.json | 4 +- scripts/ci.baseline.txt | 79 ++++++++++++++++++--------------------- versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++ 5 files changed, 44 insertions(+), 52 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index e20145df7550db..6ef70d2bda037c 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -1,9 +1,3 @@ -# Glib relies on DllMain on Windows -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - #remove if merged: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1655 -endif() - set(GLIB_MAJOR_MINOR 2.72) set(GLIB_PATCH 3) vcpkg_from_gitlab( diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 61fb879f2c7a6c..90268a3e24d224 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,11 +1,11 @@ { "name": "glib", "version": "2.72.3", - "port-version": 1, + "port-version": 2, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-only", - "supports": "!uwp & !(windows & static)", + "supports": "!uwp", "dependencies": [ "dirent", "gettext", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index da8f38a96ae709..3d8c57f65e5f02 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -34,25 +34,9 @@ # Add new items alphabetically -# script ports -#vcpkg-cmake:arm64-windows=fail -#vcpkg-cmake:arm-uwp=fail -#vcpkg-cmake:x64-uwp=fail -#vcpkg-cmake:x64-windows-static=fail -#vcpkg-cmake:x64-windows-static-md=fail -#vcpkg-cmake:x86-windows=fail - -#vcpkg-cmake-config:arm64-windows=fail -#vcpkg-cmake-config:arm-uwp=fail -#vcpkg-cmake-config:x64-uwp=fail -#vcpkg-cmake-config:x64-windows-static=fail -#vcpkg-cmake-config:x64-windows-static-md=fail -#vcpkg-cmake-config:x86-windows=fail - -# other ports # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail - +atk:x64-windows-static=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail @@ -60,6 +44,17 @@ bitserializer:arm64-osx=fail blitz:x64-uwp=fail blitz:arm64-windows=fail blitz:arm-uwp=fail +# Conflicts with openssl +boringssl:arm64-windows=skip +boringssl:arm-uwp=skip +boringssl:x64-linux=skip +boringssl:x64-osx=skip +boringssl:arm64-osx=skip +boringssl:x64-uwp=skip +boringssl:x64-windows=skip +boringssl:x64-windows-static=skip +boringssl:x64-windows-static-md=skip +boringssl:x86-windows=skip bond:arm-uwp=fail bond:x64-osx=fail bond:arm64-osx=fail @@ -275,6 +270,7 @@ ftgl:arm-uwp=fail functions-framework-cpp:x64-uwp=fail gazebo:x64-linux=fail +gdk-pixbuf:x64-windows-static=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip gsoap:x86-windows = skip @@ -306,17 +302,18 @@ gherkin-c:x86-windows = skip glew:arm64-windows=fail glfw3:arm-uwp=fail glfw3:x64-uwp=fail -glib:x64-uwp=fail -glib:x64-windows-static=fail -gmmlib:arm64-windows=fail +glibmm:x64-windows-static-md=fail +glibmm:x64-windows-static=fail gmmlib:arm-uwp=fail +gmmlib:arm64-windows=fail gmmlib:x64-osx=fail gmmlib:x64-uwp=fail -gmmlib:x64-windows=fail -gmmlib:x64-windows-static=fail gmmlib:x64-windows-static-md=fail +gmmlib:x64-windows-static=fail +gmmlib:x64-windows=fail gmmlib:x86-windows=fail - +gstreamer:x64-windows-static=fail +gstreamer:x64-windows-static-md=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail gperftools:arm64-windows=fail @@ -392,6 +389,8 @@ kfr:arm-uwp=fail kfr:x64-linux=fail lastools:arm-uwp=fail lastools:x64-uwp=fail +lcm:x64-windows-static=fail +lcm:x64-windows-static-md=fail leptonica:x64-uwp=fail leptonica:arm-uwp=fail leveldb:arm-uwp=fail @@ -423,11 +422,11 @@ libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail - # the msbuild for libgpg:x64-uwp and libgpg-error:x64-uwp are broken on VS2022 due to TargetPlatformMinVersion not existing libgpg:x64-uwp=fail libgpg-error:x64-uwp=fail - +libgxps:x64-windows-static=fail +libgxps:x64-windows-static-md=fail libhdfs3:x64-linux=fail libhdfs3:x64-osx=fail libhdfs3:arm64-osx=fail @@ -503,25 +502,15 @@ libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip # Conflicts with openssl -boringssl:arm64-windows = skip -boringssl:arm-uwp = skip -boringssl:x64-linux = skip -boringssl:x64-osx = skip -boringssl:arm64-osx = skip -boringssl:x64-uwp = skip -boringssl:x64-windows = skip -boringssl:x64-windows-static = skip -boringssl:x64-windows-static-md=skip -boringssl:x86-windows = skip -libressl:arm64-windows = skip -libressl:arm-uwp = skip -libressl:x64-linux = skip -libressl:x64-osx = skip -libressl:x64-uwp = skip -libressl:x64-windows = skip -libressl:x64-windows-static = skip +libressl:arm64-windows=skip +libressl:arm-uwp=skip +libressl:x64-linux=skip +libressl:x64-osx=skip +libressl:x64-uwp=skip +libressl:x64-windows=skip +libressl:x64-windows-static=skip libressl:x64-windows-static-md=skip -libressl:x86-windows = skip +libressl:x86-windows=skip libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail @@ -615,6 +604,9 @@ mesa:x64-windows-static=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail +# Triggers an ICE +mfl:x64-windows-static=fail +mfl:x64-windows-static-md=fail mfl:x64-linux=skip mfl:x64-osx=skip mfl:arm64-osx=skip @@ -808,6 +800,7 @@ openmesh:arm-uwp=fail openmesh:x64-uwp=fail openni2:x64-uwp=fail openni2:x64-windows-static=fail +openscap:x64-windows-static=fail openscap:x64-osx=fail openvpn3:x64-osx=fail openvr:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 6bd189f349b4cc..cd8dcf6a85bc40 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2590,7 +2590,7 @@ }, "glib": { "baseline": "2.72.3", - "port-version": 1 + "port-version": 2 }, "glibmm": { "baseline": "2.70.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index c8997a2e077b55..44a0da5ebaa44c 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aed4b2abc6c22c9b49d18ad5ab5d3f12cb330d22", + "version": "2.72.3", + "port-version": 2 + }, { "git-tree": "5d5171b8b2d18d7a24e54d5a062aa18b5effb3f4", "version": "2.72.3", From 63d08e949d3ad2ec5017039f7b62b4990490f49c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 3 Aug 2022 18:59:36 -0700 Subject: [PATCH 292/791] [gklib,metis,parmetis] Update sources for metis et al. to GitHub (#26020) * Remove bogus arguments in the `vcpkg create` template. * [gklib] Add new port in support of metis and parmetis. New port checklist: * Review the code :) * Check the name against https://repology.org/ There are 2 packages, both of which seem to be the same thing * Check the name against Bing/Google. It's the first entry. * Check the source code for optional `find_package`s There are none. * Check that the versioning scheme and license match what upstream says They have none. * Check that the source code comes from the upstream project's authoritative source. We did. * Check that the generated usage is accurate. * Check that the reported license is accurate. We hope so. * [metis] Update source to github. Resolves https://github.com/microsoft/vcpkg/issues/25764 Competes with https://github.com/microsoft/vcpkg/pull/25953 * [parmetis] Update source to github. * Add licenses. * Fix GKlib case. * Fix metis install. --- ports/gklib/build-fixes.patch | 87 +++++++++++ ports/gklib/portfile.cmake | 25 +++ ports/gklib/vcpkg.json | 17 +++ ports/metis/build-fixes.patch | 144 ++++++++++++++++++ ports/metis/disable-programs.patch | 8 - ports/metis/enable-install.patch | 15 -- ports/metis/fix-INT_MIN_define.patch | 34 ----- ports/metis/fix-gklib-vs14-math.patch | 11 -- ports/metis/fix-linux-build-error.patch | 14 -- ports/metis/fix-metis-vs14-math.patch | 11 -- .../fix-runtime-install-destination.patch | 10 -- ports/metis/install-metisConfig.patch | 44 ------ ports/metis/portfile.cmake | 63 +++----- ports/metis/vcpkg.json | 17 ++- ports/parmetis/build-fixes.patch | 98 ++++++++++++ ports/parmetis/fix-gklib-vs14-math.patch | 11 -- .../parmetis/fix-libparmetis-cmakelist.patch | 15 -- ports/parmetis/fix-metis-vs14-math.patch | 11 -- ports/parmetis/fix-root-cmakelist-2.patch | 18 --- ports/parmetis/fix-root-cmakelist.patch | 29 ---- ports/parmetis/portfile.cmake | 43 +++--- ports/parmetis/vcpkg.json | 14 +- scripts/templates/portfile.in.cmake | 2 +- versions/baseline.json | 12 +- versions/g-/gklib.json | 9 ++ versions/m-/metis.json | 5 + versions/p-/parmetis.json | 5 + 27 files changed, 463 insertions(+), 309 deletions(-) create mode 100644 ports/gklib/build-fixes.patch create mode 100644 ports/gklib/portfile.cmake create mode 100644 ports/gklib/vcpkg.json create mode 100644 ports/metis/build-fixes.patch delete mode 100644 ports/metis/disable-programs.patch delete mode 100644 ports/metis/enable-install.patch delete mode 100644 ports/metis/fix-INT_MIN_define.patch delete mode 100644 ports/metis/fix-gklib-vs14-math.patch delete mode 100644 ports/metis/fix-linux-build-error.patch delete mode 100644 ports/metis/fix-metis-vs14-math.patch delete mode 100644 ports/metis/fix-runtime-install-destination.patch delete mode 100644 ports/metis/install-metisConfig.patch create mode 100644 ports/parmetis/build-fixes.patch delete mode 100644 ports/parmetis/fix-gklib-vs14-math.patch delete mode 100644 ports/parmetis/fix-libparmetis-cmakelist.patch delete mode 100644 ports/parmetis/fix-metis-vs14-math.patch delete mode 100644 ports/parmetis/fix-root-cmakelist-2.patch delete mode 100644 ports/parmetis/fix-root-cmakelist.patch create mode 100644 versions/g-/gklib.json diff --git a/ports/gklib/build-fixes.patch b/ports/gklib/build-fixes.patch new file mode 100644 index 00000000000000..b5a7b9eae6e833 --- /dev/null +++ b/ports/gklib/build-fixes.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cd1b4b..a6b629e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.22) + project(GKlib C) + + option(BUILD_SHARED_LIBS "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)" OFF) +@@ -22,10 +22,12 @@ if(UNIX) + target_link_libraries(GKlib m) + endif(UNIX) + +-include_directories("test") +-add_subdirectory("test") +- +-install(TARGETS GKlib +- ARCHIVE DESTINATION lib/${LINSTALL_PATH} +- LIBRARY DESTINATION lib/${LINSTALL_PATH}) +-install(FILES ${GKlib_includes} DESTINATION include/${HINSTALL_PATH}) ++install(TARGETS GKlib EXPORT GKlibTargets ++ INCLUDES DESTINATION "include/GKlib" ++ ) ++install(FILES ${GKlib_includes} DESTINATION "include/GKlib") ++install(FILES "win32/adapt.h" DESTINATION "include/GKlib/win32") ++install(EXPORT GKlibTargets FILE "GKlibTargets.cmake" DESTINATION "share/GKlib") ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/GKlib/GKlibConfig.cmake" [=[ ++include("${CMAKE_CURRENT_LIST_DIR}/GKlibTargets.cmake") ++]=]) +diff --git a/GKlibSystem.cmake b/GKlibSystem.cmake +index d83b208..8019067 100644 +--- a/GKlibSystem.cmake ++++ b/GKlibSystem.cmake +@@ -16,7 +16,6 @@ option(GKRAND "enable GKRAND support" OFF) + + # Add compiler flags. + if(MSVC) +- set(GKlib_COPTS "/Ox") + set(GKlib_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX") + elseif(MINGW) + set(GKlib_COPTS "-DUSE_GKREGEX") +@@ -34,7 +33,7 @@ if(CMAKE_COMPILER_IS_GNUCC) + set(GKlib_COPTIONS "${GKlib_COPTIONS} -fPIC") + endif(NOT MINGW) + # GCC warnings. +- set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") ++ set(GKlib_COPTIONS "${GKlib_COPTIONS} -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GKlib_COPTIONS "${GKlib_COPTIONS} -xc99") +@@ -60,7 +59,7 @@ endif(OPENMP) + if(GDB) + set(GKlib_COPTS "${GKlib_COPTS} -g") + set(GKlib_COPTIONS "${GKlib_COPTIONS} -Werror") +-else() ++elseif(0) + set(GKlib_COPTS "-O3") + endif(GDB) + +diff --git a/gk_arch.h b/gk_arch.h +index 8c8ac50..122e087 100644 +--- a/gk_arch.h ++++ b/gk_arch.h +@@ -31,9 +31,9 @@ + #endif + + +-#ifdef __MSC__ +- #include "ms_stdint.h" +- #include "ms_inttypes.h" ++#ifdef __MSC__ ++ #include ++ #include + #include "ms_stat.h" + #include "win32/adapt.h" + #else +@@ -60,9 +60,4 @@ typedef ptrdiff_t ssize_t; + #define PTRDIFF_MAX INT64_MAX + #endif + +-/* MSC does not have INFINITY defined */ +-#ifndef INFINITY +-#define INFINITY FLT_MAX +-#endif +- + #endif diff --git a/ports/gklib/portfile.cmake b/ports/gklib/portfile.cmake new file mode 100644 index 00000000000000..6a52d4bc19528b --- /dev/null +++ b/ports/gklib/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KarypisLab/GKlib + REF b1cb3bd7f6bf4da641af901c8d455c0f858c816f + SHA512 e906c7af8b40ce1c4c4ea43cbfca3e3970e5595686333ac9ac80c6cbc558feb0e833f530f034161927030edac5272234c6ac9cad5287cb6edab0c0671ba3644c + PATCHES + build-fixes.patch +) + +# Delete files that are workarounds for very old copies of msvc. +file(REMOVE "${SOURCE_PATH}/ms_inttypes.h" "${SOURCE_PATH}/ms_stdint.h") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME GKlib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +gklib provides CMake targets: + find_package(GKlib CONFIG REQUIRED) + target_link_libraries(main PRIVATE GKlib) +]=]) diff --git a/ports/gklib/vcpkg.json b/ports/gklib/vcpkg.json new file mode 100644 index 00000000000000..ff521f2ee753dd --- /dev/null +++ b/ports/gklib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gklib", + "version-date": "2022-07-27", + "description": "General helper libraries for KarypisLab.", + "homepage": "https://github.com/KarypisLab/GKlib/", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/metis/build-fixes.patch b/ports/metis/build-fixes.patch new file mode 100644 index 00000000000000..c9e42193ba1bb4 --- /dev/null +++ b/ports/metis/build-fixes.patch @@ -0,0 +1,144 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a15d19a..7210a61 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,9 +1,9 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.22) + project(METIS C) + + set(SHARED FALSE CACHE BOOL "build a shared library") + +-if(MSVC) ++if(0) + set(METIS_INSTALL FALSE) + else() + set(METIS_INSTALL TRUE) +@@ -34,19 +34,13 @@ include(./conf/gkbuild.cmake) + # + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${METIS_COPTIONS}") + +- +-# Add include directories. +-# i.e., the -I equivalent +-include_directories(build/xinclude) +-include_directories(${GKLIB_PATH}/include) +-include_directories(${CMAKE_INSTALL_PREFIX}/include) +- +-# List of paths that the compiler will search for library files. +-# i.e., the -L equivalent +-link_directories(${GKLIB_PATH}/lib) +-link_directories(${CMAKE_INSTALL_PREFIX}/lib) +- + # Recursively look for CMakeLists.txt in subdirs. +-add_subdirectory("build/xinclude") ++add_subdirectory("include") + add_subdirectory("libmetis") +-add_subdirectory("programs") ++ ++install(EXPORT metisTargets FILE "metisTargets.cmake" DESTINATION "share/metis") ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/metis/metisConfig.cmake" [=[ ++include(CMakeFindDependencyMacro) ++find_dependency(GKlib CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/metisTargets.cmake") ++]=]) +diff --git a/conf/gkbuild.cmake b/conf/gkbuild.cmake +index 96435e5..ff43f05 100644 +--- a/conf/gkbuild.cmake ++++ b/conf/gkbuild.cmake +@@ -16,7 +16,6 @@ option(GKRAND "enable GKRAND support" OFF) + + # Add compiler flags. + if(MSVC) +- set(GK_COPTS "/Ox") + set(GK_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX") + elseif(MINGW) + set(GK_COPTS "-DUSE_GKREGEX") +@@ -38,7 +37,7 @@ endif(VALGRIND) + set(GK_COPTIONS "${GK_COPTIONS} -fPIC") + endif(NOT MINGW) + # GCC warnings. +- set(GK_COPTIONS "${GK_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") ++ set(GK_COPTIONS "${GK_COPTIONS} -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GK_COPTIONS "${GK_COPTIONS} -xc99") +@@ -69,7 +68,7 @@ endif(OPENMP) + if(GDB) + set(GK_COPTS "${GK_COPTS} -g") + set(GK_COPTIONS "${GK_COPTIONS} -Werror") +-else() ++elseif(0) + set(GK_COPTS "-O3") + endif(GDB) + +diff --git a/include/metis.h b/include/metis.h +index 7fef0e7..f8e5dcf 100644 +--- a/include/metis.h ++++ b/include/metis.h +@@ -30,7 +30,7 @@ + GCC does provides these definitions in stdint.h, but it may require some + modifications on other architectures. + --------------------------------------------------------------------------*/ +-//#define IDXTYPEWIDTH 32 ++#define IDXTYPEWIDTH 32 + + + /*-------------------------------------------------------------------------- +@@ -40,7 +40,7 @@ + 32 : single precission floating point (float) + 64 : double precission floating point (double) + --------------------------------------------------------------------------*/ +-//#define REALTYPEWIDTH 32 ++#define REALTYPEWIDTH 32 + + + +@@ -72,10 +72,14 @@ typedef __int64 int64_t; + #define PRId64 "I64d" + #define SCNd32 "ld" + #define SCNd64 "I64d" ++#ifdef _WIN32 ++#include ++#else + #define INT32_MIN ((int32_t)_I32_MIN) + #define INT32_MAX _I32_MAX + #define INT64_MIN ((int64_t)_I64_MIN) + #define INT64_MAX _I64_MAX ++#endif // ^^^ !_WIN32 + #else + #include + #endif +diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt +index fc6cec6..8aeb89a 100644 +--- a/libmetis/CMakeLists.txt ++++ b/libmetis/CMakeLists.txt +@@ -6,10 +6,9 @@ file(GLOB metis_sources *.c) + + # Build libmetis. + add_library(metis ${METIS_LIBRARY_TYPE} ${metis_sources}) ++find_package(GKlib CONFIG REQUIRED) ++target_link_libraries(metis PUBLIC GKlib) ++target_include_directories(metis PRIVATE "../include") + +-if(METIS_INSTALL) +- install(TARGETS metis +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib +- ARCHIVE DESTINATION lib) +-endif() ++install(TARGETS metis EXPORT metisTargets ++ INCLUDES DESTINATION include) +diff --git a/libmetis/metislib.h b/libmetis/metislib.h +index dc224f4..1efccda 100644 +--- a/libmetis/metislib.h ++++ b/libmetis/metislib.h +@@ -31,7 +31,7 @@ + #include "proto.h" + + +-#if defined(COMPILER_MSC) ++#if defined(COMPILER_MSC) && (_MSC_VER < 1900) + #if defined(rint) + #undef rint + #endif diff --git a/ports/metis/disable-programs.patch b/ports/metis/disable-programs.patch deleted file mode 100644 index 0c23be55373e80..00000000000000 --- a/ports/metis/disable-programs.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/CMakeLists.txt Wed Dec 21 18:24:22 2016 -+++ b/CMakeLists.txt Wed Dec 21 18:24:26 2016 -@@ -20,4 +20,4 @@ - # Recursively look for CMakeLists.txt in subdirs. - add_subdirectory("include") - add_subdirectory("libmetis") --add_subdirectory("programs") -+# add_subdirectory("programs") diff --git a/ports/metis/enable-install.patch b/ports/metis/enable-install.patch deleted file mode 100644 index 9f36623add836c..00000000000000 --- a/ports/metis/enable-install.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt Sat Mar 30 17:24:45 2013 -+++ b/CMakeLists.txt Wed Dec 21 18:23:43 2016 -@@ -4,11 +4,7 @@ - set(GKLIB_PATH "GKlib" CACHE PATH "path to GKlib") - set(SHARED FALSE CACHE BOOL "build a shared library") - --if(MSVC) -- set(METIS_INSTALL FALSE) --else() -- set(METIS_INSTALL TRUE) --endif() -+set(METIS_INSTALL TRUE) - - # Configure libmetis library. - if(SHARED) diff --git a/ports/metis/fix-INT_MIN_define.patch b/ports/metis/fix-INT_MIN_define.patch deleted file mode 100644 index 97d7881f546100..00000000000000 --- a/ports/metis/fix-INT_MIN_define.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/include/metis.h b/include/metis.h -index dc5406a..7732437 100644 ---- a/include/metis.h -+++ b/include/metis.h -@@ -72,10 +72,14 @@ typedef __int64 int64_t; - #define PRId64 "I64d" - #define SCNd32 "ld" - #define SCNd64 "I64d" -+#ifdef _WIN32 -+#include -+#else - #define INT32_MIN ((int32_t)_I32_MIN) - #define INT32_MAX _I32_MAX - #define INT64_MIN ((int64_t)_I64_MIN) - #define INT64_MAX _I64_MAX -+#endif - #else - #include - #endif -diff --git a/GKlib/gk_arch.h b/GKlib/gk_arch.h -index 78b1431..7258763 100644 ---- a/GKlib/gk_arch.h -+++ b/GKlib/gk_arch.h -@@ -32,8 +32,8 @@ - - - #ifdef __MSC__ -- #include "ms_stdint.h" -- #include "ms_inttypes.h" -+ #include -+ #include - #include "ms_stat.h" - #else - #ifndef SUNOS diff --git a/ports/metis/fix-gklib-vs14-math.patch b/ports/metis/fix-gklib-vs14-math.patch deleted file mode 100644 index e83a6823066670..00000000000000 --- a/ports/metis/fix-gklib-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/GKlib/gk_arch.h Wed Dec 21 18:34:18 2016 -+++ b/GKlib/gk_arch.h Wed Dec 21 18:30:49 2016 -@@ -58,7 +58,7 @@ - #define PTRDIFF_MAX INT64_MAX - #endif - --#ifdef __MSC__ -+#if defined(__MSC__) && (_MSC_VER < 1900) - /* MSC does not have rint() function */ - #define rint(x) ((int)((x)+0.5)) - diff --git a/ports/metis/fix-linux-build-error.patch b/ports/metis/fix-linux-build-error.patch deleted file mode 100644 index b3563a881b33d7..00000000000000 --- a/ports/metis/fix-linux-build-error.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e94f050..b9613a7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,8 @@ - cmake_minimum_required(VERSION 2.8) - project(METIS) - --set(GKLIB_PATH "GKlib" CACHE PATH "path to GKlib") -+set(GKLIB_PATH "${CMAKE_SOURCE_DIR}/GKlib" CACHE PATH "path to GKlib") -+ - set(SHARED FALSE CACHE BOOL "build a shared library") - - set(METIS_INSTALL TRUE) diff --git a/ports/metis/fix-metis-vs14-math.patch b/ports/metis/fix-metis-vs14-math.patch deleted file mode 100644 index a296213e8c8a3a..00000000000000 --- a/ports/metis/fix-metis-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libmetis/metislib.h Sat Mar 30 17:24:45 2013 -+++ b/libmetis/metislib.h Wed Dec 21 18:30:59 2016 -@@ -31,7 +31,7 @@ - #include - - --#if defined(COMPILER_MSC) -+#if defined(COMPILER_MSC) && (_MSC_VER < 1900) - #if defined(rint) - #undef rint - #endif diff --git a/ports/metis/fix-runtime-install-destination.patch b/ports/metis/fix-runtime-install-destination.patch deleted file mode 100644 index 8d9147e5f9117c..00000000000000 --- a/ports/metis/fix-runtime-install-destination.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libmetis/CMakeLists.txt Sat Mar 30 17:24:45 2013 -+++ b/libmetis/CMakeLists.txt Wed Dec 21 17:41:37 2016 -@@ -11,6 +11,6 @@ - if(METIS_INSTALL) - install(TARGETS metis - LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -+ RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib) - endif() diff --git a/ports/metis/install-metisConfig.patch b/ports/metis/install-metisConfig.patch deleted file mode 100644 index c07600a85e8418..00000000000000 --- a/ports/metis/install-metisConfig.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b9613a7..e43ffee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,3 +22,23 @@ include_directories(include) - add_subdirectory("include") - add_subdirectory("libmetis") - # add_subdirectory("programs") -+ -+if(METIS_INSTALL) -+ set(PRJ_NAME metis) -+ set(PRJ_VER 5.1.0) -+ install(EXPORT metisTargets -+ FILE ${PRJ_NAME}Targets.cmake -+ DESTINATION lib/cmake/${PRJ_NAME}) -+ include(CMakePackageConfigHelpers) -+ write_basic_package_version_file( -+ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake -+ VERSION ${PRJ_VER} -+ COMPATIBILITY SameMajorVersion) -+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake -+ "include(\${CMAKE_CURRENT_LIST_DIR}/${PRJ_NAME}Targets.cmake)") -+ install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}ConfigVersion.cmake -+ ${CMAKE_CURRENT_BINARY_DIR}/${PRJ_NAME}Config.cmake -+ DESTINATION lib/cmake/${PRJ_NAME}) -+endif() -+ -diff --git a/libmetis/CMakeLists.txt b/libmetis/CMakeLists.txt -index 7a5fc74..5a68cf0 100644 ---- a/libmetis/CMakeLists.txt -+++ b/libmetis/CMakeLists.txt -@@ -9,8 +9,9 @@ if(UNIX) - endif() - - if(METIS_INSTALL) -- install(TARGETS metis -+ install(TARGETS metis EXPORT metisTargets - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin -- ARCHIVE DESTINATION lib) -+ ARCHIVE DESTINATION lib -+ INCLUDES DESTINATION include) - endif() diff --git a/ports/metis/portfile.cmake b/ports/metis/portfile.cmake index 07f5d025721678..1004a2fe1ce358 100644 --- a/ports/metis/portfile.cmake +++ b/ports/metis/portfile.cmake @@ -1,41 +1,22 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(OPTIONS -DSHARED=OFF) - -set(METIS_VERSION 5.1.0) - -vcpkg_download_distfile(ARCHIVE - URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-${METIS_VERSION}.tar.gz" - FILENAME "metis-${METIS_VERSION}.tar.gz" - SHA512 deea47749d13bd06fbeaf98a53c6c0b61603ddc17a43dae81d72c8015576f6495fd83c11b0ef68d024879ed5415c14ebdbd87ce49c181bdac680573bea8bdb25 -) - -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${METIS_VERSION} - PATCHES - enable-install.patch - disable-programs.patch - fix-runtime-install-destination.patch - fix-metis-vs14-math.patch - fix-gklib-vs14-math.patch - fix-linux-build-error.patch - install-metisConfig.patch - fix-INT_MIN_define.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${OPTIONS} -) - -vcpkg_install_cmake() -vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/metis) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/metis) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH + REPO KarypisLab/METIS + REF 94c03a6e2d1860128c2d0675cbbb86ad4f261256 + SHA512 9f24329fa0f0856d0b5d10a489574d857bc4538d9639055fc895363cf70aa37342eaf7bc08819500ff6d5b98a4aa99f4241880622b540d4c484ca19e693d3480 + PATCHES + build-fixes.patch + ) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +metis provides CMake targets: + find_package(metis CONFIG REQUIRED) + target_link_libraries(main PRIVATE metis) +]=]) diff --git a/ports/metis/vcpkg.json b/ports/metis/vcpkg.json index 82baa5438e954d..f5b9c260d84f7c 100644 --- a/ports/metis/vcpkg.json +++ b/ports/metis/vcpkg.json @@ -1,7 +1,18 @@ { "name": "metis", - "version-string": "5.1.0", - "port-version": 8, + "version-date": "2022-07-27", "description": "Serial Graph Partitioning and Fill-reducing Matrix Ordering", - "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/metis/overview" + "homepage": "https://github.com/KarypisLab/METIS", + "license": "Apache-2.0", + "dependencies": [ + "gklib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/parmetis/build-fixes.patch b/ports/parmetis/build-fixes.patch new file mode 100644 index 00000000000000..ff12d4551d5baa --- /dev/null +++ b/ports/parmetis/build-fixes.patch @@ -0,0 +1,98 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 146bc5f..8d6ae23 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.22) + project(ParMETIS C) + + +@@ -24,20 +24,16 @@ include(./conf/gkbuild.cmake) + # i.e., the -I equivalent + include_directories(include) + include_directories(${MPI_INCLUDE_PATH}) +-include_directories(${GKLIB_PATH}/include) +-include_directories(${METIS_PATH}/include) +-include_directories(${CMAKE_INSTALL_PREFIX}/include) +- +-# List of paths that the compiler will search for library files. +-# i.e., the -L equivalent +-link_directories(${GKLIB_PATH}/lib) +-link_directories(${METIS_PATH}/lib) +-link_directories(${CMAKE_INSTALL_PREFIX}/lib) +- + # List of directories that cmake will look for CMakeLists.txt +-add_subdirectory(include) + add_subdirectory(libparmetis) +-add_subdirectory(programs) + + # This is for testing during development and is not being distributed + #add_subdirectory(test) ++ ++install(EXPORT parmetisTargets FILE "parmetisTargets.cmake" DESTINATION "share/parmetis") ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/parmetis/parmetisConfig.cmake" [=[ ++include(CMakeFindDependencyMacro) ++find_dependency(GKlib CONFIG) ++find_dependency(metis CONFIG) ++include("${CMAKE_CURRENT_LIST_DIR}/parmetisTargets.cmake") ++]=]) +diff --git a/conf/gkbuild.cmake b/conf/gkbuild.cmake +index afcafdd..3040b09 100644 +--- a/conf/gkbuild.cmake ++++ b/conf/gkbuild.cmake +@@ -15,7 +15,6 @@ option(GKRAND "enable GKRAND support" OFF) + + # Add compiler flags. + if(MSVC) +- set(GK_COPTS "/Ox") + set(GK_COPTIONS "-DWIN32 -DMSC -D_CRT_SECURE_NO_DEPRECATE -DUSE_GKREGEX") + elseif(MINGW) + set(GK_COPTS "-DUSE_GKREGEX") +@@ -33,7 +32,7 @@ if(CMAKE_COMPILER_IS_GNUCC) + set(GK_COPTIONS "${GK_COPTIONS} -fPIC") + endif(NOT MINGW) + # GCC warnings. +- set(GK_COPTIONS "${GK_COPTIONS} -Werror -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") ++ set(GK_COPTIONS "${GK_COPTIONS} -Wall -pedantic -Wno-unused-function -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unknown-pragmas -Wno-unused-label") + elseif(${CMAKE_C_COMPILER_ID} MATCHES "Sun") + # Sun insists on -xc99. + set(GK_COPTIONS "${GK_COPTIONS} -xc99") +@@ -64,7 +63,7 @@ endif(OPENMP) + if(GDB) + set(GK_COPTS "${GK_COPTS} -g") + set(GK_COPTIONS "${GK_COPTIONS} -Werror") +-else() ++elseif(0) + set(GK_COPTS "-O3") + endif(GDB) + +@@ -135,4 +134,3 @@ endif() + + # Finally set the official C flags. + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GK_COPTIONS} ${GK_COPTS}") +- +diff --git a/libparmetis/CMakeLists.txt b/libparmetis/CMakeLists.txt +index e8c3213..dcdf64e 100644 +--- a/libparmetis/CMakeLists.txt ++++ b/libparmetis/CMakeLists.txt +@@ -4,10 +4,14 @@ include_directories(.) + # Find sources. + file(GLOB parmetis_sources *.c) + ++find_package(GKlib CONFIG REQUIRED) ++find_package(metis CONFIG REQUIRED) ++find_package(MPI REQUIRED) ++ + # Create libparmetis + add_library(parmetis ${ParMETIS_LIBRARY_TYPE} ${parmetis_sources}) +- +-install(TARGETS parmetis +- LIBRARY DESTINATION lib +- RUNTIME DESTINATION lib +- ARCHIVE DESTINATION lib) ++target_link_libraries(parmetis PRIVATE GKlib metis ${MPI_C_LIBRARIES}) ++target_include_directories(parmetis PUBLIC ${MPI_C_INCLUDE_DIRS}) ++target_include_directories(parmetis PRIVATE "../include") ++install(FILES "../include/parmetis.h" DESTINATION "include") ++install(TARGETS parmetis EXPORT parmetisTargets INCLUDES DESTINATION include) diff --git a/ports/parmetis/fix-gklib-vs14-math.patch b/ports/parmetis/fix-gklib-vs14-math.patch deleted file mode 100644 index 059890e36f6f30..00000000000000 --- a/ports/parmetis/fix-gklib-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/metis/GKlib/gk_arch.h Wed Dec 21 18:34:18 2016 -+++ b/metis/GKlib/gk_arch.h Wed Dec 21 18:30:49 2016 -@@ -58,7 +58,7 @@ - #define PTRDIFF_MAX INT64_MAX - #endif - --#ifdef __MSC__ -+#if defined(__MSC__) && (_MSC_VER < 1900) - /* MSC does not have rint() function */ - #define rint(x) ((int)((x)+0.5)) - diff --git a/ports/parmetis/fix-libparmetis-cmakelist.patch b/ports/parmetis/fix-libparmetis-cmakelist.patch deleted file mode 100644 index 6cdd7be62228a3..00000000000000 --- a/ports/parmetis/fix-libparmetis-cmakelist.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/libparmetis/CMakeLists.txt Sat Mar 30 17:24:50 2013 -+++ b/libparmetis/CMakeLists.txt Wed Dec 21 19:40:28 2016 -@@ -5,10 +5,10 @@ - # Create libparmetis - add_library(parmetis ${ParMETIS_LIBRARY_TYPE} ${parmetis_sources}) - # Link with metis and MPI libraries. --target_link_libraries(parmetis metis ${MPI_LIBRARIES}) -+target_link_libraries(parmetis ${METIS_LIBRARY} ${MPI_LIBRARIES}) - set_target_properties(parmetis PROPERTIES LINK_FLAGS "${MPI_LINK_FLAGS}") - - install(TARGETS parmetis - LIBRARY DESTINATION lib -- RUNTIME DESTINATION lib -+ RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib) diff --git a/ports/parmetis/fix-metis-vs14-math.patch b/ports/parmetis/fix-metis-vs14-math.patch deleted file mode 100644 index ddf10052a7525b..00000000000000 --- a/ports/parmetis/fix-metis-vs14-math.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/metis/libmetis/metislib.h Sat Mar 30 17:24:45 2013 -+++ b/metis/libmetis/metislib.h Wed Dec 21 18:30:59 2016 -@@ -31,7 +31,7 @@ - #include - - --#if defined(COMPILER_MSC) -+#if defined(COMPILER_MSC) && (_MSC_VER < 1900) - #if defined(rint) - #undef rint - #endif diff --git a/ports/parmetis/fix-root-cmakelist-2.patch b/ports/parmetis/fix-root-cmakelist-2.patch deleted file mode 100644 index 8f4630bfac7433..00000000000000 --- a/ports/parmetis/fix-root-cmakelist-2.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt 2013-03-30 17:24:50.000000000 +0100 -+++ b/CMakeLists.txt 2021-04-20 10:41:49.946801222 +0200 -@@ -1,12 +1,12 @@ - cmake_minimum_required(VERSION 2.8) - project(ParMETIS) - --set(GKLIB_PATH METIS/GKlib CACHE PATH "path to GKlib") --set(METIS_PATH METIS CACHE PATH "path to METIS") -+set(GKLIB_PATH ${CMAKE_CURRENT_SOURCE_DIR}/metis/GKlib CACHE PATH "path to GKlib") -+set(METIS_PATH metis CACHE PATH "path to METIS") - - # Symlink ./metis to wherever metis is. This allows files to be - # included from metis/libmetis/. --execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) -+#execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${METIS_PATH} metis) - - # Search for MPI. - # GK commented this out as it seems to be creating problems diff --git a/ports/parmetis/fix-root-cmakelist.patch b/ports/parmetis/fix-root-cmakelist.patch deleted file mode 100644 index 914bf9189c7538..00000000000000 --- a/ports/parmetis/fix-root-cmakelist.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/CMakeLists.txt Sat Mar 30 17:24:50 2013 -+++ b/CMakeLists.txt Wed Dec 21 19:38:12 2016 -@@ -16,6 +16,9 @@ - # endif() - # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MPI_COMPILE_FLAGS}") - -+find_package(MPI REQUIRED) -+find_library(METIS_LIBRARY NAMES metis) -+ - # Prepare libraries. - if(SHARED) - set(ParMETIS_LIBRARY_TYPE SHARED) -@@ -30,13 +33,13 @@ - include_directories(include) - include_directories(${MPI_INCLUDE_PATH}) - include_directories(${GKLIB_PATH}) --include_directories(${METIS_PATH}/include) -+# include_directories(${METIS_PATH}/include) - - # List of directories that cmake will look for CMakeLists.txt --add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) -+# add_subdirectory(${METIS_PATH}/libmetis ${CMAKE_BINARY_DIR}/libmetis) - add_subdirectory(include) - add_subdirectory(libparmetis) --add_subdirectory(programs) -+# add_subdirectory(programs) - - # This is for testing during development and is not being distributed - #add_subdirectory(test) diff --git a/ports/parmetis/portfile.cmake b/ports/parmetis/portfile.cmake index 62d633eac110e0..b845ca81c7174d 100644 --- a/ports/parmetis/portfile.cmake +++ b/ports/parmetis/portfile.cmake @@ -1,36 +1,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(ADDITIONAL_OPTIONS -DSHARED=OFF) -vcpkg_download_distfile(ARCHIVE - URLS "http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz" - FILENAME "parmetis-4.0.3.tar.gz" - SHA512 454a91921ca35c981df11c9846a11963ff8fd8407a25179453af33f8fe69493f6dd7f2a0b8feed9a7d3f121e45b715749dd7a94873eaac2bae4cad1e535ca132 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO KarypisLab/ParMETIS + REF 44fadbf58c71a74b39abb110a7691355d2a760ca + SHA512 d07e2ccb358948b728be3d282841ad42a8358908a4f1ab3342d4c3016e71a06c1b5966640a06e713f4c773365d7dba4f0c68795d615802f3af07194c0778f362 PATCHES - fix-metis-vs14-math.patch - fix-gklib-vs14-math.patch - fix-root-cmakelist.patch - fix-libparmetis-cmakelist.patch - use_stdint.patch - fix-root-cmakelist-2.patch + build-fixes.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${ADDITIONAL_OPTIONS} + -DSHARED=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/parmetis) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/parmetis/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/parmetis/copyright) +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +parmetis provides CMake targets: + find_package(parmetis CONFIG REQUIRED) + target_link_libraries(main PRIVATE parmetis) +]=]) diff --git a/ports/parmetis/vcpkg.json b/ports/parmetis/vcpkg.json index 4b5cf996605b69..50c1c876055196 100644 --- a/ports/parmetis/vcpkg.json +++ b/ports/parmetis/vcpkg.json @@ -1,11 +1,19 @@ { "name": "parmetis", - "version-string": "4.0.3", - "port-version": 5, + "version-date": "2022-07-27", "description": "Parallel Graph Partitioning and Fill-reducing Matrix Ordering", "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview", + "license": null, "dependencies": [ "metis", - "mpi" + "mpi", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/scripts/templates/portfile.in.cmake b/scripts/templates/portfile.in.cmake index c629792439f7df..91b62753b4cd62 100644 --- a/scripts/templates/portfile.in.cmake +++ b/scripts/templates/portfile.in.cmake @@ -78,7 +78,7 @@ vcpkg_cmake_install() # "name": "vcpkg-cmake-config", # "host": true #} -# vcpkg_cmake_config_fixup(CONFIG_PATH cmake TARGET_PATH share/@PORT@) +# vcpkg_cmake_config_fixup() # Uncomment the line below if necessary to install the license file for the port # as a file named `copyright` to the directory `${CURRENT_PACKAGES_DIR}/share/${PORT}` diff --git a/versions/baseline.json b/versions/baseline.json index cd8dcf6a85bc40..6da4bb2a27f26e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2560,6 +2560,10 @@ "baseline": "1.4.0", "port-version": 1 }, + "gklib": { + "baseline": "2022-07-27", + "port-version": 0 + }, "gl2ps": { "baseline": "1.4.2", "port-version": 1 @@ -4561,8 +4565,8 @@ "port-version": 0 }, "metis": { - "baseline": "5.1.0", - "port-version": 8 + "baseline": "2022-07-27", + "port-version": 0 }, "metrohash": { "baseline": "1.1.3", @@ -5405,8 +5409,8 @@ "port-version": 2 }, "parmetis": { - "baseline": "4.0.3", - "port-version": 5 + "baseline": "2022-07-27", + "port-version": 0 }, "parquet": { "baseline": "0", diff --git a/versions/g-/gklib.json b/versions/g-/gklib.json new file mode 100644 index 00000000000000..8c5a5a8d4ec1d7 --- /dev/null +++ b/versions/g-/gklib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f3a1ab0a9e1fe871e03b766ea7dbf8b10f54658", + "version-date": "2022-07-27", + "port-version": 0 + } + ] +} diff --git a/versions/m-/metis.json b/versions/m-/metis.json index 82f7ccab1707db..2842a70cfcdf6c 100644 --- a/versions/m-/metis.json +++ b/versions/m-/metis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a8b82dc534499155aca4057cb5ee998da7cdbc4", + "version-date": "2022-07-27", + "port-version": 0 + }, { "git-tree": "f3670208e9dc0b726c3c009e37f2398b7f2acca3", "version-string": "5.1.0", diff --git a/versions/p-/parmetis.json b/versions/p-/parmetis.json index f47f478b85b5cf..48b9b25f40021f 100644 --- a/versions/p-/parmetis.json +++ b/versions/p-/parmetis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16a0bdc9bfe506f67b8204e5f725faa6a026c4c", + "version-date": "2022-07-27", + "port-version": 0 + }, { "git-tree": "28d903df01ef4780a7b02c8a8437ec37be859aba", "version-string": "4.0.3", From a4d1dc090867908cf402552b4b83ced9c52d64e5 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 4 Aug 2022 10:13:02 +0800 Subject: [PATCH 293/791] [superlu] Fix superlu.lib missing (#26146) * [superlu] Fix superlu.lib missing * format vcpkg.json * x-add-version * Structured --- ports/superlu/portfile.cmake | 21 +++++++++++---------- ports/superlu/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/s-/superlu.json | 5 +++++ 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index 7b4f8d25a2c1f8..7ffea59ad1093f 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xiaoyeli/superlu @@ -9,21 +13,18 @@ vcpkg_from_github( remove-make.inc.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DXSDK_ENABLE_Fortran=OFF -Denable_tests=OFF -Denable_blaslib=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) -vcpkg_copy_pdbs() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index fc100ad2e540fd..2428d96f064960 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,11 +1,20 @@ { "name": "superlu", "version-date": "2020-01-07", - "port-version": 5, + "port-version": 6, "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", + "license": "BSD-4-Clause-UC", "supports": "!(uwp | arm)", "dependencies": [ - "blas" + "blas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6da4bb2a27f26e..e3ed84085e3c9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6950,7 +6950,7 @@ }, "superlu": { "baseline": "2020-01-07", - "port-version": 5 + "port-version": 6 }, "symengine": { "baseline": "0.9.0", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index c048cc9ae21410..05a897d68f63be 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b8a53560265803d6b0b5b284b88abf0ae48650d", + "version-date": "2020-01-07", + "port-version": 6 + }, { "git-tree": "5bee1e0197c0e768c6ee8b9acdf815b4d46b5978", "version-date": "2020-01-07", From 382a3044b549ab019abab202107736d706f1d8fe Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Thu, 4 Aug 2022 03:18:31 +0100 Subject: [PATCH 294/791] [libmysql] Add ncurses dependency (#26121) Signed-off-by: Gordon Smith --- ports/libmysql/portfile.cmake | 4 ---- ports/libmysql/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/l-/libmysql.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index c41a172658c5e5..f70ec00a6a54c8 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -2,10 +2,6 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") message(FATAL_ERROR "FATAL ERROR: ${PORT} and libmariadb are incompatible.") endif() -if (VCPKG_TARGET_IS_LINUX) - message(WARNING "${PORT} needs ncurses on LINUX, please install ncurses first.\nOn Debian/Ubuntu, package name is libncurses5-dev, on Redhat and derivates it is ncurses-devel.") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mysql/mysql-server diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index 6a03029650e985..15ae0c3932d1b0 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 7, + "port-version": 8, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "license": "GPL-2.0-or-later", @@ -15,6 +15,10 @@ "icu", "libevent", "lz4", + { + "name": "ncurses", + "platform": "!windows | mingw" + }, "openssl", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index e3ed84085e3c9e..9fa9fe4d84ff0a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3886,7 +3886,7 @@ }, "libmysql": { "baseline": "8.0.20", - "port-version": 7 + "port-version": 8 }, "libnice": { "baseline": "0.1.18", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index f8c22e4e5ddf4a..843ce2bf586765 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0337316bdcf6acfc791eb6fac2c490db774b24e", + "version": "8.0.20", + "port-version": 8 + }, { "git-tree": "bde440f72e606ffbfcfba3393813261aa91e5c05", "version": "8.0.20", From 6cdfcb265865141f89cd9faa70f1ceba4006d9f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 4 Aug 2022 02:24:13 +0000 Subject: [PATCH 295/791] [oatpp*] Remove CMAKE_CXX_FLAGS setting (#26116) * Move CMAKE_CXX_FLAGS to VCPKG_CXX_FLAGS * version * Also set VCPKG_C_FLAGS * version * apply suggestions and fix other ports * version * apply suggestion * version * try to figure out what triplet needs crt macros * version --- ports/oatpp-consul/portfile.cmake | 1 - ports/oatpp-consul/vcpkg.json | 2 ++ ports/oatpp-curl/portfile.cmake | 1 - ports/oatpp-curl/vcpkg.json | 2 ++ ports/oatpp-libressl/portfile.cmake | 3 +-- ports/oatpp-libressl/vcpkg.json | 2 ++ ports/oatpp-mongo/portfile.cmake | 3 --- ports/oatpp-mongo/vcpkg.json | 2 ++ ports/oatpp-postgresql/portfile.cmake | 3 --- ports/oatpp-postgresql/vcpkg.json | 2 ++ ports/oatpp-sqlite/portfile.cmake | 1 - ports/oatpp-sqlite/vcpkg.json | 2 ++ ports/oatpp-ssdp/portfile.cmake | 1 - ports/oatpp-ssdp/vcpkg.json | 2 ++ ports/oatpp-swagger/portfile.cmake | 3 +-- ports/oatpp-swagger/vcpkg.json | 2 ++ ports/oatpp-zlib/portfile.cmake | 3 --- ports/oatpp-zlib/vcpkg.json | 2 ++ ports/oatpp/portfile.cmake | 7 +++---- ports/oatpp/vcpkg.json | 2 ++ versions/baseline.json | 20 ++++++++++---------- versions/o-/oatpp-consul.json | 5 +++++ versions/o-/oatpp-curl.json | 5 +++++ versions/o-/oatpp-libressl.json | 5 +++++ versions/o-/oatpp-mongo.json | 5 +++++ versions/o-/oatpp-postgresql.json | 5 +++++ versions/o-/oatpp-sqlite.json | 5 +++++ versions/o-/oatpp-ssdp.json | 5 +++++ versions/o-/oatpp-swagger.json | 5 +++++ versions/o-/oatpp-zlib.json | 5 +++++ versions/o-/oatpp.json | 5 +++++ 31 files changed, 85 insertions(+), 31 deletions(-) diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake index bb7e363e0f3a21..83e428723cff5a 100644 --- a/ports/oatpp-consul/portfile.cmake +++ b/ports/oatpp-consul/portfile.cmake @@ -14,7 +14,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) vcpkg_cmake_install() diff --git a/ports/oatpp-consul/vcpkg.json b/ports/oatpp-consul/vcpkg.json index e606a276c8014f..c59494d3691d65 100644 --- a/ports/oatpp-consul/vcpkg.json +++ b/ports/oatpp-consul/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-consul", "version": "1.3.0", + "port-version": 1, "description": "OAT++ Modern web framework consul module.", "homepage": "https://github.com/oatpp/oatpp-consul", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake index f80968ec896b2d..7dff231c95d51b 100644 --- a/ports/oatpp-curl/portfile.cmake +++ b/ports/oatpp-curl/portfile.cmake @@ -15,7 +15,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" ) vcpkg_cmake_install() diff --git a/ports/oatpp-curl/vcpkg.json b/ports/oatpp-curl/vcpkg.json index 5980921c11975e..86904834087d0d 100644 --- a/ports/oatpp-curl/vcpkg.json +++ b/ports/oatpp-curl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-curl", "version": "1.3.0", + "port-version": 1, "description": "Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient.", "homepage": "https://github.com/oatpp/oatpp-curl", + "license": "Apache-2.0", "dependencies": [ "curl", "oatpp", diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake index b21fb9af2f6933..c2643ab4145f67 100644 --- a/ports/oatpp-libressl/portfile.cmake +++ b/ports/oatpp-libressl/portfile.cmake @@ -16,8 +16,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" + "-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}" ) vcpkg_cmake_install() diff --git a/ports/oatpp-libressl/vcpkg.json b/ports/oatpp-libressl/vcpkg.json index 96d4cc93857e2d..b4d919f8ac1570 100644 --- a/ports/oatpp-libressl/vcpkg.json +++ b/ports/oatpp-libressl/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-libressl", "version": "1.3.0", + "port-version": 1, "description": "Oat++ libressl module providing secure server and client connection providers.", "homepage": "https://github.com/oatpp/oatpp-libressl", + "license": "Apache-2.0", "dependencies": [ "libressl", "oatpp", diff --git a/ports/oatpp-mongo/portfile.cmake b/ports/oatpp-mongo/portfile.cmake index e4cccfcd301741..b3bf87613fb206 100644 --- a/ports/oatpp-mongo/portfile.cmake +++ b/ports/oatpp-mongo/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/oatpp-mongo/vcpkg.json b/ports/oatpp-mongo/vcpkg.json index 6441e67d1ea6e5..da880a9b48cd9e 100644 --- a/ports/oatpp-mongo/vcpkg.json +++ b/ports/oatpp-mongo/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-mongo", "version": "1.3.0", + "port-version": 1, "description": "Oat++ MongoDB adapter for Oat++ ORM (native client). It contains DTO to BSON mapper plus database driver.", "homepage": "https://github.com/oatpp/oatpp-mongo", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/ports/oatpp-postgresql/portfile.cmake b/ports/oatpp-postgresql/portfile.cmake index 3a080846f8aba4..c798d5f8d78e48 100644 --- a/ports/oatpp-postgresql/portfile.cmake +++ b/ports/oatpp-postgresql/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/oatpp-postgresql/vcpkg.json b/ports/oatpp-postgresql/vcpkg.json index ebc8584c5c4b09..01ce5d7a5a1f96 100644 --- a/ports/oatpp-postgresql/vcpkg.json +++ b/ports/oatpp-postgresql/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-postgresql", "version": "1.3.0", + "port-version": 1, "description": "Oat++ PostgreSQL adapter for Oat++ ORM (alpha - not all datatypes are supported).", "homepage": "https://github.com/oatpp/oatpp-postgresql", + "license": "Apache-2.0", "dependencies": [ "libpq", "oatpp", diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake index 68ce88266719a6..81bd1a5e208caf 100644 --- a/ports/oatpp-sqlite/portfile.cmake +++ b/ports/oatpp-sqlite/portfile.cmake @@ -14,7 +14,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" "-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF" ) vcpkg_cmake_install() diff --git a/ports/oatpp-sqlite/vcpkg.json b/ports/oatpp-sqlite/vcpkg.json index cb307cc1a87a67..c192d7b2e78f4e 100644 --- a/ports/oatpp-sqlite/vcpkg.json +++ b/ports/oatpp-sqlite/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-sqlite", "version": "1.3.0", + "port-version": 1, "description": "Oat++ SQLite adapter for Oat++ ORM.", "homepage": "https://github.com/oatpp/oatpp-sqlite", + "license": "Apache-2.0", "dependencies": [ "oatpp", "sqlite3", diff --git a/ports/oatpp-ssdp/portfile.cmake b/ports/oatpp-ssdp/portfile.cmake index 05381b317e052a..3523504d230859 100644 --- a/ports/oatpp-ssdp/portfile.cmake +++ b/ports/oatpp-ssdp/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS" ) vcpkg_cmake_install() diff --git a/ports/oatpp-ssdp/vcpkg.json b/ports/oatpp-ssdp/vcpkg.json index fc169d634e08b8..8a7496deb30668 100644 --- a/ports/oatpp-ssdp/vcpkg.json +++ b/ports/oatpp-ssdp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-ssdp", "version": "1.3.0", + "port-version": 1, "description": "Oat++ SSDP (Simple Service Discovery Protocol) submodule.", "homepage": "https://github.com/oatpp/oatpp-ssdp", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake index 2e24c320a713da..e79301a76790bb 100644 --- a/ports/oatpp-swagger/portfile.cmake +++ b/ports/oatpp-swagger/portfile.cmake @@ -20,8 +20,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) vcpkg_cmake_install() diff --git a/ports/oatpp-swagger/vcpkg.json b/ports/oatpp-swagger/vcpkg.json index 65dba327e55980..2a920d4ba92b58 100644 --- a/ports/oatpp-swagger/vcpkg.json +++ b/ports/oatpp-swagger/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-swagger", "version": "1.3.0", + "port-version": 1, "description": "Oat++ OpenApi (Swagger) UI submodule.", "homepage": "https://github.com/oatpp/oatpp-swagger", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/ports/oatpp-zlib/portfile.cmake b/ports/oatpp-zlib/portfile.cmake index 3759757ef0999f..fc141336c873ee 100644 --- a/ports/oatpp-zlib/portfile.cmake +++ b/ports/oatpp-zlib/portfile.cmake @@ -10,9 +10,6 @@ vcpkg_from_github( HEAD_REF master ) -set(VCPKG_C_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/oatpp-zlib/vcpkg.json b/ports/oatpp-zlib/vcpkg.json index 5b0feb18478696..6e4049a1e16a54 100644 --- a/ports/oatpp-zlib/vcpkg.json +++ b/ports/oatpp-zlib/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp-zlib", "version": "1.3.0", + "port-version": 1, "description": "Oat++ functionality for automatically compressing/decompressing content with deflate and gzip.", "homepage": "https://github.com/oatpp/oatpp-zlib", + "license": "Apache-2.0", "dependencies": [ "oatpp", { diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake index cf8513449f06dc..1e4a62583b1019 100644 --- a/ports/oatpp/portfile.cmake +++ b/ports/oatpp/portfile.cmake @@ -20,13 +20,12 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DOATPP_BUILD_TESTS:BOOL=OFF" - "-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS" - "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" + "-DOATPP_MSVC_LINK_STATIC_RUNTIME=${OATPP_MSVC_LINK_STATIC_RUNTIME}" ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME oatpp CONFIG_PATH lib/cmake/oatpp-${OATPP_VERSION}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp/vcpkg.json b/ports/oatpp/vcpkg.json index 8e7a8184073478..13495e4c61bc10 100644 --- a/ports/oatpp/vcpkg.json +++ b/ports/oatpp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "oatpp", "version": "1.3.0", + "port-version": 1, "description": "Modern web framework.", "homepage": "https://github.com/oatpp/oatpp", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 9fa9fe4d84ff0a..9906ddfd95c369 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5026,19 +5026,19 @@ }, "oatpp": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-consul": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-curl": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-libressl": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-mbedtls": { "baseline": "1.3.0", @@ -5046,7 +5046,7 @@ }, "oatpp-mongo": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-openssl": { "baseline": "1.3.0", @@ -5054,19 +5054,19 @@ }, "oatpp-postgresql": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-sqlite": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-ssdp": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-swagger": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "oatpp-websocket": { "baseline": "1.3.0", @@ -5074,7 +5074,7 @@ }, "oatpp-zlib": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "observer-ptr-lite": { "baseline": "0.4.0", diff --git a/versions/o-/oatpp-consul.json b/versions/o-/oatpp-consul.json index 3dfcbc54700143..917b44540afd96 100644 --- a/versions/o-/oatpp-consul.json +++ b/versions/o-/oatpp-consul.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbf60e5cb055ff29081126e61debb330651a24fd", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "a7dbba8dd8a15ee5a573d8893af3755c2c61e082", "version": "1.3.0", diff --git a/versions/o-/oatpp-curl.json b/versions/o-/oatpp-curl.json index 2302f299d84990..641eaf22ea4dc5 100644 --- a/versions/o-/oatpp-curl.json +++ b/versions/o-/oatpp-curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca3da373f9eca04129ab53c726e00678b7727a6e", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "ae678502914406793d56adb1bffbede8febdfb77", "version": "1.3.0", diff --git a/versions/o-/oatpp-libressl.json b/versions/o-/oatpp-libressl.json index 0440e9e5f7c55d..b565bf764950e7 100644 --- a/versions/o-/oatpp-libressl.json +++ b/versions/o-/oatpp-libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c52fe5660b4e58aa5782ccd3a43e5298f4225fe1", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "9a94780d515079c88f644ac92b35f935fff138b5", "version": "1.3.0", diff --git a/versions/o-/oatpp-mongo.json b/versions/o-/oatpp-mongo.json index e89f32c69a3cb7..f649096047ba2c 100644 --- a/versions/o-/oatpp-mongo.json +++ b/versions/o-/oatpp-mongo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e9c046ae1943591d58c8e48aee697a0e7718f8d", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "bb2cca9b0d5255e9c250210b6da94b8383673530", "version": "1.3.0", diff --git a/versions/o-/oatpp-postgresql.json b/versions/o-/oatpp-postgresql.json index 76f2a311269482..bbf50cea9f88f3 100644 --- a/versions/o-/oatpp-postgresql.json +++ b/versions/o-/oatpp-postgresql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d182a4a2fa22b5a9da9b16eca3a37d7bdb74b44", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "f5475ec4475805e185290f9b6676cb0b3471d469", "version": "1.3.0", diff --git a/versions/o-/oatpp-sqlite.json b/versions/o-/oatpp-sqlite.json index 29af51afed1624..c1022009071528 100644 --- a/versions/o-/oatpp-sqlite.json +++ b/versions/o-/oatpp-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28e241610e463b41e9c3e3f16f5805b19fb5fa5", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "83864d8dac636388be925bc5228fb6067ff0c634", "version": "1.3.0", diff --git a/versions/o-/oatpp-ssdp.json b/versions/o-/oatpp-ssdp.json index dbd84e5c216256..342f0818c13509 100644 --- a/versions/o-/oatpp-ssdp.json +++ b/versions/o-/oatpp-ssdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f3fb7a485473cfc812dbd4fbc93c291db75aeea", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "37d034f06503445f5a4ac52a960f4360cb68ce58", "version": "1.3.0", diff --git a/versions/o-/oatpp-swagger.json b/versions/o-/oatpp-swagger.json index e2107262e7f95f..32934ddf71e35f 100644 --- a/versions/o-/oatpp-swagger.json +++ b/versions/o-/oatpp-swagger.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8935367b57b4203e0eba828a6b8f9cc5ebb659c", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "4f0bc8c1d3f156e6d2a7cee4691154c0973b12bd", "version": "1.3.0", diff --git a/versions/o-/oatpp-zlib.json b/versions/o-/oatpp-zlib.json index db9f47ae2062b7..a07cde70df3a67 100644 --- a/versions/o-/oatpp-zlib.json +++ b/versions/o-/oatpp-zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f40812d2446d50d41add9deba46e0baa042ac53", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "74e51d02fac6e71c8bad4856fc97767f8d3041ea", "version": "1.3.0", diff --git a/versions/o-/oatpp.json b/versions/o-/oatpp.json index 5ec6257b202cdc..aad89efa130bd6 100644 --- a/versions/o-/oatpp.json +++ b/versions/o-/oatpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3700f7d93bbb8922878c25705d0e00cd7049066", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "85f50043f867de15e428b3d0f8749a5aabc34e86", "version": "1.3.0", From e6a000679745f8ea3f98067e5f3753d3cbecb948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 4 Aug 2022 02:25:28 +0000 Subject: [PATCH 296/791] [ogre] Fix pkgconfig (#25883) * [ogre] Fix pkgconfig * version * Absolute path * version * Re-fix pkgconfig in source code * version * typo * version * Sync with upstream changes * version Co-authored-by: Billy Robert O'Neal III --- ports/ogre/fix-pkgconfig.patch | 27 +++++++++++++++++++++++++++ ports/ogre/portfile.cmake | 1 + ports/ogre/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/ogre.json | 5 +++++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 ports/ogre/fix-pkgconfig.patch diff --git a/ports/ogre/fix-pkgconfig.patch b/ports/ogre/fix-pkgconfig.patch new file mode 100644 index 00000000000000..365663fa6b1d15 --- /dev/null +++ b/ports/ogre/fix-pkgconfig.patch @@ -0,0 +1,27 @@ +diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake +index 73606c9..4377353 100644 +--- a/CMake/ConfigureBuild.cmake ++++ b/CMake/ConfigureBuild.cmake +@@ -175,11 +175,19 @@ if (UNIX) + set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lpthread") + endif () + if (OGRE_STATIC) +- if (OGRE_CONFIG_THREADS) +- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost-thread-mt") ++ if (OGRE_CONFIG_THREADS AND OGRE_CONFIG_THREAD_PROVIDER STREQUAL "boost") ++ if (CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${Boost_THREAD_LIBRARY_DEBUG}") ++ else() ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${Boost_THREAD_LIBRARY_RELEASE}") ++ endif() + endif () + # there is no pkgconfig file for freeimage, so we need to add that lib manually +- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage") ++ if (CMAKE_BUILD_TYPE STREQUAL "Debug") ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_DBG}") ++ else() ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_REL}") ++ endif() + configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) + else () + configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 0ba9107a6239ca..0ffc7f0c4709d1 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( toolchain_fixes.patch fix-dependency.patch disable-dependency-qt.patch + fix-pkgconfig.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 574999c6e823af..11504a6d24494d 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version": "1.12.9", - "port-version": 8, + "port-version": 9, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9906ddfd95c369..1d9b94fb076e17 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5102,7 +5102,7 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 8 + "port-version": 9 }, "ogre-next": { "baseline": "2.3.1", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index abeb8d4f8e7421..1979c25b9c4caf 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24ad8730cbc30e48c816ce6bca6abfb6cf1851fc", + "version": "1.12.9", + "port-version": 9 + }, { "git-tree": "6401a93991e8fe6fe517b43a084120ac94efccb9", "version": "1.12.9", From 592158c5025918c787844b0b90807e9d3c5d99ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 4 Aug 2022 17:38:23 +0000 Subject: [PATCH 297/791] [live555] Update to 2022-07-14 (#26144) * [live555] Update to 2022-07-14 * version * Update ports/live555/vcpkg.json Co-authored-by: Javier Matos Denizac * Update versions/l-/live555.json Co-authored-by: Javier Matos Denizac --- ports/live555/fix-RTSPClient.patch | 8 ++++---- ports/live555/portfile.cmake | 6 +++--- ports/live555/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/live555.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/live555/fix-RTSPClient.patch b/ports/live555/fix-RTSPClient.patch index 66863963dab219..f63894e274a691 100644 --- a/ports/live555/fix-RTSPClient.patch +++ b/ports/live555/fix-RTSPClient.patch @@ -1,10 +1,10 @@ diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp -index 02c46c7..6127698 100644 +index 130baa9..8e1ea10 100644 --- a/liveMedia/RTSPClient.cpp +++ b/liveMedia/RTSPClient.cpp -@@ -1939,7 +1939,7 @@ int RTSPClient::write(const u_int8_t* data, unsigned count) { - if (fTLS.isNeeded) { - return fTLS.write(data, count); +@@ -2022,7 +2022,7 @@ int RTSPClient::write(const char* data, unsigned count) { + if (fOutputTLS->isNeeded) { + return fOutputTLS->write(data, count); } else { - return send(fOutputSocketNum, data, count, 0); + return send(fOutputSocketNum, (const char *)data, count, 0); diff --git a/ports/live555/portfile.cmake b/ports/live555/portfile.cmake index b11e4d076bbb8f..107d8b331f90e9 100644 --- a/ports/live555/portfile.cmake +++ b/ports/live555/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "http://www.live555.com/liveMedia/public/live.2022.04.26.tar.gz" - FILENAME "live.2022.04.26.tar.gz" - SHA512 0226a451129df1d47d10bc96ef2a9ab8ffb0116fd0daac8b16a1dd57b319b9058b587955a01bc4a939c3f64659915815fe182c8c7b02cb286313ff132dcbe144 + URLS "http://www.live555.com/liveMedia/public/live.2022.07.14.tar.gz" + FILENAME "live.2022.07.14.tar.gz" + SHA512 382544d9d9fe200699669a1f3301efb4ccec0193499c95b532ea923c380b1ec6fa721a4118d36a447ba9df08575f185498f244293c66bbe97cff0482eab033c7 ) vcpkg_extract_source_archive_ex( diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json index cff25183839e91..4bc17cc430b241 100644 --- a/ports/live555/vcpkg.json +++ b/ports/live555/vcpkg.json @@ -1,8 +1,8 @@ { "name": "live555", - "version-date": "2022-05-05", + "version-date": "2022-07-14", "description": "A complete RTSP server application", - "homepage": "https://www.live555.com/liveMedia", + "homepage": "http://www.live555.com/liveMedia", "license": "GPL-3.0-or-later", "dependencies": [ "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index 1d9b94fb076e17..043dbf069c7a75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4333,7 +4333,7 @@ "port-version": 0 }, "live555": { - "baseline": "2022-05-05", + "baseline": "2022-07-14", "port-version": 0 }, "llfio": { diff --git a/versions/l-/live555.json b/versions/l-/live555.json index df739954238c97..c7e600765b7845 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f99761c9c260c5b654cd1028610b2edaa3036e0", + "version-date": "2022-07-14", + "port-version": 0 + }, { "git-tree": "7dd605bbfb6b2532b7c127eac435600750b3c601", "version-date": "2022-05-05", From 59b861ab161e6e2a094a1e35d258c9fb74064a1e Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 4 Aug 2022 19:51:24 +0200 Subject: [PATCH 298/791] [sdl2-mixer] Fix usage (#26083) * [sdl2-mixer] Fix usage * version * format * version * Fix usage * version --- ports/sdl2-mixer/portfile.cmake | 1 + ports/sdl2-mixer/usage | 4 ++++ ports/sdl2-mixer/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdl2-mixer.json | 5 +++++ 5 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 ports/sdl2-mixer/usage diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index ccca1c94434471..589356a265e36b 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -36,4 +36,5 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl2-mixer/usage b/ports/sdl2-mixer/usage new file mode 100644 index 00000000000000..efcc86b1370774 --- /dev/null +++ b/ports/sdl2-mixer/usage @@ -0,0 +1,4 @@ +sdl2-mixer provides CMake targets: + + find_package(SDL2_mixer CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SDL2_mixer::SDL2_mixer,SDL2_mixer::SDL2_mixer-static>) diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 8758995c583f31..94ff15c90a7a31 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2-mixer", "version": "2.6.1", + "port-version": 1, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://github.com/libsdl-org/SDL_mixer", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 043dbf069c7a75..7063588cd7b404 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6510,7 +6510,7 @@ }, "sdl2-mixer": { "baseline": "2.6.1", - "port-version": 0 + "port-version": 1 }, "sdl2-net": { "baseline": "2.0.1", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index a676612174bd07..9651f7b61d1b5f 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c06711b92dfd4c048f6a56c0236697012094a6e5", + "version": "2.6.1", + "port-version": 1 + }, { "git-tree": "7e802cb751276e60dc8046e2b6219dd9dae4c13a", "version": "2.6.1", From e38526f36e89450de80d1f7db082579c549d4c0a Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Thu, 4 Aug 2022 11:00:12 -0700 Subject: [PATCH 299/791] [brpc] Add DISABLE_PARALLEL_CONFIGURE (#26162) * [brpc] Add DISABLE_PARALLEL_CONFIGURE * x-add-version --- ports/brpc/portfile.cmake | 1 + ports/brpc/vcpkg.json | 1 + versions/b-/brpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index 1f0fd0ced8fb64..a2353e2a3ac718 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DWITH_THRIFT=ON -DWITH_MESALINK=OFF diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 90560ba2b09a3e..eb3fca14cbbf9b 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "brpc", "version": "1.2.0", + "port-version": 1, "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "license": "Apache-2.0", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index 91270736bb80d6..32298858cfad33 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ed01cdb3f05cfc779d3162de470045bda69f985", + "version": "1.2.0", + "port-version": 1 + }, { "git-tree": "d75b4f1f3f1bf6072c3095fe34f29e86c19ec4d5", "version": "1.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7063588cd7b404..ea01e4ea1390ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1170,7 +1170,7 @@ }, "brpc": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "brunocodutra-metal": { "baseline": "2.1.4", From 59dbfc30a13d3f10693a04dcbe6ca4ea5e63183f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 4 Aug 2022 12:11:08 -0700 Subject: [PATCH 300/791] [azure-core-cpp] Update to 1.7.1 (#26175) ## 1.7.1 (2022-08-04) ### Bugs Fixed - [[#3794]](https://github.com/Azure/azure-sdk-for-cpp/issues/3794) Fix memory leak in `CurlTransport`. - [[#3692]](https://github.com/Azure/azure-sdk-for-cpp/issues/3692) Interrupted poll calls cause spurious HTTP request failures. (A community contribution, courtesy of _[johnwheffner](https://github.com/johnwheffner)_) ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - John Heffner _([GitHub](https://github.com/johnwheffner))_ --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 50fa05d0abddbb..96f2864effb0fa 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.7.0 - SHA512 dca77d9b64b9ad3a91b63226f3650a531c024adb0a1d313356b78eb9c76d54f092c7c5d6e353058ad4b3c7ce7fd6d62ea95ab69a116e43f53025b379720f7cca + REF azure-core_1.7.1 + SHA512 3aeaf10ee319db1afcac7b6aa33534e7f7517738af987588be2108ef2ffe8f5c3615239669a46b4b6967c9cf82b2bc0aa92d16af99be536c2395150ccca43866 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 58122b059b7447..fbfc13409e2ef9 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.7.0", + "version-semver": "1.7.1", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index b9b8d8b88595b0..b355c9fbda1299 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e17b1885416ae07365e86acec91312d7318cc305", + "version-semver": "1.7.1", + "port-version": 0 + }, { "git-tree": "677fc287c3ba4d9a3582498071e1d14d5632e48f", "version-semver": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index ea01e4ea1390ae..03faf628be9ed2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -325,7 +325,7 @@ "port-version": 3 }, "azure-core-cpp": { - "baseline": "1.7.0", + "baseline": "1.7.1", "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { From 97f26935db51139372ef252e67e308fe76933500 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 4 Aug 2022 12:44:16 -0700 Subject: [PATCH 301/791] [gklib] Fix share path case. (#26157) * [gklib] Fix share path case. In https://github.com/microsoft/vcpkg/pull/26020 I forgot to apply @ras0219 's over the shoulder review comment to change the directory name to all lowercase. * More case! --- ports/gklib/build-fixes.patch | 4 ++-- ports/gklib/portfile.cmake | 2 +- ports/gklib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gklib.json | 5 +++++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/gklib/build-fixes.patch b/ports/gklib/build-fixes.patch index b5a7b9eae6e833..dc78c3711821f7 100644 --- a/ports/gklib/build-fixes.patch +++ b/ports/gklib/build-fixes.patch @@ -24,8 +24,8 @@ index 9cd1b4b..a6b629e 100644 + ) +install(FILES ${GKlib_includes} DESTINATION "include/GKlib") +install(FILES "win32/adapt.h" DESTINATION "include/GKlib/win32") -+install(EXPORT GKlibTargets FILE "GKlibTargets.cmake" DESTINATION "share/GKlib") -+file(WRITE "${CMAKE_INSTALL_PREFIX}/share/GKlib/GKlibConfig.cmake" [=[ ++install(EXPORT GKlibTargets FILE "GKlibTargets.cmake" DESTINATION "share/gklib") ++file(WRITE "${CMAKE_INSTALL_PREFIX}/share/gklib/GKlibConfig.cmake" [=[ +include("${CMAKE_CURRENT_LIST_DIR}/GKlibTargets.cmake") +]=]) diff --git a/GKlibSystem.cmake b/GKlibSystem.cmake diff --git a/ports/gklib/portfile.cmake b/ports/gklib/portfile.cmake index 6a52d4bc19528b..9c50870f0072d7 100644 --- a/ports/gklib/portfile.cmake +++ b/ports/gklib/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME GKlib) +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ diff --git a/ports/gklib/vcpkg.json b/ports/gklib/vcpkg.json index ff521f2ee753dd..f5f0a44ddadd0f 100644 --- a/ports/gklib/vcpkg.json +++ b/ports/gklib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gklib", "version-date": "2022-07-27", + "port-version": 1, "description": "General helper libraries for KarypisLab.", "homepage": "https://github.com/KarypisLab/GKlib/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 03faf628be9ed2..d9249e357fb8a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2562,7 +2562,7 @@ }, "gklib": { "baseline": "2022-07-27", - "port-version": 0 + "port-version": 1 }, "gl2ps": { "baseline": "1.4.2", diff --git a/versions/g-/gklib.json b/versions/g-/gklib.json index 8c5a5a8d4ec1d7..5ba439c555508b 100644 --- a/versions/g-/gklib.json +++ b/versions/g-/gklib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be7b5aca0025910c7dbbc260564bf7d56ada1a3c", + "version-date": "2022-07-27", + "port-version": 1 + }, { "git-tree": "1f3a1ab0a9e1fe871e03b766ea7dbf8b10f54658", "version-date": "2022-07-27", From e2213266cd4d36787e67fd8fb1fa861cbf7ac3eb Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 4 Aug 2022 23:49:06 +0300 Subject: [PATCH 302/791] [python3] x64-linux-dynamic fixes (#25995) * [python3] x64-linux-dynamic fixes * Fix custom post-build checks * Clarify comment. Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> Co-authored-by: Billy O'Neal --- ports/python3/0010-ensurepip.patch | 11 -- ports/python3/0011-dont-skip-rpath.patch | 158 +++++++++++++++++++++++ ports/python3/portfile.cmake | 28 +++- ports/python3/vcpkg.json | 6 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 + 6 files changed, 196 insertions(+), 14 deletions(-) delete mode 100644 ports/python3/0010-ensurepip.patch create mode 100644 ports/python3/0011-dont-skip-rpath.patch diff --git a/ports/python3/0010-ensurepip.patch b/ports/python3/0010-ensurepip.patch deleted file mode 100644 index ce5b65a3db45b8..00000000000000 --- a/ports/python3/0010-ensurepip.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Lib/ensurepip/__init__.py 2021-10-05 00:40:46.000000000 +0700 -+++ b/Lib/ensurepip/__init__.py 2022-01-11 15:22:54.001498300 +0700 -@@ -86,6 +86,8 @@ - code = f""" - import runpy - import sys -+import os -+sys.executable = os.path.dirname(os.path.realpath(__file__)) - sys.path = {additional_paths or []} + sys.path - sys.argv[1:] = {args} - runpy.run_module("pip", run_name="__main__", alter_sys=True) diff --git a/ports/python3/0011-dont-skip-rpath.patch b/ports/python3/0011-dont-skip-rpath.patch new file mode 100644 index 00000000000000..82ce23b7485348 --- /dev/null +++ b/ports/python3/0011-dont-skip-rpath.patch @@ -0,0 +1,158 @@ +diff --git a/setup.py b/setup.py +index 61b3266..4c2cfb4 100644 +--- a/setup.py ++++ b/setup.py +@@ -1153,6 +1153,7 @@ def detect_readline_curses(self): + self.add(Extension('readline', ['readline.c'], + library_dirs=['/usr/lib/termcap'], + extra_link_args=readline_extra_link_args, ++ runtime_library_dirs=self.lib_dirs, + libraries=readline_libs)) + else: + self.missing.append('readline') +@@ -1189,6 +1190,7 @@ def detect_readline_curses(self): + extra_compile_args=['-DPy_BUILD_CORE_MODULE'], + include_dirs=curses_includes, + define_macros=curses_defines, ++ runtime_library_dirs=self.lib_dirs, + libraries=curses_libs)) + elif curses_library == 'curses' and not MACOS: + # OSX has an old Berkeley curses, not good enough for +@@ -1203,6 +1205,7 @@ def detect_readline_curses(self): + self.add(Extension('_curses', ['_cursesmodule.c'], + extra_compile_args=['-DPy_BUILD_CORE_MODULE'], + define_macros=curses_defines, ++ runtime_library_dirs=self.lib_dirs, + libraries=curses_libs)) + else: + curses_enabled = False +@@ -1216,6 +1219,7 @@ def detect_readline_curses(self): + self.add(Extension('_curses_panel', ['_curses_panel.c'], + include_dirs=curses_includes, + define_macros=curses_defines, ++ runtime_library_dirs=self.lib_dirs, + libraries=[panel_library, *curses_libs])) + elif not skip_curses_panel: + self.missing.append('_curses_panel') +@@ -1234,7 +1238,7 @@ def detect_crypt(self): + else: + libs = [] + +- self.add(Extension('_crypt', ['_cryptmodule.c'], libraries=libs)) ++ self.add(Extension('_crypt', ['_cryptmodule.c'], runtime_library_dirs=self.lib_dirs, libraries=libs)) + + def detect_socket(self): + # socket(2) +@@ -1525,6 +1529,7 @@ class db_found(Exception): pass + libraries=dblibs) + break + if dbmext is not None: ++ dbmext.runtime_library_dirs = self.lib_dirs + self.add(dbmext) + else: + self.missing.append('_dbm') +@@ -1533,6 +1538,7 @@ class db_found(Exception): pass + if ('gdbm' in dbm_order and + self.compiler.find_library_file(self.lib_dirs, 'gdbm')): + self.add(Extension('_gdbm', ['_gdbmmodule.c'], ++ runtime_library_dirs=self.lib_dirs, + libraries=['gdbm'])) + else: + self.missing.append('_gdbm') +@@ -1645,6 +1651,7 @@ def detect_sqlite(self): + define_macros=sqlite_defines, + include_dirs=include_dirs, + library_dirs=sqlite_libdir, ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=sqlite_extra_link_args, + libraries=["sqlite3",])) + else: +@@ -1710,6 +1717,7 @@ def detect_compress_exts(self): + zlib_extra_link_args = () + self.add(Extension('zlib', ['zlibmodule.c'], + libraries=['z'], ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=zlib_extra_link_args)) + have_zlib = True + else: +@@ -1732,6 +1740,7 @@ def detect_compress_exts(self): + self.add(Extension('binascii', ['binascii.c'], + extra_compile_args=extra_compile_args, + libraries=libraries, ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=extra_link_args)) + + # Gustavo Niemeyer's bz2 module. +@@ -1742,6 +1751,7 @@ def detect_compress_exts(self): + bz2_extra_link_args = () + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2'], ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=bz2_extra_link_args)) + elif (self.compiler.find_library_file(self.lib_dirs, 'bz2d')): + if MACOS: +@@ -1750,6 +1760,7 @@ def detect_compress_exts(self): + bz2_extra_link_args = () + self.add(Extension('_bz2', ['_bz2module.c'], + libraries=['bz2d'], ++ runtime_library_dirs=self.lib_dirs, + extra_link_args=bz2_extra_link_args)) + else: + self.missing.append('_bz2') +@@ -1757,6 +1768,7 @@ def detect_compress_exts(self): + # LZMA compression support. + if self.compiler.find_library_file(self.lib_dirs, 'lzma'): + self.add(Extension('_lzma', ['_lzmamodule.c'], ++ runtime_library_dirs=self.lib_dirs, + libraries=['lzma'])) + else: + self.missing.append('_lzma') +@@ -1819,6 +1831,7 @@ def detect_expat_elementtree(self): + extra_compile_args=extra_compile_args, + include_dirs=expat_inc, + libraries=expat_lib, ++ runtime_library_dirs=self.lib_dirs, + sources=['pyexpat.c'] + expat_sources, + depends=expat_depends)) + +@@ -1831,6 +1844,7 @@ def detect_expat_elementtree(self): + define_macros=define_macros, + include_dirs=expat_inc, + libraries=expat_lib, ++ runtime_library_dirs=self.lib_dirs, + sources=['_elementtree.c'], + depends=['pyexpat.c', *expat_sources, + *expat_depends])) +@@ -1883,6 +1897,7 @@ def detect_uuid(self): + else: + uuid_libs = [] + self.add(Extension('_uuid', ['_uuidmodule.c'], ++ runtime_library_dirs=self.lib_dirs, + libraries=uuid_libs)) + else: + self.missing.append('_uuid') +@@ -2319,6 +2334,7 @@ def detect_ctypes(self): + ext.extra_compile_args.append("-DHAVE_FFI_CLOSURE_ALLOC=1") + + ext.include_dirs.append(ffi_inc) ++ ext.runtime_library_dirs = self.lib_dirs + ext.libraries.append(ffi_lib) + self.use_system_libffi = True + +@@ -2485,7 +2501,7 @@ def split_var(name, sep): + include_dirs=openssl_includes, + library_dirs=openssl_libdirs, + libraries=openssl_libs, +- runtime_library_dirs=runtime_library_dirs, ++ runtime_library_dirs=self.lib_dirs, + ) + + # This static linking is NOT OFFICIALLY SUPPORTED. +@@ -2639,6 +2655,7 @@ def detect_nis(self): + self.add(Extension('nis', ['nismodule.c'], + libraries=libs, + library_dirs=library_dirs, ++ runtime_library_dirs=self.lib_dirs, + include_dirs=includes_dirs)) + + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 9c4b0076aa15d8..9cd25a3d3b82d0 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -15,6 +15,7 @@ set(PATCHES 0005-only-build-required-projects.patch 0009-python.pc.patch 0010-bz2d.patch + 0011-dont-skip-rpath.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) @@ -189,7 +190,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_fixup_pkgconfig() vcpkg_clean_msbuild() - + # Remove static library belonging to executable if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") if (EXISTS "${CURRENT_PACKAGES_DIR}/lib/python.lib") @@ -204,6 +205,11 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) endif() endif() else() + # The Python Stable ABI, `libpython3.so` is not produced by the upstream build system with --with-pydebug option + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND NOT VCPKG_BUILD_TYPE) + set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) + endif() + set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" "--without-ensurepip" @@ -244,6 +250,26 @@ else() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") vcpkg_fixup_pkgconfig() + + # Perform some post-build checks on modules + file(GLOB python_libs_dynload_debug LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/lib-dynload/*.so*") + file(GLOB python_libs_dynload_release LIST_DIRECTORIES false "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/lib-dynload/*.so*") + set(python_libs_dynload_failed_debug ${python_libs_dynload_debug}) + set(python_libs_dynload_failed_release ${python_libs_dynload_release}) + list(FILTER python_libs_dynload_failed_debug INCLUDE REGEX ".*_failed\.so.*") + list(FILTER python_libs_dynload_failed_release INCLUDE REGEX ".*_failed\.so.*") + if(python_libs_dynload_failed_debug OR python_libs_dynload_failed_release) + list(JOIN python_libs_dynload_failed_debug "\n" python_libs_dynload_failed_debug_str) + list(JOIN python_libs_dynload_failed_release "\n" python_libs_dynload_failed_release_str) + message(FATAL_ERROR "There should be no modules with \"_failed\" suffix:\n${python_libs_dynload_failed_debug_str}\n${python_libs_dynload_failed_release_str}") + endif() + if(NOT VCPKG_BUILD_TYPE) + list(LENGTH python_libs_dynload_release python_libs_dynload_release_length) + list(LENGTH python_libs_dynload_debug python_libs_dynload_debug_length) + if(NOT python_libs_dynload_release_length STREQUAL python_libs_dynload_debug_length) + message(FATAL_ERROR "Mismatched number of modules: ${python_libs_dynload_debug_length} in debug, ${python_libs_dynload_release_length} in release") + endif() + endif() endif() file(READ "${CMAKE_CURRENT_LIST_DIR}/usage" usage) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 8920a24fd93089..a6ff450678f307 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.10.5", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", @@ -28,6 +28,10 @@ "name": "liblzma", "platform": "!(windows & static)" }, + { + "name": "libuuid", + "platform": "!osx & !windows" + }, { "name": "openssl", "platform": "!(windows & static)" diff --git a/versions/baseline.json b/versions/baseline.json index d9249e357fb8a1..7f2a86c5bfbb28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5742,7 +5742,7 @@ }, "python3": { "baseline": "3.10.5", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 6241a4eccb99e8..39d13ed7e27790 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e7ddcd01a8341a906d5dde6b3d221c955571684", + "version": "3.10.5", + "port-version": 2 + }, { "git-tree": "c345c4a8ad91847522188517c68e8f83637f4440", "version": "3.10.5", From e2a71489b17ae1f5fd29d5fc74c2cdb03fd83f9e Mon Sep 17 00:00:00 2001 From: sean <43609023+spnda@users.noreply.github.com> Date: Thu, 4 Aug 2022 23:09:02 +0200 Subject: [PATCH 303/791] [fmt] Update to 9.0.0 (#25658) * [fmt] Update to 9.0.0 * update version * write version Co-authored-by: FrankXie --- ports/fmt/fix-format-conflict.patch | 17 ++--------------- ports/fmt/fix-invalid-command.patch | 11 ----------- ports/fmt/portfile.cmake | 5 ++--- ports/fmt/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/fmt.json | 5 +++++ 6 files changed, 12 insertions(+), 33 deletions(-) delete mode 100644 ports/fmt/fix-invalid-command.patch diff --git a/ports/fmt/fix-format-conflict.patch b/ports/fmt/fix-format-conflict.patch index 3d97c5c9ef48ac..0a2ac6a57a24da 100644 --- a/ports/fmt/fix-format-conflict.patch +++ b/ports/fmt/fix-format-conflict.patch @@ -1,8 +1,8 @@ diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h -index 2c51c50..fb3eba0 100644 +index f44df01c..59cc4559 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h -@@ -75,8 +75,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, +@@ -62,8 +62,8 @@ FMT_FUNC void format_error_code(detail::buffer& out, int error_code, error_code_size += detail::to_unsigned(detail::count_digits(abs_value)); auto it = buffer_appender(out); if (message.size() <= inline_buffer_size - error_code_size) @@ -13,16 +13,3 @@ index 2c51c50..fb3eba0 100644 FMT_ASSERT(out.size() <= inline_buffer_size, ""); } -diff --git a/src/os.cc b/src/os.cc -index 04b4dc5..fe2c7e4 100644 ---- a/src/os.cc -+++ b/src/os.cc -@@ -167,7 +167,7 @@ void detail::format_windows_error(detail::buffer& out, int error_code, - if (msg) { - utf16_to_utf8 utf8_message; - if (utf8_message.convert(msg) == ERROR_SUCCESS) { -- format_to(buffer_appender(out), "{}: {}", message, utf8_message); -+ fmt::format_to(buffer_appender(out), "{}: {}", message, utf8_message); - return; - } - } diff --git a/ports/fmt/fix-invalid-command.patch b/ports/fmt/fix-invalid-command.patch deleted file mode 100644 index c554188bddf62a..00000000000000 --- a/ports/fmt/fix-invalid-command.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/include/fmt/locale.h b/include/fmt/locale.h -index 7571b52..0a34eb4 100644 ---- a/include/fmt/locale.h -+++ b/include/fmt/locale.h -@@ -1,2 +1,6 @@ - #include "xchar.h" -+#ifdef _WIN32 -+#pragma message ("fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead") -+#else - #warning fmt/locale.h is deprecated, include fmt/format.h or fmt/xchar.h instead -+#endif diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index db01678275d37a..33558c894dd2d8 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 8.1.1 - SHA512 794a47d7cb352a2a9f2c050a60a46b002e4157e5ad23e15a5afc668e852b1e1847aeee3cda79e266c789ff79310d792060c94976ceef6352e322d60b94e23189 + REF 9.0.0 + SHA512 f9612a53c93654753572ac038e52c683f3485691493750d5c2fdb48f3a769e181bfeab8035041cae02bf14cd67df30ec3c5614d7db913f85699cd9da8072bdf8 HEAD_REF master PATCHES fix-write-batch.patch - fix-invalid-command.patch fix-format-conflict.patch ) diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 28a1f11a3859d7..a98bb9a53fae80 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "8.1.1", - "port-version": 2, + "version": "9.0.0", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 7f2a86c5bfbb28..6e96a585e10154 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2325,8 +2325,8 @@ "port-version": 4 }, "fmt": { - "baseline": "8.1.1", - "port-version": 2 + "baseline": "9.0.0", + "port-version": 0 }, "folly": { "baseline": "2022.07.11.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 1b05965f08b748..c03fc52dde7395 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9268e89cdadcbb0a54357f47b343004200970a02", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "1f0a5cf3aa202e9833dcc5d3fa36688ecf295ca4", "version": "8.1.1", From 5e77198e98c305109b2881580b1cb6971e87834f Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Thu, 4 Aug 2022 18:48:49 -0400 Subject: [PATCH 304/791] [osgearth] Fix errors that occur in the osgearth config file on some platforms (#26024) * Fix target export in osgearth config * Update port * Update ports/osgearth/fix-osgearth-config.patch Co-authored-by: Robert Schumacher Co-authored-by: Robert Schumacher --- ports/osgearth/fix-osgearth-config.patch | 27 ++++++++++++++++++++++++ ports/osgearth/portfile.cmake | 1 + ports/osgearth/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/osgearth.json | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 ports/osgearth/fix-osgearth-config.patch diff --git a/ports/osgearth/fix-osgearth-config.patch b/ports/osgearth/fix-osgearth-config.patch new file mode 100644 index 00000000000000..31efaac737f3d7 --- /dev/null +++ b/ports/osgearth/fix-osgearth-config.patch @@ -0,0 +1,27 @@ +diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in +index 3f27dffe9..354e0f7dc 100644 +--- a/osgEarthConfig.cmake.in ++++ b/osgEarthConfig.cmake.in +@@ -13,11 +13,11 @@ endif() + set(osgearth_DEFINITIONS ${${XPREFIX}_CFLAGS}) + + find_path(osgearth_INCLUDE_DIR +- NAMES OSGEARTH/RTREE.H ++ NAMES osgEarth/rtree.h + HINTS ${${XPREFIX}_INCLUDE_DIRS} + ) + +-set(OSGEARTH_NAMES osgearth) ++set(OSGEARTH_NAMES osgEarth) + + find_library(osgearth_LIBRARY + NAMES ${OSGEARTH_NAMES} +@@ -38,6 +38,8 @@ find_package_handle_standard_args(osgearth DEFAULT_MSG + + string (REPLACE ";" " " osgearth_LDFLAGS "${osgearth_LDFLAGS}") + ++add_library(osgEarth UNKNOWN IMPORTED) ++ + set_target_properties(osgearth + PROPERTIES + IMPORTED_LOCATION "${osgearth_LIBRARIES}" diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 0b94ef078cd972..5bd04f4a5f18f6 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( find-package.patch remove-tool-debug-suffix.patch remove-lerc-gltf.patch + fix-osgearth-config.patch ) if("tools" IN_LIST FEATURES) diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 015f188261bd09..bb99a1eca06eb3 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "osgearth", "version": "3.3", + "port-version": 1, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 6e96a585e10154..a1383c8d193083 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5346,7 +5346,7 @@ }, "osgearth": { "baseline": "3.3", - "port-version": 0 + "port-version": 1 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index ca373fd84ba83d..c647b8382540ef 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1091743df235c6472d30b157723f82e6d3473cc9", + "version": "3.3", + "port-version": 1 + }, { "git-tree": "6e95d7000b08e777779b6b0c6d2dbf35686b87a4", "version": "3.3", From acb370dd6dbe17552a3b5c8b6e09bb9e9e59510e Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 5 Aug 2022 02:21:59 +0200 Subject: [PATCH 305/791] [OpenCV] update to v4.6.0 (#25431) * [OpenCV] update to v3.4.18 and v4.6.0 enable python2 in vcpkg-get-python-package * fix references * remove python2 from testing * restore python2 tests only on windows&x64 * fix references * [OpenCV2] add jasper patch * fix references * update handling multiple versions * add usage files * [dbow] fix build * [dbow] fix version * fix references * remove ipp from vcpkg-ci-opencv for opencv3 * [OpenCV2] fix CRT linking with static libs * fix references * [dbow3] add support clause now that is CI tested [cctag] enable opencv4, fix build on osx * fix references * [OpenCV2] fix patch * fix references * [libharu] bump version * fix references * [rtabmap] fix for opencv 4.6 * [rtabmap] fix manifest * fix references * remove llvm dependency to ease CI load * version * overwrite version * fixes for mingw * add mingw patch * fix references * [OpenCV2] fix generated config on win32 * fix references * update version * update version * overwrite baseline * cleanup after merge * fix references * [openmvs] trying to diagnose the problem - DO NOT MERGE * fix references * restore port version * fix references * Revert "[openmvs] trying to diagnose the problem - DO NOT MERGE" This reverts commit 8bfd0ff4f9785d2a425ae8bab50bba7317ee85d4. * Revert "fix references" This reverts commit 0e915f6eef53b16d045c2b038ffd0370ba2d8c5f. * skip opencv2 and opencv3 * remove again opencv2/3 from vcpkg-ci-opencv * apply fixes from review * fix references * wrong checksum (tested on windows) * Github-actions fixes (#2) * Update opencv4.json * fix github-actions issues * formating vcpkg.json * update git-trees * fix rtabmap license * fix references * fix also dbow3 license * fix references * [cctag] remove unnecessary patch section * fix references Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: FrankXie Co-authored-by: Matthieu Penant Co-authored-by: Matthieu Penant --- ports/cctag/0001-fix-osx.patch | 11 + ports/cctag/portfile.cmake | 7 +- ports/cctag/vcpkg.json | 3 +- ports/dbow3/fix_cmake.patch | 2405 +++++++---------- ports/dbow3/portfile.cmake | 20 +- ports/dbow3/vcpkg.json | 17 +- ports/opencv/portfile.cmake | 8 + ports/opencv/vcpkg.json | 4 +- ...tions.patch => 0001-install-options.patch} | 47 +- ...> 0002-fix-paths-containing-symbols.patch} | 2 - ports/opencv2/0006-fix-jasper.patch | 20 + ports/opencv2/0007-fix-config.patch | 18 + ports/opencv2/portfile.cmake | 45 +- ports/opencv2/usage.in | 4 + ports/opencv2/vcpkg.json | 4 +- ports/opencv3/0012-fix-zlib.patch | 2 - ports/opencv3/0013-fix-ceres.patch | 11 + ports/opencv3/0016-fix-freetype-contrib.patch | 15 + ports/opencv3/portfile.cmake | 96 +- ports/opencv3/usage.in | 4 + ports/opencv3/vcpkg.json | 35 +- ...5-fix-eigen.patch => 0004-fix-eigen.patch} | 0 ...57.patch => 0005-fix-policy-CMP0057.patch} | 0 ports/opencv4/0008-devendor-quirc.patch | 4 +- ports/opencv4/0012-fix-zlib.patch | 2 - ports/opencv4/0013-fix-ceres.patch | 11 + ports/opencv4/0013-fix-opengl.patch | 11 - ports/opencv4/0014-fix-gstreamer.patch | 29 - ports/opencv4/0014-fix-ogre.patch | 12 + ports/opencv4/0015-fix-freetype.patch | 2 - ports/opencv4/0016-fix-freetype-contrib.patch | 2 - .../0017-mingw-strsafe-no-deprecate.patch | 15 + ports/opencv4/portfile.cmake | 49 +- ports/opencv4/usage.in | 5 + ports/opencv4/vcpkg.json | 3 +- ports/rtabmap/0001-add-bigobj-for-msvc.patch | 14 - ports/rtabmap/0002-fix-opencv46.patch | 11 + .../{fix-qt.patch => 0003-fix-qt.patch} | 13 - ports/rtabmap/portfile.cmake | 5 +- ports/rtabmap/vcpkg.json | 23 +- ports/vcpkg-get-python-packages/vcpkg.json | 3 +- .../x_vcpkg_get_python_packages.cmake | 57 +- scripts/ci.baseline.txt | 36 +- versions/baseline.json | 24 +- versions/c-/cctag.json | 5 + versions/d-/dbow3.json | 5 + versions/o-/opencv.json | 5 + versions/o-/opencv2.json | 5 + versions/o-/opencv3.json | 5 + versions/o-/opencv4.json | 5 + versions/r-/rtabmap.json | 5 + versions/v-/vcpkg-get-python-packages.json | 5 + 52 files changed, 1510 insertions(+), 1639 deletions(-) create mode 100644 ports/cctag/0001-fix-osx.patch rename ports/opencv2/{0002-install-options.patch => 0001-install-options.patch} (92%) rename ports/opencv2/{fix-path-contains-++-error.patch => 0002-fix-paths-containing-symbols.patch} (94%) create mode 100644 ports/opencv2/0006-fix-jasper.patch create mode 100644 ports/opencv2/0007-fix-config.patch create mode 100644 ports/opencv2/usage.in create mode 100644 ports/opencv3/0013-fix-ceres.patch create mode 100644 ports/opencv3/0016-fix-freetype-contrib.patch create mode 100644 ports/opencv3/usage.in rename ports/opencv4/{0005-fix-eigen.patch => 0004-fix-eigen.patch} (100%) rename ports/opencv4/{0004-fix-policy-CMP0057.patch => 0005-fix-policy-CMP0057.patch} (100%) create mode 100644 ports/opencv4/0013-fix-ceres.patch delete mode 100644 ports/opencv4/0013-fix-opengl.patch delete mode 100644 ports/opencv4/0014-fix-gstreamer.patch create mode 100644 ports/opencv4/0014-fix-ogre.patch create mode 100644 ports/opencv4/0017-mingw-strsafe-no-deprecate.patch create mode 100644 ports/opencv4/usage.in create mode 100644 ports/rtabmap/0002-fix-opencv46.patch rename ports/rtabmap/{fix-qt.patch => 0003-fix-qt.patch} (65%) diff --git a/ports/cctag/0001-fix-osx.patch b/ports/cctag/0001-fix-osx.patch new file mode 100644 index 00000000000000..8d3f76acfdfb8d --- /dev/null +++ b/ports/cctag/0001-fix-osx.patch @@ -0,0 +1,11 @@ +--- a/src/cctag/utils/Exceptions.hpp ++++ b/src/cctag/utils/Exceptions.hpp +@@ -7,7 +7,7 @@ + */ + #ifndef _CCTAG_EXCEPTIONS_HPP_ + #define _CCTAG_EXCEPTIONS_HPP_ +- ++#define _GNU_SOURCE + #include + #include + #include diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake index bce2870c087e8f..6b4a4d3aed6f97 100644 --- a/ports/cctag/portfile.cmake +++ b/ports/cctag/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.0.2 SHA512 ccd62f6b1ca55035a08660052f38e73866260d5295490864fa9c86af779a42ce2ec727d6c88f0ea38f205903cf8f4107069b690849e432219c74d3b9666e3ae2 HEAD_REF develop + PATCHES + 0001-fix-osx.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -15,7 +17,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS if("cuda" IN_LIST FEATURES) include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) - message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") endif() @@ -30,7 +31,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CCTag) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # remove test files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/geometry/test" "${CURRENT_PACKAGES_DIR}/include/cctag/test") @@ -45,4 +46,4 @@ if ("apps" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES ${CCTAG_TOOLS} AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctag RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json index 7661452d0368c7..184400043093a7 100644 --- a/ports/cctag/vcpkg.json +++ b/ports/cctag/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cctag", "version-semver": "1.0.2", + "port-version": 1, "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", @@ -32,7 +33,7 @@ "boost-type-traits", "boost-unordered", "eigen3", - "opencv3", + "opencv", "tbb", { "name": "vcpkg-cmake", diff --git a/ports/dbow3/fix_cmake.patch b/ports/dbow3/fix_cmake.patch index 0b802425e3279a..81b6a7e200c1b0 100644 --- a/ports/dbow3/fix_cmake.patch +++ b/ports/dbow3/fix_cmake.patch @@ -1,632 +1,293 @@ -From d72cb42f5147f7648c462ee1b211070c1691a887 Mon Sep 17 00:00:00 2001 -From: Ramadan -Date: Thu, 15 Aug 2019 12:27:19 +0200 -Subject: [PATCH 1/2] Fix CMakeLists.txt and installation - ---- - .gitignore | 249 ++++++++++ - CMakeLists.txt | 275 +---------- - Lib/CMakeLists.txt | 99 ++++ - Lib/DBow3Config.cmake | 4 + - {src => Lib/include/DBow3}/BowVector.h | 1 + - {src => Lib/include/DBow3}/DBoW3.h | 0 - {src => Lib/include/DBow3}/Database.h | 0 - {src => Lib/include/DBow3}/DescManip.h | 0 - {src => Lib/include/DBow3}/FeatureVector.h | 0 - {src => Lib/include/DBow3}/QueryResults.h | 0 - {src => Lib/include/DBow3}/ScoringObject.h | 0 - {src => Lib/include/DBow3}/Vocabulary.h | 0 - {src => Lib/include/DBow3}/exports.h | 16 +- - {src => Lib/include/DBow3}/quicklz.h | 0 - {src => Lib/include/DBow3}/timers.h | 0 - {src => Lib/src}/BowVector.cpp | 2 +- - {src => Lib/src}/Database.cpp | 2 +- - {src => Lib/src}/DescManip.cpp | 546 ++++++++++----------- - {src => Lib/src}/FeatureVector.cpp | 2 +- - {src => Lib/src}/QueryResults.cpp | 2 +- - {src => Lib/src}/ScoringObject.cpp | 4 +- - {src => Lib/src}/Vocabulary.cpp | 8 +- - {src => Lib/src}/quicklz.c | 2 +- - cmake/instructionSet.cmake | 13 + - cmake_uninstall.cmake.in | 28 -- - config.cmake.in | 36 -- - {utils => examples}/CMakeLists.txt | 0 - {utils => examples}/create_voc_step0.cpp | 252 +++++----- - {utils => examples}/create_voc_step1.cpp | 142 +++--- - {utils => examples}/demo_general.cpp | 404 +++++++-------- - {utils => examples}/images/image0.png | Bin - {utils => examples}/images/image1.png | Bin - {utils => examples}/images/image2.png | Bin - {utils => examples}/images/image3.png | Bin - src/CMakeLists.txt | 35 -- - orbvoc.dbow3 => voc/orbvoc.dbow3 | Bin - 36 files changed, 1072 insertions(+), 1050 deletions(-) - create mode 100644 .gitignore - create mode 100644 Lib/CMakeLists.txt - create mode 100644 Lib/DBow3Config.cmake - rename {src => Lib/include/DBow3}/BowVector.h (99%) - rename {src => Lib/include/DBow3}/DBoW3.h (100%) - rename {src => Lib/include/DBow3}/Database.h (100%) - rename {src => Lib/include/DBow3}/DescManip.h (100%) - rename {src => Lib/include/DBow3}/FeatureVector.h (100%) - rename {src => Lib/include/DBow3}/QueryResults.h (100%) - rename {src => Lib/include/DBow3}/ScoringObject.h (100%) - rename {src => Lib/include/DBow3}/Vocabulary.h (100%) - rename {src => Lib/include/DBow3}/exports.h (78%) - rename {src => Lib/include/DBow3}/quicklz.h (100%) - rename {src => Lib/include/DBow3}/timers.h (100%) - rename {src => Lib/src}/BowVector.cpp (99%) - rename {src => Lib/src}/Database.cpp (99%) - rename {src => Lib/src}/DescManip.cpp (96%) - rename {src => Lib/src}/FeatureVector.cpp (98%) - rename {src => Lib/src}/QueryResults.cpp (97%) - rename {src => Lib/src}/ScoringObject.cpp (99%) - rename {src => Lib/src}/Vocabulary.cpp (99%) - rename {src => Lib/src}/quicklz.c (99%) - create mode 100644 cmake/instructionSet.cmake - delete mode 100644 cmake_uninstall.cmake.in - delete mode 100644 config.cmake.in - rename {utils => examples}/CMakeLists.txt (100%) - rename {utils => examples}/create_voc_step0.cpp (97%) - rename {utils => examples}/create_voc_step1.cpp (97%) - rename {utils => examples}/demo_general.cpp (96%) - rename {utils => examples}/images/image0.png (100%) - rename {utils => examples}/images/image1.png (100%) - rename {utils => examples}/images/image2.png (100%) - rename {utils => examples}/images/image3.png (100%) - delete mode 100644 src/CMakeLists.txt - rename orbvoc.dbow3 => voc/orbvoc.dbow3 (100%) - -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..8c4285e ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1,249 @@ -+## Ignore Visual Studio temporary files, build results, and -+## files generated by popular Visual Studio add-ons. -+ -+# User-specific files -+*.suo -+*.user -+*.userosscache -+*.sln.docstates -+ -+# User-specific files (MonoDevelop/Xamarin Studio) -+*.userprefs -+ -+# Build results -+[Dd]ebug/ -+[Dd]ebugPublic/ -+[Rr]elease/ -+[Rr]eleases/ -+[Xx]64/ -+[Xx]86/ -+[Bb]uild/ -+bld/ -+[Bb]in/ -+[Oo]bj/ -+ -+# Visual Studio 2015 cache/options directory -+.vs/ -+out/ -+# Uncomment if you have tasks that create the project's static files in wwwroot -+#wwwroot/ -+ -+# MSTest test Results -+[Tt]est[Rr]esult*/ -+[Bb]uild[Ll]og.* -+ -+# NUNIT -+*.VisualState.xml -+TestResult.xml -+ -+# Build Results of an ATL Project -+[Dd]ebugPS/ -+[Rr]eleasePS/ -+dlldata.c -+ -+# DNX -+project.lock.json -+artifacts/ -+ -+*_i.c -+*_p.c -+*_i.h -+*.ilk -+*.meta -+*.obj -+*.pch -+*.pdb -+*.pgc -+*.pgd -+*.rsp -+*.sbr -+*.tlb -+*.tli -+*.tlh -+*.tmp -+*.tmp_proj -+*.log -+*.vspscc -+*.vssscc -+.builds -+*.pidb -+*.svclog -+*.scc -+*.tlog -+*.idb -+# Chutzpah Test files -+_Chutzpah* -+ -+# Visual C++ cache files -+ipch/ -+*.aps -+*.ncb -+*.opendb -+*.opensdf -+*.sdf -+*.cachefile -+*.VC.db -+ -+# Visual Studio profiler -+*.psess -+*.vsp -+*.vspx -+*.sap -+ -+# TFS 2012 Local Workspace -+$tf/ -+ -+# Guidance Automation Toolkit -+*.gpState -+ -+# ReSharper is a .NET coding add-in -+_ReSharper*/ -+*.[Rr]e[Ss]harper -+*.DotSettings.user -+ -+# JustCode is a .NET coding add-in -+.JustCode -+ -+# TeamCity is a build add-in -+_TeamCity* -+ -+# DotCover is a Code Coverage Tool -+*.dotCover -+ -+# NCrunch -+_NCrunch_* -+.*crunch*.local.xml -+nCrunchTemp_* -+ -+# MightyMoose -+*.mm.* -+AutoTest.Net/ -+ -+# Web workbench (sass) -+.sass-cache/ -+ -+# Installshield output folder -+[Ee]xpress/ -+ -+# DocProject is a documentation generator add-in -+DocProject/buildhelp/ -+DocProject/Help/*.HxT -+DocProject/Help/*.HxC -+DocProject/Help/*.hhc -+DocProject/Help/*.hhk -+DocProject/Help/*.hhp -+DocProject/Help/Html2 -+DocProject/Help/html -+ -+# Click-Once directory -+publish/ -+ -+# Publish Web Output -+*.[Pp]ublish.xml -+*.azurePubxml -+ -+# TODO: Un-comment the next line if you do not want to checkin -+# your web deploy settings because they may include unencrypted -+# passwords -+#*.pubxml -+*.publishproj -+ -+# NuGet Packages -+*.nupkg -+# The packages folder can be ignored because of Package Restore -+**/packages/* -+# except build/, which is used as an MSBuild target. -+!**/packages/build/ -+# Uncomment if necessary however generally it will be regenerated when needed -+#!**/packages/repositories.config -+# NuGet v3's project.json files produces more ignoreable files -+*.nuget.props -+*.nuget.targets -+ -+# Microsoft Azure Build Output -+csx/ -+*.build.csdef -+ -+# Microsoft Azure Emulator -+ecf/ -+rcf/ -+ -+# Microsoft Azure ApplicationInsights config file -+ApplicationInsights.config -+ -+# Windows Store app package directory -+AppPackages/ -+BundleArtifacts/ -+ -+# Visual Studio cache files -+# files ending in .cache can be ignored -+*.[Cc]ache -+# but keep track of directories ending in .cache -+!*.[Cc]ache/ -+ -+# Others -+ClientBin/ -+[Ss]tyle[Cc]op.* -+~$* -+*~ -+*.dbmdl -+*.dbproj.schemaview -+*.pfx -+*.publishsettings -+node_modules/ -+orleans.codegen.cs -+ -+# RIA/Silverlight projects -+Generated_Code/ -+ -+# Backup & report files from converting an old project file -+# to a newer Visual Studio version. Backup files are not needed, -+# because we have git ;-) -+_UpgradeReport_Files/ -+Backup*/ -+UpgradeLog*.XML -+UpgradeLog*.htm -+ -+# SQL Server files -+*.mdf -+*.ldf -+ -+# Business Intelligence projects -+*.rdl.data -+*.bim.layout -+*.bim_*.settings -+ -+# Microsoft Fakes -+FakesAssemblies/ -+ -+# GhostDoc plugin setting file -+*.GhostDoc.xml -+ -+# Node.js Tools for Visual Studio -+.ntvs_analysis.dat -+ -+# Visual Studio 6 build log -+*.plg -+ -+# Visual Studio 6 workspace options file -+*.opt -+ -+# Visual Studio LightSwitch build output -+**/*.HTMLClient/GeneratedArtifacts -+**/*.DesktopClient/GeneratedArtifacts -+**/*.DesktopClient/ModelManifest.xml -+**/*.Server/GeneratedArtifacts -+**/*.Server/ModelManifest.xml -+_Pvt_Extensions -+ -+# LightSwitch generated files -+GeneratedArtifacts/ -+ModelManifest.xml -+ -+# Paket dependency manager -+.paket/paket.exe -+ -+# FAKE - F# Make -+.fake/ -+html -+xml -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9541cd7..a2a563a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,268 +1,25 @@ --# ---------------------------------------------------------------------------- --# Basic Configuration --# ---------------------------------------------------------------------------- --CMAKE_MINIMUM_REQUIRED(VERSION 2.8) -+cmake_minimum_required(VERSION 3.10) - --set(CMAKE_CXX_STANDARD 11) -+project(DBow3 VERSION 1.0.0) - --PROJECT(DBoW3) --set(PROJECT_VERSION "0.0.1") --string(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") --list(GET PROJECT_VERSION_PARTS 0 PROJECT_VERSION_MAJOR) --list(GET PROJECT_VERSION_PARTS 1 PROJECT_VERSION_MINOR) --list(GET PROJECT_VERSION_PARTS 2 PROJECT_VERSION_PATCH) --set(PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") -+option(BUILD_EXAMPLES "Set to ON to build examples" OFF) -+option(BUILD_TESTS "Set to ON to build tests" OFF) -+option(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) - --message("LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}") -+# OpenCV -+option(USE_OPENCV_CONTRIB "Set on to use opencv-contrib" ON) - --#------------------------------------------------------ --# Build type --#------------------------------------------------------ -+# Optimization -+option(USE_SIMD "Set on to enabel avx optimization" ON) - --IF(NOT CMAKE_BUILD_TYPE ) -- SET( CMAKE_BUILD_TYPE "Release" ) --ENDIF() - --#------------------------------------------------------ --# Lib Names and Dirs --#------------------------------------------------------ -+add_subdirectory(Lib) - --if(WIN32) -- # Postfix of DLLs: -- SET(PROJECT_DLLVERSION "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}") -- SET(RUNTIME_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls and binaries") -- SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for binaries") -- SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls") --else() -- # Postfix of so's: -- set(PROJECT_DLLVERSION) -- set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries (e.g. lib32 or lib64 for multilib installations)") -- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/cmake/ /usr/${LIB_INSTALL_DIR}/cmake ) --endif() -+if(BUILD_EXAMPLES) -+ add_subdirectory(examples) -+endif(BUILD_EXAMPLES) - -+if(BUILD_TESTS) -+ add_subdirectory(tests) -+endif(BUILD_TESTS) - -- --# --OPTION(BUILD_UTILS "Set to OFF to not build utils" ON) --OPTION(USE_CONTRIB "Set to ON if contrib are installed" OFF) --OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) -- --# ---------------------------------------------------------------------------- --# Find Dependencies --# ---------------------------------------------------------------------------- --find_package(OpenCV REQUIRED) --IF(USE_CONTRIB) --add_definitions(-DUSE_CONTRIB) --ENDIF() --if(NOT OpenCV_VERSION VERSION_LESS "3.0") -- ADD_DEFINITIONS(-DOPENCV_VERSION_3) -- SET(OPENCV_VERSION_3 ON) --ELSE() -- SET(OPENCV_VERSION_3 OFF) --ENDIF() -- --include_directories(${OpenCV_INCLUDE_DIRS}) -- --SET(REQUIRED_LIBRARIES ${REQUIRED_LIBRARIES} ${OpenCV_LIBS}) -- --# ---------------------------------------------------------------------------- --# PROJECT CONFIGURATION --# force some variables that could be defined in the command line to be written to cache --# ---------------------------------------------------------------------------- --OPTION(INSTALL_DOC "Set to ON to build/install Documentation" OFF) --IF (INSTALL_DOC) -- FIND_PACKAGE(Doxygen REQUIRED) -- MESSAGE( STATUS "INSTALL_DOC: ${INSTALL_DOC} ") -- INCLUDE("${PROJECT_SOURCE_DIR}/generateDoc.cmake") -- GENERATE_DOCUMENTATION(${PROJECT_SOURCE_DIR}/dox.in) --ENDIF() -- --# ---------------------------------------------------------------------------- --# Uninstall target, for "make uninstall" --# ---------------------------------------------------------------------------- --CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) --ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") -- --# ---------------------------------------------------------------------------- --# create configuration file from .in file (If you use windows take care with paths) --# ---------------------------------------------------------------------------- -- --CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake") --CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") --INSTALL(FILES "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/ ) --INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) -- -- -- -- --# ---------------------------------------------------------------------------- --# Program Optimization and debug (Extracted from OpenCV) --# ---------------------------------------------------------------------------- --set(WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors") --set(WHOLE_PROGRAM_OPTIMIZATION OFF CACHE BOOL "Flags for whole program optimization.") -- --set(EXTRA_C_FLAGS "") --set(EXTRA_C_FLAGS_RELEASE "") --set(EXTRA_C_FLAGS_DEBUG "") --set(EXTRA_EXE_LINKER_FLAGS "") --set(EXTRA_EXE_LINKER_FLAGS_RELEASE "") --set(EXTRA_EXE_LINKER_FLAGS_DEBUG "") -- --IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) -- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)") -- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC") -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*) # We can use only -O2 because the -O3 causes gcc crash -- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC") -- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") -- endif() -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*) -- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") -- set(USE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC") -- endif () -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*) -- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") -- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") -- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") -- set(USE_SSE ON CACHE BOOL "Enable SSE for GCC") -- set(USE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC") -- set(USE_SSE3 ON CACHE BOOL "Enable SSE3 for GCC") -- endif() -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86) -- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") -- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") -- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") -- set(USE_SSE OFF CACHE BOOL "Enable SSE for GCC") -- set(USE_SSE2 OFF CACHE BOOL "Enable SSE2 for GCC") -- set(USE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC") -- endif () -- -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall") -- -- if(WARNINGS_ARE_ERRORS) -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") -- endif() -- -- # The -Wno-long-long is required in 64bit systems when including sytem headers. -- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-long-long") -- endif() -- -- # Whole program optimization -- if(WHOLE_PROGRAM_OPTIMIZATION) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fwhole-program --combine") -- endif() -- -- # Other optimizations -- if(USE_OMIT_FRAME_POINTER) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer") -- endif() -- if(USE_O2) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O2") -- endif() -- if(USE_O3) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O3") -- endif() -- if(USE_FAST_MATH) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -ffast-math") -- endif() -- if(USE_POWERPC) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mcpu=G3 -mtune=G5") -- endif() -- if(USE_MMX) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mmmx") -- endif() -- if(USE_SSE) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse") -- endif() -- if(USE_SSE2) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse2") -- endif() -- if(USE_SSE3 AND NOT MINGW) # SSE3 should be disabled under MingW because it generates compiler errors -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3") -- endif() -- -- if(ENABLE_PROFILING) -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g") -- else() -- if(NOT APPLE) -- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -ffunction-sections") -- endif() -- endif() -- -- -- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG ") -- set(EXTRA_C_FLAGS_DEBUG "-g3 -O0 -DDEBUG -D_DEBUG -W -Wextra -Wno-return-type ") -- -- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) -- message( STATUS "GNU COMPILER") -- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) -- -- -- -- --ELSE() # MSVC -- -- --ENDIF()#END OF COMPILER SPECIFIC OPTIONS --SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_RELEASE}") --SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_DEBUG}") --SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c++11") --SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c++11") --set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS_DEBUG}") --set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}") --SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_EXE_LINKER_FLAGS}") --SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${EXTRA_EXE_LINKER_FLAGS_RELEASE}") --SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${EXTRA_EXE_LINKER_FLAGS_DEBUG}") -- -- -- --#------------------------------------------------ --# DIRS --#------------------------------------------------ --ADD_SUBDIRECTORY(src) --IF (BUILD_UTILS) --ADD_SUBDIRECTORY(utils) --ENDIF() -- --IF (BUILD_TESTS) --ADD_SUBDIRECTORY(tests) --ENDIF() -- -- --# ---------------------------------------------------------------------------- --# display status message for important variables --# ---------------------------------------------------------------------------- --message( STATUS ) --MESSAGE( STATUS "-------------------------------------------------------------------------------" ) --message( STATUS "General configuration for ${PROJECT_NAME} ${PROJECT_VERSION}") --MESSAGE( STATUS "-------------------------------------------------------------------------------" ) --message(" Built as dynamic libs?:" ${BUILD_SHARED_LIBS}) --message(" Compiler:" "${CMAKE_COMPILER}" "${CMAKE_CXX_COMPILER}") -- --message( STATUS "Build Type: ${CMAKE_BUILD_TYPE}") --message( STATUS "C++ flags (Release): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") --message( STATUS "C++ flags (Debug): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") --message( STATUS "C++ flags (Relase+Debug): ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") -- --message( STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") --message( STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") -- --MESSAGE( STATUS ) --MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}" ) --MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" ) --MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" ) --MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" ) --MESSAGE( STATUS "BUILD_UTILS= ${BUILD_UTILS}" ) --MESSAGE( STATUS "BUILD_TESTS= ${BUILD_TESTS}" ) --MESSAGE( STATUS "OPENCV_DIR= ${OpenCV_DIR} VERSION=${OpenCV_VERSION}" ) -- --MESSAGE( STATUS "USE_CONTRIB= ${USE_CONTRIB}" ) -- --MESSAGE( STATUS ) --MESSAGE( STATUS "OpenCV_LIB_DIR=${OpenCV_LIB_DIR}") --MESSAGE( STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}") -- --MESSAGE( STATUS ) --MESSAGE( STATUS ) --MESSAGE( STATUS "Change a value with: cmake -D=" ) --MESSAGE( STATUS ) -diff --git a/Lib/CMakeLists.txt b/Lib/CMakeLists.txt -new file mode 100644 -index 0000000..e56077b +-# ---------------------------------------------------------------------------- +-# Basic Configuration +-# ---------------------------------------------------------------------------- +-CMAKE_MINIMUM_REQUIRED(VERSION 2.8) ++cmake_minimum_required(VERSION 3.10) + +-set(CMAKE_CXX_STANDARD 11) ++project(DBow3 VERSION 1.0.0) + +-PROJECT(DBoW3) +-set(PROJECT_VERSION "0.0.1") +-string(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}") +-list(GET PROJECT_VERSION_PARTS 0 PROJECT_VERSION_MAJOR) +-list(GET PROJECT_VERSION_PARTS 1 PROJECT_VERSION_MINOR) +-list(GET PROJECT_VERSION_PARTS 2 PROJECT_VERSION_PATCH) +-set(PROJECT_SOVERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") ++option(BUILD_EXAMPLES "Set to ON to build examples" OFF) ++option(BUILD_TESTS "Set to ON to build tests" OFF) ++option(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) + +-message("LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}") ++# OpenCV ++option(USE_OPENCV_CONTRIB "Set on to use opencv-contrib" ON) + +-#------------------------------------------------------ +-# Build type +-#------------------------------------------------------ ++# Optimization ++option(USE_SIMD "Set on to enabel avx optimization" ON) + +-IF(NOT CMAKE_BUILD_TYPE ) +- SET( CMAKE_BUILD_TYPE "Release" ) +-ENDIF() + +-#------------------------------------------------------ +-# Lib Names and Dirs +-#------------------------------------------------------ ++add_subdirectory(Lib) + +-if(WIN32) +- # Postfix of DLLs: +- SET(PROJECT_DLLVERSION "${PROJECT_VERSION_MAJOR}${PROJECT_VERSION_MINOR}${PROJECT_VERSION_PATCH}") +- SET(RUNTIME_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls and binaries") +- SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for binaries") +- SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Directory for dlls") +-else() +- # Postfix of so's: +- set(PROJECT_DLLVERSION) +- set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries (e.g. lib32 or lib64 for multilib installations)") +- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/cmake/ /usr/${LIB_INSTALL_DIR}/cmake ) +-endif() ++if(BUILD_EXAMPLES) ++ add_subdirectory(examples) ++endif(BUILD_EXAMPLES) + ++if(BUILD_TESTS) ++ add_subdirectory(tests) ++endif(BUILD_TESTS) + +- +-# +-OPTION(BUILD_UTILS "Set to OFF to not build utils" ON) +-OPTION(USE_CONTRIB "Set to ON if contrib are installed" OFF) +-OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON) +- +-# ---------------------------------------------------------------------------- +-# Find Dependencies +-# ---------------------------------------------------------------------------- +-find_package(OpenCV REQUIRED) +-IF(USE_CONTRIB) +-add_definitions(-DUSE_CONTRIB) +-ENDIF() +-if(NOT OpenCV_VERSION VERSION_LESS "3.0") +- ADD_DEFINITIONS(-DOPENCV_VERSION_3) +- SET(OPENCV_VERSION_3 ON) +-ELSE() +- SET(OPENCV_VERSION_3 OFF) +-ENDIF() +- +-include_directories(${OpenCV_INCLUDE_DIRS}) +- +-SET(REQUIRED_LIBRARIES ${REQUIRED_LIBRARIES} ${OpenCV_LIBS}) +- +-# ---------------------------------------------------------------------------- +-# PROJECT CONFIGURATION +-# force some variables that could be defined in the command line to be written to cache +-# ---------------------------------------------------------------------------- +-OPTION(INSTALL_DOC "Set to ON to build/install Documentation" OFF) +-IF (INSTALL_DOC) +- FIND_PACKAGE(Doxygen REQUIRED) +- MESSAGE( STATUS "INSTALL_DOC: ${INSTALL_DOC} ") +- INCLUDE("${PROJECT_SOURCE_DIR}/generateDoc.cmake") +- GENERATE_DOCUMENTATION(${PROJECT_SOURCE_DIR}/dox.in) +-ENDIF() +- +-# ---------------------------------------------------------------------------- +-# Uninstall target, for "make uninstall" +-# ---------------------------------------------------------------------------- +-CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) +-ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +- +-# ---------------------------------------------------------------------------- +-# create configuration file from .in file (If you use windows take care with paths) +-# ---------------------------------------------------------------------------- +- +-CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake") +-CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake") +-INSTALL(FILES "${PROJECT_BINARY_DIR}/Find${PROJECT_NAME}.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/ ) +-INSTALL(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" DESTINATION ${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME} ) +- +- +- +- +-# ---------------------------------------------------------------------------- +-# Program Optimization and debug (Extracted from OpenCV) +-# ---------------------------------------------------------------------------- +-set(WARNINGS_ARE_ERRORS OFF CACHE BOOL "Treat warnings as errors") +-set(WHOLE_PROGRAM_OPTIMIZATION OFF CACHE BOOL "Flags for whole program optimization.") +- +-set(EXTRA_C_FLAGS "") +-set(EXTRA_C_FLAGS_RELEASE "") +-set(EXTRA_C_FLAGS_DEBUG "") +-set(EXTRA_EXE_LINKER_FLAGS "") +-set(EXTRA_EXE_LINKER_FLAGS_RELEASE "") +-set(EXTRA_EXE_LINKER_FLAGS_DEBUG "") +- +-IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) +- set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC compiler (Add flags: -g -pg)") +- set(USE_OMIT_FRAME_POINTER ON CACHE BOOL "Enable -fomit-frame-pointer for GCC") +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES arm*) # We can use only -O2 because the -O3 causes gcc crash +- set(USE_O2 ON CACHE BOOL "Enable -O2 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- endif() +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES powerpc*) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_POWERPC ON CACHE BOOL "Enable PowerPC for GCC") +- endif () +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64*) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") +- set(USE_SSE ON CACHE BOOL "Enable SSE for GCC") +- set(USE_SSE2 ON CACHE BOOL "Enable SSE2 for GCC") +- set(USE_SSE3 ON CACHE BOOL "Enable SSE3 for GCC") +- endif() +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES i686* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES x86) +- set(USE_O3 ON CACHE BOOL "Enable -O3 for GCC") +- set(USE_FAST_MATH OFF CACHE BOOL "Enable -ffast-math for GCC") +- set(USE_MMX ON CACHE BOOL "Enable MMX for GCC") +- set(USE_SSE OFF CACHE BOOL "Enable SSE for GCC") +- set(USE_SSE2 OFF CACHE BOOL "Enable SSE2 for GCC") +- set(USE_SSE3 OFF CACHE BOOL "Enable SSE3 for GCC") +- endif () +- +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wall") +- +- if(WARNINGS_ARE_ERRORS) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Werror") +- endif() +- +- # The -Wno-long-long is required in 64bit systems when including sytem headers. +- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES x86_64* OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -Wno-long-long") +- endif() +- +- # Whole program optimization +- if(WHOLE_PROGRAM_OPTIMIZATION) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fwhole-program --combine") +- endif() +- +- # Other optimizations +- if(USE_OMIT_FRAME_POINTER) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -fomit-frame-pointer") +- endif() +- if(USE_O2) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O2") +- endif() +- if(USE_O3) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -O3") +- endif() +- if(USE_FAST_MATH) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -ffast-math") +- endif() +- if(USE_POWERPC) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mcpu=G3 -mtune=G5") +- endif() +- if(USE_MMX) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mmmx") +- endif() +- if(USE_SSE) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse") +- endif() +- if(USE_SSE2) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse2") +- endif() +- if(USE_SSE3 AND NOT MINGW) # SSE3 should be disabled under MingW because it generates compiler errors +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -msse3") +- endif() +- +- if(ENABLE_PROFILING) +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -pg -g") +- else() +- if(NOT APPLE) +- set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -ffunction-sections") +- endif() +- endif() +- +- +- set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -DNDEBUG ") +- set(EXTRA_C_FLAGS_DEBUG "-g3 -O0 -DDEBUG -D_DEBUG -W -Wextra -Wno-return-type ") +- +- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +- message( STATUS "GNU COMPILER") +- MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +- +- +- +- +-ELSE() # MSVC +- +- +-ENDIF()#END OF COMPILER SPECIFIC OPTIONS +-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_RELEASE}") +-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS_DEBUG}") +-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -std=c++11") +-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -std=c++11") +-set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} ${CMAKE_C_FLAGS_DEBUG}") +-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} ${CMAKE_CXX_FLAGS_DEBUG}") +-SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_EXE_LINKER_FLAGS}") +-SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${EXTRA_EXE_LINKER_FLAGS_RELEASE}") +-SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${EXTRA_EXE_LINKER_FLAGS_DEBUG}") +- +- +- +-#------------------------------------------------ +-# DIRS +-#------------------------------------------------ +-ADD_SUBDIRECTORY(src) +-IF (BUILD_UTILS) +-ADD_SUBDIRECTORY(utils) +-ENDIF() +- +-IF (BUILD_TESTS) +-ADD_SUBDIRECTORY(tests) +-ENDIF() +- +- +-# ---------------------------------------------------------------------------- +-# display status message for important variables +-# ---------------------------------------------------------------------------- +-message( STATUS ) +-MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +-message( STATUS "General configuration for ${PROJECT_NAME} ${PROJECT_VERSION}") +-MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +-message(" Built as dynamic libs?:" ${BUILD_SHARED_LIBS}) +-message(" Compiler:" "${CMAKE_COMPILER}" "${CMAKE_CXX_COMPILER}") +- +-message( STATUS "Build Type: ${CMAKE_BUILD_TYPE}") +-message( STATUS "C++ flags (Release): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") +-message( STATUS "C++ flags (Debug): ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") +-message( STATUS "C++ flags (Relase+Debug): ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") +- +-message( STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") +-message( STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR = ${CMAKE_SYSTEM_PROCESSOR}" ) +-MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" ) +-MESSAGE( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" ) +-MESSAGE( STATUS "CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}" ) +-MESSAGE( STATUS "BUILD_UTILS= ${BUILD_UTILS}" ) +-MESSAGE( STATUS "BUILD_TESTS= ${BUILD_TESTS}" ) +-MESSAGE( STATUS "OPENCV_DIR= ${OpenCV_DIR} VERSION=${OpenCV_VERSION}" ) +- +-MESSAGE( STATUS "USE_CONTRIB= ${USE_CONTRIB}" ) +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS "OpenCV_LIB_DIR=${OpenCV_LIB_DIR}") +-MESSAGE( STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}") +- +-MESSAGE( STATUS ) +-MESSAGE( STATUS ) +-MESSAGE( STATUS "Change a value with: cmake -D=" ) +-MESSAGE( STATUS ) --- /dev/null +++ b/Lib/CMakeLists.txt -@@ -0,0 +1,99 @@ +@@ -0,0 +1,92 @@ +cmake_minimum_required(VERSION 3.10) + +find_package(OpenCV REQUIRED) @@ -684,13 +345,6 @@ index 0000000..e56077b +) +endif() + -+if(USE_SIMD) -+ target_link_libraries(DBow3 -+ PRIVATE -+ SIMD::SSE4.1 -+ ) -+endif() -+ +target_compile_definitions(DBow3 + PUBLIC + NOMINMAX @@ -727,9 +381,6 @@ index 0000000..e56077b +install(FILES DBow3Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/DBow3ConfigVersion.cmake + DESTINATION cmake/DBow3) \ No newline at end of file -diff --git a/Lib/DBow3Config.cmake b/Lib/DBow3Config.cmake -new file mode 100644 -index 0000000..9720a14 --- /dev/null +++ b/Lib/DBow3Config.cmake @@ -0,0 +1,4 @@ @@ -858,279 +509,279 @@ index d6331af..430ce2b 100644 --- a/src/DescManip.cpp +++ b/Lib/src/DescManip.cpp @@ -1,273 +1,273 @@ --/** -- * File: DescManip.cpp -- * Date: June 2012 -- * Author: Dorian Galvez-Lopez -- * Description: functions for ORB descriptors -- * License: see the LICENSE.txt file -- * -- */ -- --#include --#include --#include --#include --#include --#include -- --#include "DescManip.h" -- --using namespace std; -- --namespace DBoW3 { -- --// -------------------------------------------------------------------------- -- --void DescManip::meanValue(const std::vector &descriptors, -- cv::Mat &mean) --{ -- -- if(descriptors.empty()) return; -- -- if(descriptors.size() == 1) -- { -- mean = descriptors[0].clone(); -- return; -- } -- //binary descriptor -- if (descriptors[0].type()==CV_8U ){ -- //determine number of bytes of the binary descriptor -- int L= getDescSizeBytes( descriptors[0]); -- vector sum( L * 8, 0); -- -- for(size_t i = 0; i < descriptors.size(); ++i) -- { -- const cv::Mat &d = descriptors[i]; -- const unsigned char *p = d.ptr(); -- -- for(int j = 0; j < d.cols; ++j, ++p) -- { -- if(*p & (1 << 7)) ++sum[ j*8 ]; -- if(*p & (1 << 6)) ++sum[ j*8 + 1 ]; -- if(*p & (1 << 5)) ++sum[ j*8 + 2 ]; -- if(*p & (1 << 4)) ++sum[ j*8 + 3 ]; -- if(*p & (1 << 3)) ++sum[ j*8 + 4 ]; -- if(*p & (1 << 2)) ++sum[ j*8 + 5 ]; -- if(*p & (1 << 1)) ++sum[ j*8 + 6 ]; -- if(*p & (1)) ++sum[ j*8 + 7 ]; -- } -- } -- -- mean = cv::Mat::zeros(1, L, CV_8U); -- unsigned char *p = mean.ptr(); -- -- const int N2 = (int)descriptors.size() / 2 + descriptors.size() % 2; -- for(size_t i = 0; i < sum.size(); ++i) -- { -- if(sum[i] >= N2) -- { -- // set bit -- *p |= 1 << (7 - (i % 8)); -- } -- -- if(i % 8 == 7) ++p; -- } -- } -- //non binary descriptor -- else{ -- assert(descriptors[0].type()==CV_32F );//ensure it is float -- -- mean.create(1, descriptors[0].cols,descriptors[0].type()); -- mean.setTo(cv::Scalar::all(0)); -- float inv_s =1./double( descriptors.size()); -- for(size_t i=0;i(); // a & b are actually CV_8U -- pb = b.ptr(); -- -- uint64_t v, ret = 0; -- for(size_t i = 0; i < a.cols / sizeof(uint64_t); ++i, ++pa, ++pb) -- { -- v = *pa ^ *pb; -- v = v - ((v >> 1) & (uint64_t)~(uint64_t)0/3); -- v = (v & (uint64_t)~(uint64_t)0/15*3) + ((v >> 2) & -- (uint64_t)~(uint64_t)0/15*3); -- v = (v + (v >> 4)) & (uint64_t)~(uint64_t)0/255*15; -- ret += (uint64_t)(v * ((uint64_t)~(uint64_t)0/255)) >> -- (sizeof(uint64_t) - 1) * CHAR_BIT; -- } -- -- return ret; -- } -- else{ -- double sqd = 0.; -- assert(a.type()==CV_32F); -- assert(a.rows==1); -- const float *a_ptr=a.ptr(0); -- const float *b_ptr=b.ptr(0); -- for(int i = 0; i < a.cols; i ++) -- sqd += (a_ptr[i ] - b_ptr[i ])*(a_ptr[i ] - b_ptr[i ]); -- return sqd; -- } --} -- -- -- -- --// -------------------------------------------------------------------------- -- --std::string DescManip::toString(const cv::Mat &a) --{ -- stringstream ss; -- //introduce a magic value to distinguish from DBOw2 -- ss<<"dbw3 "; -- //save size and type -- -- -- ss <(); -- for(int i = 0; i < a.cols; ++i, ++p) -- ss << (int)*p << " "; -- }else{ -- -- const float *p = a.ptr(); -- for(int i = 0; i < a.cols; ++i, ++p) -- ss << *p << " "; -- -- } -- -- return ss.str(); --} -- --// -------------------------------------------------------------------------- -- --void DescManip::fromString(cv::Mat &a, const std::string &s) --{ -- -- //check if the dbow3 is present -- string ss_aux;ss_aux.reserve(10); -- for(size_t i=0;i<10 && i data;data.reserve(100); -- while( ss>>val) data.push_back(val); -- //copy to a -- a.create(1,data.size(),CV_8UC1); -- memcpy(a.ptr(0),&data[0],data.size()); -- } -- else { -- char szSign[10]; -- int type,cols; -- stringstream ss(s); -- ss >> szSign >> type >> cols; -- a.create(1, cols, type); -- if(type==CV_8UC1){ -- unsigned char *p = a.ptr(); -- int n; -- for(int i = 0; i < a.cols; ++i, ++p) -- if ( ss >> n) *p = (unsigned char)n; -- } -- else{ -- float *p = a.ptr(); -- for(int i = 0; i < a.cols; ++i, ++p) -- if ( !(ss >> *p))cerr<<"Error reading. Unexpected EOF. DescManip::fromString"< &descriptors, -- cv::Mat &mat) --{ -- if(descriptors.empty()) -- { -- mat.release(); -- return; -- } -- -- if(descriptors[0].type()==CV_8UC1){ -- -- const size_t N = descriptors.size(); -- int L=getDescSizeBytes(descriptors[0]); -- mat.create(N, L*8, CV_32F); -- float *p = mat.ptr(); -- -- for(size_t i = 0; i < N; ++i) -- { -- const int C = descriptors[i].cols; -- const unsigned char *desc = descriptors[i].ptr(); -- -- for(int j = 0; j < C; ++j, p += 8) -- { -- p[0] = (desc[j] & (1 << 7) ? 1 : 0); -- p[1] = (desc[j] & (1 << 6) ? 1 : 0); -- p[2] = (desc[j] & (1 << 5) ? 1 : 0); -- p[3] = (desc[j] & (1 << 4) ? 1 : 0); -- p[4] = (desc[j] & (1 << 3) ? 1 : 0); -- p[5] = (desc[j] & (1 << 2) ? 1 : 0); -- p[6] = (desc[j] & (1 << 1) ? 1 : 0); -- p[7] = desc[j] & (1); -- } -- } -- } -- else{ -- assert(descriptors[0].type()==CV_32F); -- const int N = descriptors.size(); -- int L=descriptors[0].cols; -- mat.create(N, L, CV_32F); -- for(int i = 0; i < N; ++i) -- memcpy(mat.ptr(i),descriptors[i].ptr(0),sizeof(float)*L); -- } --} -- --void DescManip::toStream(const cv::Mat &m,std::ostream &str){ -- assert(m.rows==1 || m.isContinuous()); -- int type=m.type(); -- int cols=m.cols; -- int rows=m.rows; -- str.write((char*)&cols,sizeof(cols)); -- str.write((char*)&rows,sizeof(rows)); -- str.write((char*)&type,sizeof(type)); -- str.write((char*)m.ptr(0),m.elemSize()*m.cols); --} -- --void DescManip::fromStream(cv::Mat &m,std::istream &str){ -- int type,cols,rows; -- str.read((char*)&cols,sizeof(cols)); -- str.read((char*)&rows,sizeof(rows)); -- str.read((char*)&type,sizeof(type)); -- m.create(rows,cols,type); -- str.read((char*)m.ptr(0),m.elemSize()*m.cols); --} -- -- --// -------------------------------------------------------------------------- -- --} // namespace DBoW3 -- +-/** +- * File: DescManip.cpp +- * Date: June 2012 +- * Author: Dorian Galvez-Lopez +- * Description: functions for ORB descriptors +- * License: see the LICENSE.txt file +- * +- */ +- +-#include +-#include +-#include +-#include +-#include +-#include +- +-#include "DescManip.h" +- +-using namespace std; +- +-namespace DBoW3 { +- +-// -------------------------------------------------------------------------- +- +-void DescManip::meanValue(const std::vector &descriptors, +- cv::Mat &mean) +-{ +- +- if(descriptors.empty()) return; +- +- if(descriptors.size() == 1) +- { +- mean = descriptors[0].clone(); +- return; +- } +- //binary descriptor +- if (descriptors[0].type()==CV_8U ){ +- //determine number of bytes of the binary descriptor +- int L= getDescSizeBytes( descriptors[0]); +- vector sum( L * 8, 0); +- +- for(size_t i = 0; i < descriptors.size(); ++i) +- { +- const cv::Mat &d = descriptors[i]; +- const unsigned char *p = d.ptr(); +- +- for(int j = 0; j < d.cols; ++j, ++p) +- { +- if(*p & (1 << 7)) ++sum[ j*8 ]; +- if(*p & (1 << 6)) ++sum[ j*8 + 1 ]; +- if(*p & (1 << 5)) ++sum[ j*8 + 2 ]; +- if(*p & (1 << 4)) ++sum[ j*8 + 3 ]; +- if(*p & (1 << 3)) ++sum[ j*8 + 4 ]; +- if(*p & (1 << 2)) ++sum[ j*8 + 5 ]; +- if(*p & (1 << 1)) ++sum[ j*8 + 6 ]; +- if(*p & (1)) ++sum[ j*8 + 7 ]; +- } +- } +- +- mean = cv::Mat::zeros(1, L, CV_8U); +- unsigned char *p = mean.ptr(); +- +- const int N2 = (int)descriptors.size() / 2 + descriptors.size() % 2; +- for(size_t i = 0; i < sum.size(); ++i) +- { +- if(sum[i] >= N2) +- { +- // set bit +- *p |= 1 << (7 - (i % 8)); +- } +- +- if(i % 8 == 7) ++p; +- } +- } +- //non binary descriptor +- else{ +- assert(descriptors[0].type()==CV_32F );//ensure it is float +- +- mean.create(1, descriptors[0].cols,descriptors[0].type()); +- mean.setTo(cv::Scalar::all(0)); +- float inv_s =1./double( descriptors.size()); +- for(size_t i=0;i(); // a & b are actually CV_8U +- pb = b.ptr(); +- +- uint64_t v, ret = 0; +- for(size_t i = 0; i < a.cols / sizeof(uint64_t); ++i, ++pa, ++pb) +- { +- v = *pa ^ *pb; +- v = v - ((v >> 1) & (uint64_t)~(uint64_t)0/3); +- v = (v & (uint64_t)~(uint64_t)0/15*3) + ((v >> 2) & +- (uint64_t)~(uint64_t)0/15*3); +- v = (v + (v >> 4)) & (uint64_t)~(uint64_t)0/255*15; +- ret += (uint64_t)(v * ((uint64_t)~(uint64_t)0/255)) >> +- (sizeof(uint64_t) - 1) * CHAR_BIT; +- } +- +- return ret; +- } +- else{ +- double sqd = 0.; +- assert(a.type()==CV_32F); +- assert(a.rows==1); +- const float *a_ptr=a.ptr(0); +- const float *b_ptr=b.ptr(0); +- for(int i = 0; i < a.cols; i ++) +- sqd += (a_ptr[i ] - b_ptr[i ])*(a_ptr[i ] - b_ptr[i ]); +- return sqd; +- } +-} +- +- +- +- +-// -------------------------------------------------------------------------- +- +-std::string DescManip::toString(const cv::Mat &a) +-{ +- stringstream ss; +- //introduce a magic value to distinguish from DBOw2 +- ss<<"dbw3 "; +- //save size and type +- +- +- ss <(); +- for(int i = 0; i < a.cols; ++i, ++p) +- ss << (int)*p << " "; +- }else{ +- +- const float *p = a.ptr(); +- for(int i = 0; i < a.cols; ++i, ++p) +- ss << *p << " "; +- +- } +- +- return ss.str(); +-} +- +-// -------------------------------------------------------------------------- +- +-void DescManip::fromString(cv::Mat &a, const std::string &s) +-{ +- +- //check if the dbow3 is present +- string ss_aux;ss_aux.reserve(10); +- for(size_t i=0;i<10 && i data;data.reserve(100); +- while( ss>>val) data.push_back(val); +- //copy to a +- a.create(1,data.size(),CV_8UC1); +- memcpy(a.ptr(0),&data[0],data.size()); +- } +- else { +- char szSign[10]; +- int type,cols; +- stringstream ss(s); +- ss >> szSign >> type >> cols; +- a.create(1, cols, type); +- if(type==CV_8UC1){ +- unsigned char *p = a.ptr(); +- int n; +- for(int i = 0; i < a.cols; ++i, ++p) +- if ( ss >> n) *p = (unsigned char)n; +- } +- else{ +- float *p = a.ptr(); +- for(int i = 0; i < a.cols; ++i, ++p) +- if ( !(ss >> *p))cerr<<"Error reading. Unexpected EOF. DescManip::fromString"< &descriptors, +- cv::Mat &mat) +-{ +- if(descriptors.empty()) +- { +- mat.release(); +- return; +- } +- +- if(descriptors[0].type()==CV_8UC1){ +- +- const size_t N = descriptors.size(); +- int L=getDescSizeBytes(descriptors[0]); +- mat.create(N, L*8, CV_32F); +- float *p = mat.ptr(); +- +- for(size_t i = 0; i < N; ++i) +- { +- const int C = descriptors[i].cols; +- const unsigned char *desc = descriptors[i].ptr(); +- +- for(int j = 0; j < C; ++j, p += 8) +- { +- p[0] = (desc[j] & (1 << 7) ? 1 : 0); +- p[1] = (desc[j] & (1 << 6) ? 1 : 0); +- p[2] = (desc[j] & (1 << 5) ? 1 : 0); +- p[3] = (desc[j] & (1 << 4) ? 1 : 0); +- p[4] = (desc[j] & (1 << 3) ? 1 : 0); +- p[5] = (desc[j] & (1 << 2) ? 1 : 0); +- p[6] = (desc[j] & (1 << 1) ? 1 : 0); +- p[7] = desc[j] & (1); +- } +- } +- } +- else{ +- assert(descriptors[0].type()==CV_32F); +- const int N = descriptors.size(); +- int L=descriptors[0].cols; +- mat.create(N, L, CV_32F); +- for(int i = 0; i < N; ++i) +- memcpy(mat.ptr(i),descriptors[i].ptr(0),sizeof(float)*L); +- } +-} +- +-void DescManip::toStream(const cv::Mat &m,std::ostream &str){ +- assert(m.rows==1 || m.isContinuous()); +- int type=m.type(); +- int cols=m.cols; +- int rows=m.rows; +- str.write((char*)&cols,sizeof(cols)); +- str.write((char*)&rows,sizeof(rows)); +- str.write((char*)&type,sizeof(type)); +- str.write((char*)m.ptr(0),m.elemSize()*m.cols); +-} +- +-void DescManip::fromStream(cv::Mat &m,std::istream &str){ +- int type,cols,rows; +- str.read((char*)&cols,sizeof(cols)); +- str.read((char*)&rows,sizeof(rows)); +- str.read((char*)&type,sizeof(type)); +- m.create(rows,cols,type); +- str.read((char*)m.ptr(0),m.elemSize()*m.cols); +-} +- +- +-// -------------------------------------------------------------------------- +- +-} // namespace DBoW3 +- +/** + * File: DescManip.cpp + * Date: June 2012 @@ -1549,42 +1200,42 @@ index 9d15feb..0000000 --- a/config.cmake.in +++ /dev/null @@ -1,36 +0,0 @@ --# =================================================================================== --# @PROJECT_NAME@ CMake configuration file --# --# ** File generated automatically, do not modify ** --# --# Usage from an external project: --# In your CMakeLists.txt, add these lines: --# --# FIND_PACKAGE(@PROJECT_NAME@ REQUIRED ) --# TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${@PROJECT_NAME@_LIBS}) --# --# This file will define the following variables: --# - @PROJECT_NAME@_LIBS : The list of libraries to links against. --# - @PROJECT_NAME@_LIB_DIR : The directory where lib files are. Calling LINK_DIRECTORIES --# with this path is NOT needed. --# - @PROJECT_NAME@_VERSION : The version of this PROJECT_NAME build. Example: "1.2.0" --# - @PROJECT_NAME@_VERSION_MAJOR : Major version part of VERSION. Example: "1" --# - @PROJECT_NAME@_VERSION_MINOR : Minor version part of VERSION. Example: "2" --# - @PROJECT_NAME@_VERSION_PATCH : Patch version part of VERSION. Example: "0" --# --# =================================================================================== --INCLUDE_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/include") --SET(@PROJECT_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include") -- --LINK_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") --SET(@PROJECT_NAME@_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") -- --SET(@PROJECT_NAME@_LIBS @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) --SET(@PROJECT_NAME@_LIBRARIES @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) -- --SET(@PROJECT_NAME@_FOUND YES) --SET(@PROJECT_NAME@_FOUND "YES") --SET(@PROJECT_NAME@_VERSION @PROJECT_VERSION@) --SET(@PROJECT_NAME@_VERSION_MAJOR @PROJECT_VERSION_MAJOR@) --SET(@PROJECT_NAME@_VERSION_MINOR @PROJECT_VERSION_MINOR@) --SET(@PROJECT_NAME@_VERSION_PATCH @PROJECT_VERSION_PATCH@) +-# =================================================================================== +-# @PROJECT_NAME@ CMake configuration file +-# +-# ** File generated automatically, do not modify ** +-# +-# Usage from an external project: +-# In your CMakeLists.txt, add these lines: +-# +-# FIND_PACKAGE(@PROJECT_NAME@ REQUIRED ) +-# TARGET_LINK_LIBRARIES(MY_TARGET_NAME ${@PROJECT_NAME@_LIBS}) +-# +-# This file will define the following variables: +-# - @PROJECT_NAME@_LIBS : The list of libraries to links against. +-# - @PROJECT_NAME@_LIB_DIR : The directory where lib files are. Calling LINK_DIRECTORIES +-# with this path is NOT needed. +-# - @PROJECT_NAME@_VERSION : The version of this PROJECT_NAME build. Example: "1.2.0" +-# - @PROJECT_NAME@_VERSION_MAJOR : Major version part of VERSION. Example: "1" +-# - @PROJECT_NAME@_VERSION_MINOR : Minor version part of VERSION. Example: "2" +-# - @PROJECT_NAME@_VERSION_PATCH : Patch version part of VERSION. Example: "0" +-# +-# =================================================================================== +-INCLUDE_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/include") +-SET(@PROJECT_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include") +- +-LINK_DIRECTORIES("@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") +-SET(@PROJECT_NAME@_LIB_DIR "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@") +- +-SET(@PROJECT_NAME@_LIBS @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) +-SET(@PROJECT_NAME@_LIBRARIES @REQUIRED_LIBRARIES@ @PROJECT_NAME@@PROJECT_DLLVERSION@) +- +-SET(@PROJECT_NAME@_FOUND YES) +-SET(@PROJECT_NAME@_FOUND "YES") +-SET(@PROJECT_NAME@_VERSION @PROJECT_VERSION@) +-SET(@PROJECT_NAME@_VERSION_MAJOR @PROJECT_VERSION_MAJOR@) +-SET(@PROJECT_NAME@_VERSION_MINOR @PROJECT_VERSION_MINOR@) +-SET(@PROJECT_NAME@_VERSION_PATCH @PROJECT_VERSION_PATCH@) diff --git a/utils/CMakeLists.txt b/examples/CMakeLists.txt similarity index 100% rename from utils/CMakeLists.txt @@ -1597,132 +1248,132 @@ index 4fd78f6..c48a3c4 100644 --- a/utils/create_voc_step0.cpp +++ b/examples/create_voc_step0.cpp @@ -1,126 +1,126 @@ -- --//First step of creating a vocabulary is extracting features from a set of images. We save them to a file for next step --#include --#include -- --// DBoW3 --#include "DBoW3.h" -- --// OpenCV --#include --#include --#include --#ifdef USE_CONTRIB --#include --#include --#endif --#include "DescManip.h" -- --using namespace DBoW3; --using namespace std; -- -- --//command line parser --class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ -- vector paths; -- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ -- //select detector -- cv::Ptr fdetector; -- if (descriptor=="orb") fdetector=cv::ORB::create(); -- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); --#ifdef OPENCV_VERSION_3 -- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); --#endif --#ifdef USE_CONTRIB -- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); --#endif -- -- else throw std::runtime_error("Invalid descriptor"); -- assert(!descriptor.empty()); -- vector features; -- -- -- cout << "Extracting features..." << endl; -- for(size_t i = 0; i < path_to_images.size(); ++i) -- { -- vector keypoints; -- cv::Mat descriptors; -- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); -- features.push_back(descriptors); -- cout<<"done detecting features"< &features){ -- -- //test it is not created -- std::ifstream ifile(filename); -- if (ifile.is_open()){cerr<<"ERROR::: Output File "<(0),f.total()*f.elemSize()); -- } --} -- --// ---------------------------------------------------------------------------- -- --int main(int argc,char **argv) --{ -- -- try{ -- CmdLineParser cml(argc,argv); -- if (cml["-h"] || argc==1){ -- cerr<<"Usage: descriptor_name output image0 image1 ... \n\t descriptors:brisk,surf,orb(default),akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); -- -- //save features to file -- saveToFile(argv[2],features); -- -- }catch(std::exception &ex){ -- cerr< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-#include +-#include +-#ifdef USE_CONTRIB +-#include +-#include +-#endif +-#include "DescManip.h" +- +-using namespace DBoW3; +-using namespace std; +- +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ +- vector paths; +- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +- //select detector +- cv::Ptr fdetector; +- if (descriptor=="orb") fdetector=cv::ORB::create(); +- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); +-#ifdef OPENCV_VERSION_3 +- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); +-#endif +-#ifdef USE_CONTRIB +- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); +-#endif +- +- else throw std::runtime_error("Invalid descriptor"); +- assert(!descriptor.empty()); +- vector features; +- +- +- cout << "Extracting features..." << endl; +- for(size_t i = 0; i < path_to_images.size(); ++i) +- { +- vector keypoints; +- cv::Mat descriptors; +- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); +- features.push_back(descriptors); +- cout<<"done detecting features"< &features){ +- +- //test it is not created +- std::ifstream ifile(filename); +- if (ifile.is_open()){cerr<<"ERROR::: Output File "<(0),f.total()*f.elemSize()); +- } +-} +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc==1){ +- cerr<<"Usage: descriptor_name output image0 image1 ... \n\t descriptors:brisk,surf,orb(default),akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); +- +- //save features to file +- saveToFile(argv[2],features); +- +- }catch(std::exception &ex){ +- cerr< @@ -1857,77 +1508,77 @@ index 8d9de7d..1f82c66 100644 --- a/utils/create_voc_step1.cpp +++ b/examples/create_voc_step1.cpp @@ -1,71 +1,71 @@ --//Second step,creates the vocabulary from the set of features. It can be slow --#include --#include -- --// DBoW3 --#include "DBoW3.h" -- --// OpenCV --#include --using namespace DBoW3; --using namespace std; -- --//command line parser --class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readFeaturesFromFile(string filename){ --vector features; -- //test it is not created -- std::ifstream ifile(filename); -- if (!ifile.is_open()){cerr<<"could not open input file"<(0),features[i].total()*features[i].elemSize()); -- } -- return features; --} -- --// ---------------------------------------------------------------------------- -- --int main(int argc,char **argv) --{ -- -- try{ -- CmdLineParser cml(argc,argv); -- if (cml["-h"] || argc!=3){ -- cerr<<"Usage: features output_voc.yml[.gz]"< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-using namespace DBoW3; +-using namespace std; +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readFeaturesFromFile(string filename){ +-vector features; +- //test it is not created +- std::ifstream ifile(filename); +- if (!ifile.is_open()){cerr<<"could not open input file"<(0),features[i].total()*features[i].elemSize()); +- } +- return features; +-} +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc!=3){ +- cerr<<"Usage: features output_voc.yml[.gz]"< +#include @@ -2007,208 +1658,208 @@ index 63db40b..b4bc391 100644 --- a/utils/demo_general.cpp +++ b/examples/demo_general.cpp @@ -1,202 +1,202 @@ --/** -- * Date: 2016 -- * Author: Rafael Muñoz Salinas -- * Description: demo application of DBoW3 -- * License: see the LICENSE.txt file -- */ -- --#include --#include -- --// DBoW3 --#include "DBoW3.h" -- --// OpenCV --#include --#include --#include --#ifdef USE_CONTRIB --#include --#include --#endif --#include "DescManip.h" -- --using namespace DBoW3; --using namespace std; -- -- --//command line parser --class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ -- vector paths; -- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ -- //select detector -- cv::Ptr fdetector; -- if (descriptor=="orb") fdetector=cv::ORB::create(); -- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); --#ifdef OPENCV_VERSION_3 -- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); --#endif --#ifdef USE_CONTRIB -- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); --#endif -- -- else throw std::runtime_error("Invalid descriptor"); -- assert(!descriptor.empty()); -- vector features; -- -- -- cout << "Extracting features..." << endl; -- for(size_t i = 0; i < path_to_images.size(); ++i) -- { -- vector keypoints; -- cv::Mat descriptors; -- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); -- features.push_back(descriptors); -- cout<<"done detecting features"< &features) --{ -- // branching factor and depth levels -- const int k = 9; -- const int L = 3; -- const WeightingType weight = TF_IDF; -- const ScoringType score = L1_NORM; -- -- DBoW3::Vocabulary voc(k, L, weight, score); -- -- cout << "Creating a small " << k << "^" << L << " vocabulary..." << endl; -- voc.create(features); -- cout << "... done!" << endl; -- -- cout << "Vocabulary information: " << endl -- << voc << endl << endl; -- -- // lets do something with this vocabulary -- cout << "Matching images against themselves (0 low, 1 high): " << endl; -- BowVector v1, v2; -- for(size_t i = 0; i < features.size(); i++) -- { -- voc.transform(features[i], v1); -- for(size_t j = 0; j < features.size(); j++) -- { -- voc.transform(features[j], v2); -- -- double score = voc.score(v1, v2); -- cout << "Image " << i << " vs Image " << j << ": " << score << endl; -- } -- } -- -- // save the vocabulary to disk -- cout << endl << "Saving vocabulary..." << endl; -- voc.save("small_voc.yml.gz"); -- cout << "Done" << endl; --} -- --////// ---------------------------------------------------------------------------- -- --void testDatabase(const vector &features) --{ -- cout << "Creating a small database..." << endl; -- -- // load the vocabulary from disk -- Vocabulary voc("small_voc.yml.gz"); -- -- Database db(voc, false, 0); // false = do not use direct index -- // (so ignore the last param) -- // The direct index is useful if we want to retrieve the features that -- // belong to some vocabulary node. -- // db creates a copy of the vocabulary, we may get rid of "voc" now -- -- // add images to the database -- for(size_t i = 0; i < features.size(); i++) -- db.add(features[i]); -- -- cout << "... done!" << endl; -- -- cout << "Database information: " << endl << db << endl; -- -- // and query the database -- cout << "Querying the database: " << endl; -- -- QueryResults ret; -- for(size_t i = 0; i < features.size(); i++) -- { -- db.query(features[i], ret, 4); -- -- // ret[0] is always the same image in this case, because we added it to the -- // database. ret[1] is the second best match. -- -- cout << "Searching for Image " << i << ". " << ret << endl; -- } -- -- cout << endl; -- -- // we can save the database. The created file includes the vocabulary -- // and the entries added -- cout << "Saving database..." << endl; -- db.save("small_db.yml.gz"); -- cout << "... done!" << endl; -- -- // once saved, we can load it again -- cout << "Retrieving database once again..." << endl; -- Database db2("small_db.yml.gz"); -- cout << "... done! This is: " << endl << db2 << endl; --} -- -- --// ---------------------------------------------------------------------------- -- --int main(int argc,char **argv) --{ -- -- try{ -- CmdLineParser cml(argc,argv); -- if (cml["-h"] || argc<=2){ -- cerr<<"Usage: descriptor_name image0 image1 ... \n\t descriptors:brisk,surf,orb ,akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); -- testVocCreation(features); -- -- -- testDatabase(features); -- -- }catch(std::exception &ex){ -- cerr< +-#include +- +-// DBoW3 +-#include "DBoW3.h" +- +-// OpenCV +-#include +-#include +-#include +-#ifdef USE_CONTRIB +-#include +-#include +-#endif +-#include "DescManip.h" +- +-using namespace DBoW3; +-using namespace std; +- +- +-//command line parser +-class CmdLineParser{int argc; char **argv; public: CmdLineParser(int _argc,char **_argv):argc(_argc),argv(_argv){} bool operator[] ( string param ) {int idx=-1; for ( int i=0; i readImagePaths(int argc,char **argv,int start){ +- vector paths; +- for(int i=start;i loadFeatures( std::vector path_to_images,string descriptor="") throw (std::exception){ +- //select detector +- cv::Ptr fdetector; +- if (descriptor=="orb") fdetector=cv::ORB::create(); +- else if (descriptor=="brisk") fdetector=cv::BRISK::create(); +-#ifdef OPENCV_VERSION_3 +- else if (descriptor=="akaze") fdetector=cv::AKAZE::create(); +-#endif +-#ifdef USE_CONTRIB +- else if(descriptor=="surf" ) fdetector=cv::xfeatures2d::SURF::create(400, 4, 2, EXTENDED_SURF); +-#endif +- +- else throw std::runtime_error("Invalid descriptor"); +- assert(!descriptor.empty()); +- vector features; +- +- +- cout << "Extracting features..." << endl; +- for(size_t i = 0; i < path_to_images.size(); ++i) +- { +- vector keypoints; +- cv::Mat descriptors; +- cout<<"reading image: "<detectAndCompute(image, cv::Mat(), keypoints, descriptors); +- features.push_back(descriptors); +- cout<<"done detecting features"< &features) +-{ +- // branching factor and depth levels +- const int k = 9; +- const int L = 3; +- const WeightingType weight = TF_IDF; +- const ScoringType score = L1_NORM; +- +- DBoW3::Vocabulary voc(k, L, weight, score); +- +- cout << "Creating a small " << k << "^" << L << " vocabulary..." << endl; +- voc.create(features); +- cout << "... done!" << endl; +- +- cout << "Vocabulary information: " << endl +- << voc << endl << endl; +- +- // lets do something with this vocabulary +- cout << "Matching images against themselves (0 low, 1 high): " << endl; +- BowVector v1, v2; +- for(size_t i = 0; i < features.size(); i++) +- { +- voc.transform(features[i], v1); +- for(size_t j = 0; j < features.size(); j++) +- { +- voc.transform(features[j], v2); +- +- double score = voc.score(v1, v2); +- cout << "Image " << i << " vs Image " << j << ": " << score << endl; +- } +- } +- +- // save the vocabulary to disk +- cout << endl << "Saving vocabulary..." << endl; +- voc.save("small_voc.yml.gz"); +- cout << "Done" << endl; +-} +- +-////// ---------------------------------------------------------------------------- +- +-void testDatabase(const vector &features) +-{ +- cout << "Creating a small database..." << endl; +- +- // load the vocabulary from disk +- Vocabulary voc("small_voc.yml.gz"); +- +- Database db(voc, false, 0); // false = do not use direct index +- // (so ignore the last param) +- // The direct index is useful if we want to retrieve the features that +- // belong to some vocabulary node. +- // db creates a copy of the vocabulary, we may get rid of "voc" now +- +- // add images to the database +- for(size_t i = 0; i < features.size(); i++) +- db.add(features[i]); +- +- cout << "... done!" << endl; +- +- cout << "Database information: " << endl << db << endl; +- +- // and query the database +- cout << "Querying the database: " << endl; +- +- QueryResults ret; +- for(size_t i = 0; i < features.size(); i++) +- { +- db.query(features[i], ret, 4); +- +- // ret[0] is always the same image in this case, because we added it to the +- // database. ret[1] is the second best match. +- +- cout << "Searching for Image " << i << ". " << ret << endl; +- } +- +- cout << endl; +- +- // we can save the database. The created file includes the vocabulary +- // and the entries added +- cout << "Saving database..." << endl; +- db.save("small_db.yml.gz"); +- cout << "... done!" << endl; +- +- // once saved, we can load it again +- cout << "Retrieving database once again..." << endl; +- Database db2("small_db.yml.gz"); +- cout << "... done! This is: " << endl << db2 << endl; +-} +- +- +-// ---------------------------------------------------------------------------- +- +-int main(int argc,char **argv) +-{ +- +- try{ +- CmdLineParser cml(argc,argv); +- if (cml["-h"] || argc<=2){ +- cerr<<"Usage: descriptor_name image0 image1 ... \n\t descriptors:brisk,surf,orb ,akaze(only if using opencv 3)"< features= loadFeatures(images,descriptor); +- testVocCreation(features); +- +- +- testDatabase(features); +- +- }catch(std::exception &ex){ +- cerr<= 3 || (CERES_VERSION_MAJOR >= 2 && CERES_VERSION_MINOR >= 1) +- problem.SetParameterization(current_camera_R_t, ++ problem.SetManifold(current_camera_R_t, + constant_translation_manifold); + #else + problem.SetParameterization(current_camera_R_t, diff --git a/ports/opencv3/0016-fix-freetype-contrib.patch b/ports/opencv3/0016-fix-freetype-contrib.patch new file mode 100644 index 00000000000000..930a1d65a35a04 --- /dev/null +++ b/ports/opencv3/0016-fix-freetype-contrib.patch @@ -0,0 +1,15 @@ +--- a/modules/freetype/CMakeLists.txt ++++ b/modules/freetype/CMakeLists.txt +@@ -3,8 +5,10 @@ if(APPLE_FRAMEWORK) + ocv_module_disable(freetype) + endif() + +-ocv_check_modules(FREETYPE freetype2) +-ocv_check_modules(HARFBUZZ harfbuzz) ++if(WITH_FREETYPE) ++find_package(freetype CONFIG REQUIRED) ++find_package(harfbuzz CONFIG REQUIRED) ++endif() + + if(OPENCV_INITIAL_PASS) + if(NOT FREETYPE_FOUND) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 1cf7c930cbabdf..2567a072bfcf62 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -1,11 +1,3 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv2") - message(FATAL_ERROR "OpenCV 2 is installed, please uninstall and try again:\n vcpkg remove opencv2") -endif() - -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") - message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") -endif() - file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) string(JSON OPENCV_VERSION GET "${_contents}" version) @@ -15,7 +7,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 2fa9243625309a1c12c916737c94f0e2f9566f0828469b148cc1683dd1b8db8d1d58f90a36cfcaa72052964a718929451f04cda5361d8b546a63da69217d040a + SHA512 96bbeb9525325f17ba635a0b75126aae0a7b0daef211af45057a97abd5d31a57fc50f0e889a6dab614df9b7621a145e06c0d240f0a218f33df1217d9a19c510d HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -54,6 +46,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG "flann" BUILD_opencv_flann + "freetype" WITH_FREETYPE "gdcm" WITH_GDCM "gstreamer" WITH_GSTREAMER "halide" WITH_HALIDE @@ -73,7 +66,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "dc1394" WITH_1394 ) -# Cannot use vcpkg_check_features() for "dnn", "gtk", "ipp", ovis", "python", "qt", "tbb" +# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb" set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) @@ -102,6 +95,15 @@ if("ipp" IN_LIST FEATURES) set(WITH_IPP ON) endif() +set(WITH_OPENMP OFF) +if("openmp" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_OSX) + set(WITH_OPENMP ON) + else() + message(WARNING "The OpenMP feature is not supported on macOS") + endif() +endif() + set(BUILD_opencv_ovis OFF) if("ovis" IN_LIST FEATURES) set(BUILD_opencv_ovis ON) @@ -113,10 +115,16 @@ if("tbb" IN_LIST FEATURES) endif() set(WITH_PYTHON OFF) +set(BUILD_opencv_python3 OFF) if("python" IN_LIST FEATURES) - x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") - set(ENV{PYTHON} "${PYTHON3}") - set(WITH_PYTHON ON) + if (VCPKG_LIBRARY_LINKAGE STREQUAL static AND VCPKG_TARGET_IS_WINDOWS) + message(WARNING "The python module is currently unsupported on Windows when building static OpenCV libraries") + else() + x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES numpy OUT_PYTHON_VAR "PYTHON3") + set(ENV{PYTHON} "${PYTHON3}") + set(BUILD_opencv_python3 ON) + set(WITH_PYTHON ON) + endif() endif() if("dnn" IN_LIST FEATURES) @@ -140,13 +148,15 @@ if("contrib" IN_LIST FEATURES) endif() vcpkg_from_github( - OUT_SOURCE_PATH CONTRIB_SOURCE_PATH - REPO opencv/opencv_contrib - REF ${OPENCV_VERSION} - SHA512 31bd55617d3a54fa020d4255e463c90caf41e10136c82a05c24ee19890f0cdc4fc049136874841dc84037dedb0562471ea0345ab1dcd5ad8a5b0218f24ae9a35 - HEAD_REF master - PATCHES - 0007-fix-hdf5.patch + OUT_SOURCE_PATH CONTRIB_SOURCE_PATH + REPO opencv/opencv_contrib + REF ${OPENCV_VERSION} + SHA512 a051497e61ae55f86c224044487fc2247a3bba1aa27031c4997c981ddf8402edf82f1dd0d307f562c638bc021cfd8bd42a723973f00ab25131495f84d33c5383 + HEAD_REF master + PATCHES + 0007-fix-hdf5.patch + 0013-fix-ceres.patch + 0016-fix-freetype-contrib.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -244,7 +254,7 @@ if(WITH_IPP) endif() set(WITH_MSMF ON) -if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MINGW) set(WITH_MSMF OFF) endif() @@ -267,6 +277,16 @@ if("ffmpeg" IN_LIST FEATURES) endif() endif() +if("halide" IN_LIST FEATURES) + list(APPEND ADDITIONAL_BUILD_FLAGS + # Halide 13 requires C++17 + "-DCMAKE_CXX_STANDARD=17" + "-DCMAKE_CXX_STANDARD_REQUIRED=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON" + "-DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR}" + ) +endif() + if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") endif() @@ -290,19 +310,20 @@ vcpkg_cmake_configure( -DX86=${TARGET_IS_X86} -DARM=${TARGET_IS_ARM} ###### ocv_options + -DINSTALL_TO_MANGLED_PATHS=OFF -DOpenCV_INSTALL_BINARIES_PREFIX= -DOPENCV_BIN_INSTALL_PATH=bin - -DOPENCV_INCLUDE_INSTALL_PATH=include + -DOPENCV_INCLUDE_INSTALL_PATH=include/opencv3 -DOPENCV_LIB_INSTALL_PATH=lib - -DOPENCV_3P_LIB_INSTALL_PATH=lib - -DOPENCV_CONFIG_INSTALL_PATH=share/opencv - -DINSTALL_TO_MANGLED_PATHS=OFF + -DOPENCV_3P_LIB_INSTALL_PATH=lib/manual-link/opencv3_thirdparty + -DOPENCV_CONFIG_INSTALL_PATH=share/opencv3 -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE -DCMAKE_DEBUG_POSTFIX=d - -DOPENCV_DLLVERSION= + -DOPENCV_DLLVERSION=3 -DOPENCV_DEBUG_POSTFIX=d -DOPENCV_GENERATE_SETUPVARS=OFF + -DOPENCV_GENERATE_PKGCONFIG=ON # Do not build docs/examples -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF @@ -321,6 +342,8 @@ vcpkg_cmake_configure( -DBUILD_PROTOBUF=OFF ###### OpenCV Build components -DBUILD_opencv_apps=OFF + -DBUILD_opencv_java=OFF + -DBUILD_opencv_js=OFF -DBUILD_opencv_bgsegm=${BUILD_opencv_bgsegm} -DBUILD_opencv_line_descriptor=${BUILD_opencv_line_descriptor} -DBUILD_opencv_saliency=${BUILD_opencv_saliency} @@ -351,14 +374,12 @@ vcpkg_cmake_configure( ###### customized properties ## Options from vcpkg_check_features() ${FEATURE_OPTIONS} - -DCMAKE_DISABLE_FIND_PACKAGE_Halide=ON - -DHALIDE_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DWITH_GTK=${WITH_GTK} -DWITH_QT=${WITH_QT} -DWITH_IPP=${WITH_IPP} -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} - -DWITH_OPENMP=OFF + -DWITH_OPENMP=${WITH_OPENMP} -DWITH_PROTOBUF=${BUILD_opencv_flann} -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENCLAMDBLAS=OFF @@ -368,6 +389,7 @@ vcpkg_cmake_configure( ###### BUILD_options (mainly modules which require additional libraries) -DBUILD_opencv_ovis=${BUILD_opencv_ovis} -DBUILD_opencv_dnn=${BUILD_opencv_dnn} + -DBUILD_opencv_python3=${BUILD_opencv_python3} ###### The following modules are disabled for UWP -DBUILD_opencv_quality=${BUILD_opencv_quality} ###### Additional build flags @@ -375,19 +397,19 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if (NOT VCPKG_BUILD_TYPE) # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake" + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules-debug.cmake" "\${_IMPORT_PREFIX}/sdk" "\${_IMPORT_PREFIX}/debug/sdk" ) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) if(${BUILD_opencv_flann}) find_dependency(Protobuf CONFIG REQUIRED) @@ -441,7 +463,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)") @@ -479,7 +501,7 @@ find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)") "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") endif() - file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv3/OpenCVModules.cmake" "${OPENCV_MODULES}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -489,6 +511,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv/licenses") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv") if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") @@ -497,4 +521,6 @@ endif() vcpkg_fixup_pkgconfig() +configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv3/usage.in b/ports/opencv3/usage.in new file mode 100644 index 00000000000000..1bec7f3049fa90 --- /dev/null +++ b/ports/opencv3/usage.in @@ -0,0 +1,4 @@ +The package ${PORT} is compatible with CMake if you set the OpenCV_DIR *before* the find_package call + + set(OpenCV_DIR "${CURRENT_INSTALLED_DIR}/share/${PORT}") + find_package(OpenCV REQUIRED) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index ee4b9427444552..a237deb5359237 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv3", - "version": "3.4.16", - "port-version": 9, + "version": "3.4.18", "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", @@ -50,6 +49,7 @@ "cudnn", { "name": "opencv3", + "default-features": false, "features": [ "contrib" ] @@ -125,6 +125,13 @@ "protobuf" ] }, + "freetype": { + "description": "Freetype support for opencv", + "dependencies": [ + "freetype", + "harfbuzz" + ] + }, "gdcm": { "description": "GDCM support for opencv", "dependencies": [ @@ -196,12 +203,16 @@ "opengl" ] }, + "openmp": { + "description": "Enable openmp support for opencv" + }, "ovis": { "description": "opencv_ovis module", "dependencies": [ "ogre", { "name": "opencv3", + "default-features": false, "features": [ "contrib" ] @@ -215,7 +226,10 @@ ] }, "python": { - "description": "Python wrapper support for opencv" + "description": "Python wrapper support for opencv", + "dependencies": [ + "python3" + ] }, "qt": { "description": "Qt GUI support for opencv", @@ -236,14 +250,21 @@ "description": "opencv_sfm module", "dependencies": [ "ceres", - "eigen3", "gflags", "glog", { "name": "opencv3", + "default-features": false, "features": [ "contrib" ] + }, + { + "name": "opencv3", + "default-features": false, + "features": [ + "eigen" + ] } ] }, @@ -262,6 +283,12 @@ "vtk": { "description": "vtk support for opencv", "dependencies": [ + { + "name": "opencv3", + "features": [ + "contrib" + ] + }, "vtk" ] }, diff --git a/ports/opencv4/0005-fix-eigen.patch b/ports/opencv4/0004-fix-eigen.patch similarity index 100% rename from ports/opencv4/0005-fix-eigen.patch rename to ports/opencv4/0004-fix-eigen.patch diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0005-fix-policy-CMP0057.patch similarity index 100% rename from ports/opencv4/0004-fix-policy-CMP0057.patch rename to ports/opencv4/0005-fix-policy-CMP0057.patch diff --git a/ports/opencv4/0008-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch index 504e42bc55d379..4333eb0f6b59fb 100644 --- a/ports/opencv4/0008-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -11,8 +11,8 @@ --- a/modules/objdetect/CMakeLists.txt +++ b/modules/objdetect/CMakeLists.txt -@@ -2,7 +2,5 @@ set(the_description "Object Detection") - ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d opencv_dnn WRAP java objc python js) +@@ -2,7 +2,5 @@ js + ) if(HAVE_QUIRC) - get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) diff --git a/ports/opencv4/0012-fix-zlib.patch b/ports/opencv4/0012-fix-zlib.patch index 9c38fd89251c86..b82b9b00ebddd2 100644 --- a/ports/opencv4/0012-fix-zlib.patch +++ b/ports/opencv4/0012-fix-zlib.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 8ea5497..7ed3f6b 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -5,6 +5,9 @@ diff --git a/ports/opencv4/0013-fix-ceres.patch b/ports/opencv4/0013-fix-ceres.patch new file mode 100644 index 00000000000000..c8acb16101724f --- /dev/null +++ b/ports/opencv4/0013-fix-ceres.patch @@ -0,0 +1,11 @@ +--- a/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc ++++ b/modules/sfm/src/libmv_light/libmv/simple_pipeline/bundle.cc +@@ -549,7 +549,7 @@ void EuclideanBundleCommonIntrinsics( + + if (bundle_constraints & BUNDLE_NO_TRANSLATION) { + #if CERES_VERSION_MAJOR >= 3 || (CERES_VERSION_MAJOR >= 2 && CERES_VERSION_MINOR >= 1) +- problem.SetParameterization(current_camera_R_t, ++ problem.SetManifold(current_camera_R_t, + constant_translation_manifold); + #else + problem.SetParameterization(current_camera_R_t, diff --git a/ports/opencv4/0013-fix-opengl.patch b/ports/opencv4/0013-fix-opengl.patch deleted file mode 100644 index 8cd38c9bb66306..00000000000000 --- a/ports/opencv4/0013-fix-opengl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/modules/highgui/CMakeLists.txt -+++ b/modules/highgui/CMakeLists.txt -@@ -271,7 +271,7 @@ if(APPLE) - add_apple_compiler_options(${the_module}) - endif() - --if(OPENCV_HIGHGUI_BUILTIN_BACKEND STREQUAL "WIN32UI" AND HAVE_OPENGL AND OPENGL_LIBRARIES) -+if(HAVE_OPENGL AND OPENGL_LIBRARIES) - ocv_target_link_libraries(${the_module} PRIVATE "${OPENGL_LIBRARIES}") - endif() - diff --git a/ports/opencv4/0014-fix-gstreamer.patch b/ports/opencv4/0014-fix-gstreamer.patch deleted file mode 100644 index d75c5ec2ec1bdd..00000000000000 --- a/ports/opencv4/0014-fix-gstreamer.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/modules/videoio/cmake/detect_gstreamer.cmake -+++ b/modules/videoio/cmake/detect_gstreamer.cmake -@@ -44,6 +44,10 @@ if(NOT HAVE_GSTREAMER AND WIN32) - NAMES gstvideo gstvideo-1.0 - PATHS ${env_paths} - PATH_SUFFIXES "lib") -+ find_library(GSTREAMER_audio_LIBRARY -+ NAMES gstvideo gstaudio-1.0 -+ PATHS ${env_paths} -+ PATH_SUFFIXES "lib") - - find_library(GSTREAMER_glib_LIBRARY - NAMES glib-2.0 -@@ -63,6 +67,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) - AND GSTREAMER_pbutils_LIBRARY - AND GSTREAMER_riff_LIBRARY - AND GSTREAMER_video_LIBRARY -+ AND GSTREAMER_audio_LIBRARY - AND GSTREAMER_glib_LIBRARY - AND GSTREAMER_gobject_LIBRARY) - file(STRINGS "${GSTREAMER_gst_INCLUDE_DIR}/gst/gstversion.h" ver_strings REGEX "#define +GST_VERSION_(MAJOR|MINOR|MICRO|NANO).*") -@@ -77,6 +82,7 @@ if(NOT HAVE_GSTREAMER AND WIN32) - ${GSTREAMER_app_LIBRARY} - ${GSTREAMER_riff_LIBRARY} - ${GSTREAMER_video_LIBRARY} -+ ${GSTREAMER_audio_LIBRARY} - ${GSTREAMER_pbutils_LIBRARY} - ${GSTREAMER_glib_LIBRARY} - ${GSTREAMER_gobject_LIBRARY}) diff --git a/ports/opencv4/0014-fix-ogre.patch b/ports/opencv4/0014-fix-ogre.patch new file mode 100644 index 00000000000000..8f2da1508aa447 --- /dev/null +++ b/ports/opencv4/0014-fix-ogre.patch @@ -0,0 +1,12 @@ +--- a/modules/ovis/src/ovis.cpp ++++ b/modules/ovis/src/ovis.cpp +@@ -453,7 +453,8 @@ class WindowSceneImpl : public WindowScene + if(tus->getTextureName() != name) + { + RTShader::ShaderGenerator::getSingleton().invalidateMaterial( +- RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME, *bgplane->getMaterial()); ++ RTShader::ShaderGenerator::DEFAULT_SCHEME_NAME, bgplane->getMaterial()->getName(), ++ RESOURCEGROUP_NAME); + + tus->setTextureName(name); + tus->setTextureAddressingMode(TAM_CLAMP); diff --git a/ports/opencv4/0015-fix-freetype.patch b/ports/opencv4/0015-fix-freetype.patch index 62c41f2f4f3bca..93bcfafcf58efe 100644 --- a/ports/opencv4/0015-fix-freetype.patch +++ b/ports/opencv4/0015-fix-freetype.patch @@ -1,5 +1,3 @@ -diff --git a/modules/gapi/cmake/init.cmake b/modules/gapi/cmake/init.cmake -index 1c46432..43fb8ad 100644 --- a/modules/gapi/cmake/init.cmake +++ b/modules/gapi/cmake/init.cmake @@ -20,10 +20,8 @@ if(NOT TARGET ade) diff --git a/ports/opencv4/0016-fix-freetype-contrib.patch b/ports/opencv4/0016-fix-freetype-contrib.patch index 4d0637fd1be548..930a1d65a35a04 100644 --- a/ports/opencv4/0016-fix-freetype-contrib.patch +++ b/ports/opencv4/0016-fix-freetype-contrib.patch @@ -1,5 +1,3 @@ -diff --git a/modules/freetype/CMakeLists.txt b/modules/freetype/CMakeLists.txt -index 6dd4aaf..e734e97 100644 --- a/modules/freetype/CMakeLists.txt +++ b/modules/freetype/CMakeLists.txt @@ -3,8 +5,10 @@ if(APPLE_FRAMEWORK) diff --git a/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch b/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch new file mode 100644 index 00000000000000..6e56fee24ceacd --- /dev/null +++ b/ports/opencv4/0017-mingw-strsafe-no-deprecate.patch @@ -0,0 +1,15 @@ +--- a/modules/videoio/src/cap_dshow.cpp ++++ b/modules/videoio/src/cap_dshow.cpp +@@ -90,8 +90,11 @@ Thanks to: + + #if defined(__clang__) // clang or MSVC clang + #pragma clang diagnostic ignored "-Wnon-virtual-dtor" +-#elif defined(__GNUC__) // MinGW ++#elif defined(__GNUC__) // gcc + #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" ++#endif ++ ++#ifdef __MINGW32__ + #define STRSAFE_NO_DEPRECATE + #endif + diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index be4e0ecb78b0b4..310f1aecd2cc45 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -1,11 +1,3 @@ -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv2") - message(FATAL_ERROR "OpenCV 2 is installed, please uninstall and try again:\n vcpkg remove opencv2") -endif() - -if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") - message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") -endif() - file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) string(JSON OPENCV_VERSION GET "${_contents}" version) @@ -15,24 +7,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 4d1783fd78425cc43bb2153446dd634cedd366a49592bccc0c538a40aa161fcf67db8f1b6b68f1ce0b4a93504b3f06f65931709277afb1a1ee9fe963094bca02 + SHA512 93d7807794682990b6a1d1de1851986ae3c5d1afe6605f3f8cace03ba5e3390bee2568bc0f335af34d3fc974df64cbce0ce685261ec2abd693d259b97b15bc46 FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch - 0004-fix-policy-CMP0057.patch - 0005-fix-eigen.patch + 0004-fix-eigen.patch + 0005-fix-policy-CMP0057.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch 0011-remove-python2.patch 0012-fix-zlib.patch - 0013-fix-opengl.patch - 0014-fix-gstreamer.patch 0015-fix-freetype.patch + 0017-mingw-strsafe-no-deprecate.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -80,7 +71,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "dc1394" WITH_1394 ) -# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt, "tbb" +# Cannot use vcpkg_check_features() for "dnn", "gtk", ipp", "openmp", "ovis", "python", "qt", "tbb" set(BUILD_opencv_dnn OFF) if("dnn" IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_ANDROID) @@ -179,10 +170,12 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 8469de524e8e6f4c50a74b8cbec5e4cfc48a63a6dfc787609696099eca40dc02b9dc7a347a014d4416fd4efd66955d3af5f4847f44612312a8362f453e6c2e35 + SHA512 2e9cc9632774babf59cd186cd7b7edbd35a816bdda2acb51339c514a33fc6d8c3f1687eb3b0f6827304e3fcb0f9f3e81d47e8ab08239175750ac1240cc99dc5d HEAD_REF master PATCHES 0007-fix-hdf5.patch + 0013-fix-ceres.patch + 0014-fix-ogre.patch 0016-fix-freetype-contrib.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -322,7 +315,7 @@ if(WITH_IPP) endif() set(WITH_MSMF ON) -if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MINGW) set(WITH_MSMF OFF) endif() @@ -369,17 +362,17 @@ vcpkg_cmake_configure( -DX86=${TARGET_IS_X86} -DARM=${TARGET_IS_ARM} ###### ocv_options + -DINSTALL_TO_MANGLED_PATHS=OFF -DOpenCV_INSTALL_BINARIES_PREFIX= -DOPENCV_BIN_INSTALL_PATH=bin -DOPENCV_INCLUDE_INSTALL_PATH=include -DOPENCV_LIB_INSTALL_PATH=lib - -DOPENCV_3P_LIB_INSTALL_PATH=lib - -DOPENCV_CONFIG_INSTALL_PATH=share/opencv - -DINSTALL_TO_MANGLED_PATHS=OFF + -DOPENCV_3P_LIB_INSTALL_PATH=lib/manual-link/opencv4_thirdparty + -DOPENCV_CONFIG_INSTALL_PATH=share/opencv4 -DOPENCV_FFMPEG_USE_FIND_PACKAGE=FFMPEG -DOPENCV_FFMPEG_SKIP_BUILD_CHECK=TRUE -DCMAKE_DEBUG_POSTFIX=d - -DOPENCV_DLLVERSION= + -DOPENCV_DLLVERSION=4 -DOPENCV_DEBUG_POSTFIX=d -DOPENCV_GENERATE_SETUPVARS=OFF -DOPENCV_GENERATE_PKGCONFIG=ON @@ -436,9 +429,9 @@ vcpkg_cmake_configure( -DWITH_IPP=${WITH_IPP} -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} - -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENMP=${WITH_OPENMP} -DWITH_PROTOBUF=${BUILD_opencv_dnn} + -DWITH_PYTHON=${WITH_PYTHON} -DWITH_OPENCLAMDBLAS=OFF -DWITH_TBB=${WITH_TBB} -DWITH_OPENJPEG=OFF @@ -457,19 +450,19 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") +if (NOT VCPKG_BUILD_TYPE) # Update debug paths for libs in Android builds (e.g. sdk/native/staticlibs/armeabi-v7a) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake" + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules-debug.cmake" "\${_IMPORT_PREFIX}/sdk" "\${_IMPORT_PREFIX}/debug/sdk" ) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) if(${BUILD_opencv_dnn}) find_dependency(Protobuf CONFIG REQUIRED) @@ -561,7 +554,7 @@ find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)") "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") endif() - file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" "${OPENCV_MODULES}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -571,6 +564,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv4/licenses") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/opencv") if(VCPKG_TARGET_IS_ANDROID) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") @@ -579,4 +574,6 @@ endif() vcpkg_fixup_pkgconfig() +configure_file("${CURRENT_PORT_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv4/usage.in b/ports/opencv4/usage.in new file mode 100644 index 00000000000000..cb9c47dc753c19 --- /dev/null +++ b/ports/opencv4/usage.in @@ -0,0 +1,5 @@ +If you do not install the meta-port *opencv*, the package ${PORT} is compatible with CMake +if you set the OpenCV_DIR *before* the find_package call + + set(OpenCV_DIR "${CURRENT_INSTALLED_DIR}/share/${PORT}") + find_package(OpenCV REQUIRED) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 90a10987d54583..c40b7e4a57229a 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.5.5", - "port-version": 7, + "version": "4.6.0", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/rtabmap/0001-add-bigobj-for-msvc.patch b/ports/rtabmap/0001-add-bigobj-for-msvc.patch index ea6c73b844675e..cc5786b5fa320e 100644 --- a/ports/rtabmap/0001-add-bigobj-for-msvc.patch +++ b/ports/rtabmap/0001-add-bigobj-for-msvc.patch @@ -1,14 +1,3 @@ -From 37a2b1fe682bcea48cb944762853bec404c9e937 Mon Sep 17 00:00:00 2001 -From: Amin Yahyaabadi -Date: Sun, 6 Feb 2022 12:29:02 -0800 -Subject: [PATCH] add bigobj for msvc - ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cdae617..ed829a46 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ if(MSVC) @@ -19,6 +8,3 @@ index 5cdae617..ed829a46 100644 endif() # [Eclipse] Automatic Discovery of Include directories (Optional, but handy) --- -2.35.1.windows.2 - diff --git a/ports/rtabmap/0002-fix-opencv46.patch b/ports/rtabmap/0002-fix-opencv46.patch new file mode 100644 index 00000000000000..37e13dca1755e8 --- /dev/null +++ b/ports/rtabmap/0002-fix-opencv46.patch @@ -0,0 +1,11 @@ +--- a/corelib/src/MarkerDetector.cpp ++++ b/corelib/src/MarkerDetector.cpp +@@ -304,7 +304,7 @@ std::map MarkerDetector::detect(const cv::Mat & image, + std::map::iterator iter = detections.find(ids[i]); + if(iter!=detections.end()) + { +- cv::aruco::drawAxis(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f); ++ cv::drawFrameAxes(*imageWithDetections, model.K(), model.D(), rvecs[i], tvecs[i], iter->second.length() * 0.5f); + } + } + } diff --git a/ports/rtabmap/fix-qt.patch b/ports/rtabmap/0003-fix-qt.patch similarity index 65% rename from ports/rtabmap/fix-qt.patch rename to ports/rtabmap/0003-fix-qt.patch index e7baa15dfb3bd8..facc1ffe8f4dd6 100644 --- a/ports/rtabmap/fix-qt.patch +++ b/ports/rtabmap/0003-fix-qt.patch @@ -1,13 +1,3 @@ -From a9f8c032bb7915c075f0fb32a0bbfa633ca3b388 Mon Sep 17 00:00:00 2001 -Date: Wed, 7 Jul 2021 15:13:43 -0400 -Subject: [PATCH] Fix Qt - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cdae617..fe98199b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -966,13 +966,13 @@ IF(ANDROID) @@ -26,6 +16,3 @@ index 5cdae617..fe98199b 100644 ENDIF() IF(BUILD_TOOLS) --- -2.32.0.windows.1 - diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 1cd6d123fa82b0..24ec6fb336f48f 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -7,8 +7,9 @@ vcpkg_from_github( SHA512 7787d5f927f53554cec3044221011cbc78b654c504d96af29947266e25058194923c5463aefde73b93dcfb3930eedf731f6af4d0c311d8f2f0d7be2114393e05 HEAD_REF master PATCHES - fix-qt.patch 0001-add-bigobj-for-msvc.patch + 0002-fix-opencv46.patch + 0003-fix-qt.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -90,7 +91,7 @@ if("tools" IN_LIST FEATURES) ) endif() -file(REMOVE_RECURSE +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" ) diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index f92769710b237c..ee333956489a9a 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,12 +1,16 @@ { "name": "rtabmap", "version": "0.20.13", - "port-version": 3, + "port-version": 4, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", + "license": "BSD-3-Clause", "supports": "windows & !static", "dependencies": [ - "opencv", + { + "name": "opencv", + "default-features": false + }, { "name": "pcl", "default-features": false, @@ -24,7 +28,22 @@ }, "zlib" ], + "default-features": [ + "opencv-contrib" + ], "features": { + "opencv-contrib": { + "description": "Use OpenCV with contrib modules", + "dependencies": [ + { + "name": "opencv", + "default-features": false, + "features": [ + "contrib" + ] + } + ] + }, "tools": { "description": "Build tools", "dependencies": [ diff --git a/ports/vcpkg-get-python-packages/vcpkg.json b/ports/vcpkg-get-python-packages/vcpkg.json index 227e4557b1c04d..f2e187d0d3a669 100644 --- a/ports/vcpkg-get-python-packages/vcpkg.json +++ b/ports/vcpkg-get-python-packages/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vcpkg-get-python-packages", - "version-date": "2022-04-11", - "port-version": 1, + "version-date": "2022-06-30", "documentation": "https://vcpkg.io/en/docs/README.html", "license": "MIT", "supports": "native" diff --git a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake index 189017cd2bb549..8b0a016462d3f5 100644 --- a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake +++ b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake @@ -31,21 +31,32 @@ function(x_vcpkg_get_python_packages) get_filename_component(python_dir "${arg_PYTHON_EXECUTABLE}" DIRECTORY) set(ENV{PYTHONNOUSERSITE} "1") - if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. + if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. #if(NOT EXISTS "${python_dir}/python310._pth" AND PYTHON_EXECUTABLE MATCHES "python3") # file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-get-python-packages/python310._pth" DESTINATION "${python_dir}") #endif() if(NOT EXISTS "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}") if(NOT EXISTS "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}") - vcpkg_from_github( - OUT_SOURCE_PATH PYFILE_PATH - REPO pypa/get-pip - REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07 - SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5 - ) - vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" - LOGNAME "get-pip-${TARGET_TRIPLET}") + if(arg_PYTHON_VERSION STREQUAL 3) + vcpkg_from_github( + OUT_SOURCE_PATH PYFILE_PATH + REPO pypa/get-pip + REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07 + SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5 + ) + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "get-pip-${TARGET_TRIPLET}") + elseif(arg_PYTHON_VERSION STREQUAL 2) + vcpkg_download_distfile(PYFILE + URLS "https://bootstrap.pypa.io/pip/2.7/get-pip.py" + FILENAME "get-pip.py" + SHA512 8c74bdaff57a2dcf2aa69c4c218b7d5f3bf4a470dbda2d7c8d1b53862c84e2a83cd04c3cd20cf80dc0e4076b113a734413e31d6a9853f41e894398e7f88f848e + ) + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE}" --no-warn-script-location + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + LOGNAME "get-pip-${TARGET_TRIPLET}") + endif() endif() vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install virtualenv --no-warn-script-location WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" @@ -58,23 +69,29 @@ function(x_vcpkg_get_python_packages) endif() set(venv_path "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv") file(REMOVE_RECURSE "${venv_path}") # Remove old venv - file(MAKE_DIRECTORY "${venv_path}") + file(MAKE_DIRECTORY "${venv_path}") if(CMAKE_HOST_WIN32) - file(MAKE_DIRECTORY "${python_dir}/DLLs") + file(MAKE_DIRECTORY "${python_dir}/DLLs") set(python_sub_path /Scripts) set(python_venv virtualenv) - file(COPY "${python_dir}/python310.zip" DESTINATION "${venv_path}/Scripts") + if(arg_PYTHON_VERSION STREQUAL 3) + file(COPY "${python_dir}/python310.zip" DESTINATION "${venv_path}/Scripts") + endif() set(python_venv_options "--app-data" "${venv_path}/data") else() set(python_sub_path /bin) - set(python_venv venv) + if(arg_PYTHON_VERSION STREQUAL 3) + set(python_venv venv) + elseif(arg_PYTHON_VERSION STREQUAL 2) + set(python_venv virtualenv) + endif() set(python_venv_options --symlinks) endif() set(ENV{PYTHONNOUSERSITE} "1") message(STATUS "Setting up python virtual environmnent...") - vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -m "${python_venv}" ${python_venv_options} "${venv_path}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -m "${python_venv}" ${python_venv_options} "${venv_path}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME "venv-setup-${TARGET_TRIPLET}") vcpkg_add_to_path(PREPEND "${venv_path}${python_sub_path}") set(${arg_OUT_PYTHON_VAR} "${venv_path}${python_sub_path}/python${VCPKG_HOST_EXECUTABLE_SUFFIX}") @@ -83,14 +100,14 @@ function(x_vcpkg_get_python_packages) unset(ENV{PYTHONPATH}) if(DEFINED arg_REQUIREMENTS_FILE) message(STATUS "Installing requirements from: ${arg_REQUIREMENTS_FILE}") - vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install -r ${arg_REQUIREMENTS_FILE} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install -r ${arg_REQUIREMENTS_FILE} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME "pip-install-requirements-file-${TARGET_TRIPLET}") endif() if(DEFINED arg_PACKAGES) message(STATUS "Installing python packages: ${arg_PACKAGES}") - vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install ${arg_PACKAGES} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install ${arg_PACKAGES} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME "pip-install-packages-${TARGET_TRIPLET}") endif() message(STATUS "Setting up python virtual environmnent...finished.") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3d8c57f65e5f02..22569ef9d7fd5b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -770,24 +770,24 @@ opencl:arm-uwp=fail opencl:x64-uwp=fail opencsg:arm-uwp=fail opencsg:x64-uwp=fail -opencv2:arm64-windows = skip -opencv2:arm-uwp = skip -opencv2:x64-linux = skip -opencv2:x64-osx = skip -opencv2:x64-uwp = skip -opencv2:x64-windows = skip -opencv2:x64-windows-static = skip -opencv2:x64-windows-static-md=skip -opencv2:x86-windows = skip -opencv3:arm64-windows = skip -opencv3:arm-uwp = skip -opencv3:x64-linux = skip -opencv3:x64-osx = skip -opencv3:x64-uwp = skip -opencv3:x64-windows = skip -opencv3:x64-windows-static = skip -opencv3:x64-windows-static-md=skip -opencv3:x86-windows = skip +opencv2:arm64-windows = skip +opencv2:arm-uwp = skip +opencv2:x64-linux = skip +opencv2:x64-osx = skip +opencv2:x64-uwp = skip +opencv2:x64-windows = skip +opencv2:x64-windows-static = skip +opencv2:x64-windows-static-md = skip +opencv2:x86-windows = skip +opencv3:arm64-windows = skip +opencv3:arm-uwp = skip +opencv3:x64-linux = skip +opencv3:x64-osx = skip +opencv3:x64-uwp = skip +opencv3:x64-windows = skip +opencv3:x64-windows-static = skip +opencv3:x64-windows-static-md = skip +opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail openexr:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index a1383c8d193083..a7e96701305020 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1310,7 +1310,7 @@ }, "cctag": { "baseline": "1.0.2", - "port-version": 0 + "port-version": 1 }, "cctz": { "baseline": "2.3", @@ -1854,7 +1854,7 @@ }, "dbow3": { "baseline": "1.0.0", - "port-version": 1 + "port-version": 2 }, "dcmtk": { "baseline": "3.6.7", @@ -5189,20 +5189,20 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.5", - "port-version": 1 + "baseline": "4.6.0", + "port-version": 0 }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 13 + "port-version": 14 }, "opencv3": { - "baseline": "3.4.16", - "port-version": 9 + "baseline": "3.4.18", + "port-version": 0 }, "opencv4": { - "baseline": "4.5.5", - "port-version": 7 + "baseline": "4.6.0", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.1", @@ -6374,7 +6374,7 @@ }, "rtabmap": { "baseline": "0.20.13", - "port-version": 3 + "port-version": 4 }, "rtaudio": { "baseline": "2021-11-16", @@ -7449,8 +7449,8 @@ "port-version": 1 }, "vcpkg-get-python-packages": { - "baseline": "2022-04-11", - "port-version": 1 + "baseline": "2022-06-30", + "port-version": 0 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json index 59c461ac0e55dd..25d459e2b6e71d 100644 --- a/versions/c-/cctag.json +++ b/versions/c-/cctag.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "979f28c0cc646b1a4c057ee810772a6b8964b65a", + "version-semver": "1.0.2", + "port-version": 1 + }, { "git-tree": "41cef2a0749658a793585a55c57cb701e0845427", "version-semver": "1.0.2", diff --git a/versions/d-/dbow3.json b/versions/d-/dbow3.json index 12758d201c156c..9747e1f563cd91 100644 --- a/versions/d-/dbow3.json +++ b/versions/d-/dbow3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0942151a7555bcac51e84d94474111ca96ff5974", + "version": "1.0.0", + "port-version": 2 + }, { "git-tree": "d0cbeaf64e4827fa69b0c07f21c6d0d689305559", "version-string": "1.0.0", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 80915b47c1eeec..09160460274813 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "135db832c720c800e2ac222994aa216df7575d17", + "version": "4.6.0", + "port-version": 0 + }, { "git-tree": "1ed18903421ae513e731348b2e5afb13c8c38d24", "version": "4.5.5", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 87764af3d72cf4..b052f97f415952 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5161f9b494cb04f39503980cdca10bdac6e7ee53", + "version": "2.4.13.7", + "port-version": 14 + }, { "git-tree": "5dad4c606f120b7d208ec193036596bd82074e81", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 803ad151081ee7..b40aebe00ad326 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15c9083efa4c00674bef4fbca443a662fe6dd5cd", + "version": "3.4.18", + "port-version": 0 + }, { "git-tree": "8d02d89d9531e2243b81f37f97a9be943fd6b0a0", "version": "3.4.16", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 3c14a9620c9bba..ee86692054df6a 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ff543272c91a32d242ad5320e9ca63b29b34ed2", + "version": "4.6.0", + "port-version": 0 + }, { "git-tree": "8e165720af85f0da853cf0a4ac9eb5cb20804d13", "version": "4.5.5", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index 1ef4831fd0524b..aeaf4087c7cb55 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b51506f789882022d1af0556521079694ce5cf62", + "version": "0.20.13", + "port-version": 4 + }, { "git-tree": "cf41f524585ec0c2dd5b8c7d8b455a79265b62ea", "version": "0.20.13", diff --git a/versions/v-/vcpkg-get-python-packages.json b/versions/v-/vcpkg-get-python-packages.json index 31285bc57df9b9..e9eced18e60cb1 100644 --- a/versions/v-/vcpkg-get-python-packages.json +++ b/versions/v-/vcpkg-get-python-packages.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e65762bfef05a4d380bb171409c48a694fb35435", + "version-date": "2022-06-30", + "port-version": 0 + }, { "git-tree": "ffe13ab59e3e2f4f003498035bc1fbc06b64e164", "version-date": "2022-04-11", From eb40ddf467177ae873b0f57be96318fc95f399b9 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 5 Aug 2022 03:54:38 +0300 Subject: [PATCH 306/791] [opencc] Update to 1.1.4, fix x64-linux-dynamic build (#25821) * [opencc] Update to 1.1.4, fix x64-linux-dynamic build * Use vcpkg_copy_tools * v db Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/opencc/portfile.cmake | 50 +++++++++++++++++-------------------- ports/opencc/vcpkg.json | 16 +++++++++--- versions/baseline.json | 4 +-- versions/o-/opencc.json | 5 ++++ 4 files changed, 43 insertions(+), 32 deletions(-) diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index f9d4a97fe740b3..49f53782bf4c94 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -1,51 +1,47 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BYVoid/OpenCC - REF e8ec6d59f264a4a42e310148a9534a8cc0123928 - SHA512 e6b3f6d681223b299795c324a48e82609abd1f411d3cbd5f9d8607284ec04717fa9878953d037c25a931a0857f50a5c0e883e0d44ddbea18c50830ad49514c59 + REF ver.1.1.4 + SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46 HEAD_REF master ) vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) -vcpkg_add_to_path(${PYTHON3_DIR}) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_DOCUMENTATION=OFF -DENABLE_GTEST=OFF ) -vcpkg_install_cmake( +vcpkg_cmake_install( DISABLE_PARALLEL ) vcpkg_copy_pdbs() -if(tools IN_LIST FEATURES) - foreach(opencc_tool opencc opencc_dict opencc_phrase_extract) - file(COPY - ${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} - ) - endforeach() +vcpkg_fixup_pkgconfig() - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +set(tool_names "opencc" "opencc_dict" "opencc_phrase_extract") +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - foreach(opencc_tool opencc opencc_dict opencc_phrase_extract) - file(REMOVE - ${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX} - ) - endforeach() +foreach(opencc_tool IN LISTS tool_names) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + "${CURRENT_PACKAGES_DIR}/debug/bin/${opencc_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + ) +endforeach() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index ef89e10e72b318..2daaa6e6e9f134 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,10 +1,20 @@ { "name": "opencc", - "version-date": "2020-04-26", - "port-version": 10, - "description": "A project for conversion between Traditional and Simplified Chinese", + "version": "1.1.4", + "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "homepage": "https://github.com/BYVoid/OpenCC", + "license": "Apache-2.0", "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build OpenCC command-line tools" diff --git a/versions/baseline.json b/versions/baseline.json index a7e96701305020..71e10bf8c2d825 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5161,8 +5161,8 @@ "port-version": 1 }, "opencc": { - "baseline": "2020-04-26", - "port-version": 10 + "baseline": "1.1.4", + "port-version": 0 }, "opencensus-cpp": { "baseline": "2021-08-26", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index 525db85fd9c9b6..37d01d051cfb0f 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c886059bbc8c7c14a7d7290b22e2036c3ff8fe6", + "version": "1.1.4", + "port-version": 0 + }, { "git-tree": "10bc4f21926d1c116227ba57e954c4f8a6c9e999", "version-date": "2020-04-26", From 578a0c61a4bd63a5de29fd3e1cc03dc37e440fa6 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Fri, 5 Aug 2022 09:14:24 +0800 Subject: [PATCH 307/791] [libvpx] update version to 1.12.0 (#26159) * [libvpx] update version to 1.12.0 * update version * update patch * overwrite version --- .../0003-add-uwp-v142-and-v143-support.patch | 71 ++++--------------- ports/libvpx/portfile.cmake | 4 +- ports/libvpx/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libvpx.json | 5 ++ 5 files changed, 25 insertions(+), 62 deletions(-) diff --git a/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch b/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch index fd82486c10dbf4..ce323c498fc64f 100644 --- a/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch +++ b/ports/libvpx/0003-add-uwp-v142-and-v143-support.patch @@ -1,8 +1,8 @@ diff --git a/build/make/configure.sh b/build/make/configure.sh -index 325017e..5ab54e4 100644 +index 119d206..41bac75 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh -@@ -1016,7 +1016,7 @@ EOF +@@ -1038,7 +1038,7 @@ EOF # A number of ARM-based Windows platforms are constrained by their # respective SDKs' limitations. Fortunately, these are all 32-bit ABIs # and so can be selected as 'win32'. @@ -11,7 +11,7 @@ index 325017e..5ab54e4 100644 asm_conversion_cmd="${source_path_mk}/build/make/ads2armasm_ms.pl" AS_SFX=.S msvs_arch_dir=arm-msvs -@@ -1250,6 +1250,9 @@ EOF +@@ -1272,6 +1272,9 @@ EOF android) soft_enable realtime_only ;; @@ -21,7 +21,7 @@ index 325017e..5ab54e4 100644 win*) enabled gcc && add_cflags -fno-common ;; -@@ -1368,6 +1371,16 @@ EOF +@@ -1390,6 +1393,16 @@ EOF fi AS_SFX=.asm case ${tgt_os} in @@ -38,7 +38,7 @@ index 325017e..5ab54e4 100644 win32) add_asflags -f win32 enabled debug && [ "${AS}" = yasm ] && add_asflags -g cv8 -@@ -1488,6 +1501,8 @@ EOF +@@ -1519,6 +1532,8 @@ EOF # Almost every platform uses pthreads. if enabled multithread; then case ${toolchain} in @@ -47,31 +47,10 @@ index 325017e..5ab54e4 100644 *-win*-vs*) ;; *-android-gcc) -diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh -index d1adfd7..a03ea59 100644 ---- a/build/make/gen_msvs_sln.sh -+++ b/build/make/gen_msvs_sln.sh -@@ -219,6 +219,7 @@ for opt in "$@"; do - 14) vs_year=2015 ;; - 15) vs_year=2017 ;; - 16) vs_year=2019 ;; -+ 17) vs_year=2022 ;; - *) die Unrecognized Visual Studio Version in $opt ;; - esac - ;; diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh -index 6f91ad4..b4cad6c 100644 +index 58bb66b..b4cad6c 100644 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh -@@ -170,7 +170,7 @@ for opt in "$@"; do - --ver=*) - vs_ver="$optval" - case "$optval" in -- 1[4-6]) -+ 1[4-7]) - ;; - *) die Unrecognized Visual Studio Version in $opt - ;; @@ -296,7 +296,22 @@ generate_vcxproj() { tag_content ProjectGuid "{${guid}}" tag_content RootNamespace ${name} @@ -96,17 +75,7 @@ index 6f91ad4..b4cad6c 100644 tag_content AppContainerApplication true # The application type can be one of "Windows Store", # "Windows Phone" or "Windows Phone Silverlight". The -@@ -344,6 +359,9 @@ generate_vcxproj() { - if [ "$vs_ver" = "16" ]; then - tag_content PlatformToolset v142 - fi -+ if [ "$vs_ver" = "17" ]; then -+ tag_content PlatformToolset v143 -+ fi - tag_content CharacterSet Unicode - if [ "$config" = "Release" ]; then - tag_content WholeProgramOptimization true -@@ -391,7 +409,7 @@ generate_vcxproj() { +@@ -394,7 +409,7 @@ generate_vcxproj() { Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'" if [ "$name" == "vpx" ]; then hostplat=$plat @@ -116,12 +85,12 @@ index 6f91ad4..b4cad6c 100644 fi fi diff --git a/configure b/configure -index da631a4..2804678 100644 +index beea650..91ae3c8 100644 --- a/configure +++ b/configure -@@ -101,16 +101,24 @@ all_platforms="${all_platforms} arm64-android-gcc" - all_platforms="${all_platforms} arm64-darwin-gcc" +@@ -102,16 +102,24 @@ all_platforms="${all_platforms} arm64-darwin-gcc" all_platforms="${all_platforms} arm64-darwin20-gcc" + all_platforms="${all_platforms} arm64-darwin21-gcc" all_platforms="${all_platforms} arm64-linux-gcc" +all_platforms="${all_platforms} arm64-uwp-vs16" +all_platforms="${all_platforms} arm64-uwp-vs17" @@ -143,8 +112,8 @@ index da631a4..2804678 100644 +all_platforms="${all_platforms} armv7-win32-vs17" all_platforms="${all_platforms} armv7s-darwin-gcc" all_platforms="${all_platforms} armv8-linux-gcc" - all_platforms="${all_platforms} mips32-linux-gcc" -@@ -135,10 +143,13 @@ all_platforms="${all_platforms} x86-linux-gcc" + all_platforms="${all_platforms} loongarch32-linux-gcc" +@@ -138,6 +146,8 @@ all_platforms="${all_platforms} x86-linux-gcc" all_platforms="${all_platforms} x86-linux-icc" all_platforms="${all_platforms} x86-os2-gcc" all_platforms="${all_platforms} x86-solaris-gcc" @@ -153,12 +122,7 @@ index da631a4..2804678 100644 all_platforms="${all_platforms} x86-win32-gcc" all_platforms="${all_platforms} x86-win32-vs14" all_platforms="${all_platforms} x86-win32-vs15" - all_platforms="${all_platforms} x86-win32-vs16" -+all_platforms="${all_platforms} x86-win32-vs17" - all_platforms="${all_platforms} x86_64-android-gcc" - all_platforms="${all_platforms} x86_64-darwin9-gcc" - all_platforms="${all_platforms} x86_64-darwin10-gcc" -@@ -156,10 +167,13 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" +@@ -161,6 +171,8 @@ all_platforms="${all_platforms} x86_64-iphonesimulator-gcc" all_platforms="${all_platforms} x86_64-linux-gcc" all_platforms="${all_platforms} x86_64-linux-icc" all_platforms="${all_platforms} x86_64-solaris-gcc" @@ -167,12 +131,7 @@ index da631a4..2804678 100644 all_platforms="${all_platforms} x86_64-win64-gcc" all_platforms="${all_platforms} x86_64-win64-vs14" all_platforms="${all_platforms} x86_64-win64-vs15" - all_platforms="${all_platforms} x86_64-win64-vs16" -+all_platforms="${all_platforms} x86_64-win64-vs17" - all_platforms="${all_platforms} generic-gnu" - - # all_targets is a list of all targets that can be configured -@@ -476,11 +490,10 @@ process_targets() { +@@ -485,11 +497,10 @@ process_targets() { ! enabled multithread && DIST_DIR="${DIST_DIR}-nomt" ! enabled install_docs && DIST_DIR="${DIST_DIR}-nodocs" DIST_DIR="${DIST_DIR}-${tgt_isa}-${tgt_os}" @@ -188,7 +147,7 @@ index da631a4..2804678 100644 if [ -f "${source_path}/build/make/version.sh" ]; then ver=`"$source_path/build/make/version.sh" --bare "$source_path"` DIST_DIR="${DIST_DIR}-${ver}" -@@ -569,6 +582,10 @@ process_detect() { +@@ -578,6 +589,10 @@ process_detect() { # Specialize windows and POSIX environments. case $toolchain in diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 8126ad72232a43..478fadbf8ac66d 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(LIBVPX_VERSION 1.11.0) +set(LIBVPX_VERSION 1.12.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libvpx REF v${LIBVPX_VERSION} - SHA512 7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5 + SHA512 dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0 HEAD_REF master PATCHES 0002-Fix-nasm-debug-format-flag.patch diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index 05d404362c05cf..06c3d7d762e328 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libvpx", - "version": "1.11.0", - "port-version": 1, + "version": "1.12.0", "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 71e10bf8c2d825..a0e8080ef2fa7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4241,8 +4241,8 @@ "port-version": 2 }, "libvpx": { - "baseline": "1.11.0", - "port-version": 1 + "baseline": "1.12.0", + "port-version": 0 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 7758ffc7ab7577..87e023c643b303 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bad78764d9138da1f5f2b1c49ec291377166a30", + "version": "1.12.0", + "port-version": 0 + }, { "git-tree": "5d03c5487a2e01ccc310c1d3e5b0b2c78232cf2b", "version": "1.11.0", From 714722bb08053c9e87d4add1f25728f38b9b183c Mon Sep 17 00:00:00 2001 From: friendlyanon <1736896+friendlyanon@users.noreply.github.com> Date: Fri, 5 Aug 2022 03:47:36 +0200 Subject: [PATCH 308/791] [stb] Add stb_perlin.h (#25812) Co-authored-by: friendlyanon --- ports/stb/portfile.cmake | 11 ++++++++++- ports/stb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/stb.json | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/stb/portfile.cmake b/ports/stb/portfile.cmake index 5f42687d3fecd9..0ba5ba0debb895 100644 --- a/ports/stb/portfile.cmake +++ b/ports/stb/portfile.cmake @@ -6,8 +6,17 @@ vcpkg_from_github( HEAD_REF master ) +# originally deleted due to patent US6867776, but it has expired and it has yet to be restored +# see https://github.com/nothings/stb/commit/59e7dec3e8bb0a8d4050d03c2dc32cf71ffa87c6 +vcpkg_download_distfile( + STB_PERLIN_H + URLS "https://raw.githubusercontent.com/nothings/stb/2bb4a0accd4003c1db4c24533981e01b1adfd656/stb_perlin.h" + FILENAME stb_perlin.h + SHA512 9dbc77a530ea368a47988393c7228ffaa8622ce5ffd83770306eaa6282bf289f7f6e55f4a4a5c746798e8c8a49e180344fd8837983ec734664abf9077e37d39f +) + file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") -file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY ${HEADER_FILES} "${STB_PERLIN_H}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindStb.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/stb/vcpkg.json b/ports/stb/vcpkg.json index 599b59f6ee205e..957afbd3c1f9e0 100644 --- a/ports/stb/vcpkg.json +++ b/ports/stb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "stb", "version-date": "2021-09-10", + "port-version": 1, "description": "public domain header-only libraries", "homepage": "https://github.com/nothings/stb", "license": "MIT OR CC-PDDC" diff --git a/versions/baseline.json b/versions/baseline.json index a0e8080ef2fa7e..0e7b4107507e21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6898,7 +6898,7 @@ }, "stb": { "baseline": "2021-09-10", - "port-version": 0 + "port-version": 1 }, "stduuid": { "baseline": "1.2.2", diff --git a/versions/s-/stb.json b/versions/s-/stb.json index 1068c6d4ab1450..390edd8c280ef0 100644 --- a/versions/s-/stb.json +++ b/versions/s-/stb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ebadca0be90431f35a8d20b44f40b07285eb33d", + "version-date": "2021-09-10", + "port-version": 1 + }, { "git-tree": "2da639ecba7048e0f722dc01fae6cef32d671991", "version-date": "2021-09-10", From df806d3a4b8599b5429e1256a30cb0bcaf6b9178 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 5 Aug 2022 04:18:37 +0200 Subject: [PATCH 309/791] [sdl2-ttf,tgui,sfml] Update sdl2-ttf to 2.20.0, revise dependencies import and export (#26026) * [sdl2-ttf] update to 2.20.0 * update version * add license * update version * del unused function * overwrite version * Fix sdl2-tff * Increase version * version * Fix config export/import * version * Fix sdl2pp * Fix SDL2_ttf import * Fix sdl2pp * Try again * ... * shared * Fix patch * not win32 * revert * Fix import name * Fix tgui * version * CR * version * CR * version * license * version * update port version * version * Fix patch * version * Fix patch * version * Update patch * version * Fix tgui * add feature harfbuzz * version * Fix feature * version * Fix mingw * Trim patching * Explicit usage * [sfml] Fix OpenGL dependency * [sfml] Transform freetype patch and config fixup * [sfml] Transform stb patch * [tgui] Revise port * [tgui] Extend config patching, merge into dependencies patch * [tgui] Devendor stb * [tgui] Revise feature dependencies * [tgui] Omit pc files (too many inconsistencies) * [milerius-sfml-imgui] Fixup * Update versions Co-authored-by: FrankXie Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- .../FixFindPackageIssue.patch | 5 +- ports/milerius-sfml-imgui/vcpkg.json | 3 +- ports/sdl2-ttf/CMakeLists.txt | 52 ---------- ports/sdl2-ttf/fix-pkgconfig.patch | 22 +++++ ports/sdl2-ttf/portfile.cmake | 51 +++++----- ports/sdl2-ttf/usage | 4 + ports/sdl2-ttf/vcpkg.json | 24 ++++- ports/sdl2pp/fix-dependencies.patch | 5 +- ports/sdl2pp/vcpkg.json | 2 +- ports/sfml/fix-dependencies.patch | 75 +++++++++++++++ ports/sfml/portfile.cmake | 14 +-- ports/sfml/stb_include.patch | 12 --- ports/sfml/use-system-freetype.patch | 11 --- ports/sfml/vcpkg.json | 3 +- ports/tgui/devendor-stb.patch | 27 ++++++ ports/tgui/fix-dependencies.patch | 95 ++++++++++++++++--- ports/tgui/fix-usage.patch | 23 ----- ports/tgui/portfile.cmake | 58 +++++++---- ports/tgui/usage | 4 + ports/tgui/vcpkg.json | 37 ++------ versions/baseline.json | 12 +-- versions/m-/milerius-sfml-imgui.json | 5 + versions/s-/sdl2-ttf.json | 5 + versions/s-/sdl2pp.json | 5 + versions/s-/sfml.json | 5 + versions/t-/tgui.json | 5 + 26 files changed, 355 insertions(+), 209 deletions(-) delete mode 100644 ports/sdl2-ttf/CMakeLists.txt create mode 100644 ports/sdl2-ttf/fix-pkgconfig.patch create mode 100644 ports/sdl2-ttf/usage create mode 100644 ports/sfml/fix-dependencies.patch delete mode 100644 ports/sfml/stb_include.patch delete mode 100644 ports/sfml/use-system-freetype.patch create mode 100644 ports/tgui/devendor-stb.patch delete mode 100644 ports/tgui/fix-usage.patch create mode 100644 ports/tgui/usage diff --git a/ports/milerius-sfml-imgui/FixFindPackageIssue.patch b/ports/milerius-sfml-imgui/FixFindPackageIssue.patch index a3d8053ddd65a0..062e55cde3de93 100644 --- a/ports/milerius-sfml-imgui/FixFindPackageIssue.patch +++ b/ports/milerius-sfml-imgui/FixFindPackageIssue.patch @@ -2,15 +2,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 27b8bd8..33fe623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) +@@ -2,8 +2,8 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) message(FATAL_ERROR "Prevented in-tree built. Please create a build directory outside of the source code and call cmake from there") endif () -project(sfml-imgui) -+project(milerius-sfml-imgui) cmake_minimum_required(VERSION 3.9) ++project(milerius-sfml-imgui) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + ##! Package @@ -26,7 +26,7 @@ include(CMakePackageConfigHelpers) install(TARGETS diff --git a/ports/milerius-sfml-imgui/vcpkg.json b/ports/milerius-sfml-imgui/vcpkg.json index 62abc101bb08e4..9d60559918a88d 100644 --- a/ports/milerius-sfml-imgui/vcpkg.json +++ b/ports/milerius-sfml-imgui/vcpkg.json @@ -1,8 +1,9 @@ { "name": "milerius-sfml-imgui", "version": "1.1", - "port-version": 4, + "port-version": 5, "description": "imgui dll for sfml usage", + "license": "MIT", "dependencies": [ "imgui", "sfml", diff --git a/ports/sdl2-ttf/CMakeLists.txt b/ports/sdl2-ttf/CMakeLists.txt deleted file mode 100644 index 71f8759024810d..00000000000000 --- a/ports/sdl2-ttf/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(SDL2_TTF C) - -find_path(SDL_INCLUDE_DIR SDL2/SDL.h) -find_package(SDL2 CONFIG REQUIRED) -find_package(Freetype REQUIRED) - -add_library(SDL2_ttf SDL_ttf.c version.rc) - -set_target_properties(SDL2_ttf PROPERTIES DEFINE_SYMBOL DLL_EXPORT) -target_include_directories(SDL2_ttf PRIVATE ${SDL_INCLUDE_DIR}/SDL2 ${FREETYPE_INCLUDE_DIRS}) -target_link_libraries(SDL2_ttf SDL2::SDL2 ${FREETYPE_LIBRARIES}) - -install(TARGETS SDL2_ttf - EXPORT SDL2_ttf - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -INSTALL(EXPORT SDL2_ttf - DESTINATION "share/sdl2-ttf" - FILE sdl2-ttf-config.cmake - NAMESPACE SDL2:: -) - -set(prefix "") -set(exec_prefix [[${prefix}]]) -set(libdir [[${prefix}/lib]]) -set(includedir [[${prefix}/include]]) -set(PACKAGE "SDL2_ttf") -file(READ "SDL_ttf.h" header_contents) -# #define SDL_TTF_MAJOR_VERSION 2 -# #define SDL_TTF_MINOR_VERSION 0 -# #define SDL_TTF_PATCHLEVEL 5 -string(REGEX MATCH "define *SDL_TTF_MAJOR_VERSION *([0-9]+)" _ "${header_contents}") -set(VERSION ${CMAKE_MATCH_1}) -string(REGEX MATCH "define *SDL_TTF_MINOR_VERSION *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -string(REGEX MATCH "define *SDL_TTF_PATCHLEVEL *([0-9]+)" _ "${header_contents}") -string(APPEND VERSION ".${CMAKE_MATCH_1}") -set(SDL_VERSION 0.0) -configure_file(SDL2_ttf.pc.in "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" @ONLY) -file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc" "Requires.private: freetype2") -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc DESTINATION lib/pkgconfig) - -if(NOT DEFINED SDL_TTF_SKIP_HEADERS) - install(FILES SDL_ttf.h DESTINATION include/SDL2) -endif() - -message(STATUS "Link-time dependencies:") -message(STATUS " " SDL2::SDL2) -message(STATUS " " ${FREETYPE_LIBRARIES}) diff --git a/ports/sdl2-ttf/fix-pkgconfig.patch b/ports/sdl2-ttf/fix-pkgconfig.patch new file mode 100644 index 00000000000000..a6c32a18ac7fe0 --- /dev/null +++ b/ports/sdl2-ttf/fix-pkgconfig.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a097d5c..ca2881f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -325,7 +333,7 @@ if(SDL2TTF_INSTALL) + COMPONENT devel + ) + +- if(SDL2TTF_BUILD_SHARED_LIBS) ++ if(1) + # Only create a .pc file for a shared SDL2_ttf + set(prefix "${CMAKE_INSTALL_PREFIX}") + set(exec_prefix "\${prefix}") +@@ -352,7 +360,7 @@ if(SDL2TTF_INSTALL) + \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\" ONLY_IF_DIFFERENT) + file(INSTALL DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${PC_DESTDIR}\" + TYPE FILE +- FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\")" CONFIG Release) ++ FILES \"${CMAKE_CURRENT_BINARY_DIR}/SDL2_ttf.pc\")") + endif() + + if(SDL2TTF_BUILD_SHARED_LIBS AND (APPLE OR (UNIX AND NOT ANDROID))) diff --git a/ports/sdl2-ttf/portfile.cmake b/ports/sdl2-ttf/portfile.cmake index 781c4776650032..e6c2eba9ad7c07 100644 --- a/ports/sdl2-ttf/portfile.cmake +++ b/ports/sdl2-ttf/portfile.cmake @@ -1,31 +1,38 @@ -set(VERSION 2.0.15) - -vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${VERSION}.tar.gz" - FILENAME "SDL2_ttf-${VERSION}.tar.gz" - SHA512 30d685932c3dd6f2c94e2778357a5c502f0421374293d7102a64d92f9c7861229bf36bedf51c1a698b296a58c858ca442d97afb908b7df1592fc8d4f8ae8ddfd +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libsdl-org/SDL_ttf + REF f5e4828ffc9d3a84f00011fede4446aecb4a685f #v2.20.0 + SHA512 c0d2d6107e5427d9c1353e14cb4b0c3957d28391cfc772f1f972fe3aa8ba9e9dfdfcb64acd317a7836d46b3a50da9597b19a832f0baf5198654acb7b31ab1e6b + HEAD_REF main + PATCHES + fix-pkgconfig.patch ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + harfbuzz SDL2TTF_HARFBUZZ ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSDL2TTF_VENDORED=OFF + -DSDL2TTF_SAMPLES=OFF + ${FEATURE_OPTIONS} +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DSDL_TTF_SKIP_HEADERS=ON) +vcpkg_cmake_install() +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_ttf CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(PACKAGE_NAME SDL2_ttf CONFIG_PATH lib/cmake/SDL2_ttf) +endif() -vcpkg_install_cmake() -vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licenses") -file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-ttf/copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl2-ttf/usage b/ports/sdl2-ttf/usage new file mode 100644 index 00000000000000..200fbb9727fcb3 --- /dev/null +++ b/ports/sdl2-ttf/usage @@ -0,0 +1,4 @@ +sdl2-ttf provides CMake targets: + + find_package(SDL2_ttf CONFIG REQUIRED) + target_link_libraries(main PRIVATE $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>) diff --git a/ports/sdl2-ttf/vcpkg.json b/ports/sdl2-ttf/vcpkg.json index 58978546c8c021..db684d5b05a296 100644 --- a/ports/sdl2-ttf/vcpkg.json +++ b/ports/sdl2-ttf/vcpkg.json @@ -1,11 +1,27 @@ { "name": "sdl2-ttf", - "version-string": "2.0.15", - "port-version": 5, + "version": "2.20.0", "description": "A library for rendering TrueType fonts with SDL", "homepage": "https://www.libsdl.org/projects/SDL_ttf/", + "license": "Zlib", "dependencies": [ "freetype", - "sdl2" - ] + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "harfbuzz": { + "description": "Enable HarfBuzz support", + "dependencies": [ + "harfbuzz" + ] + } + } } diff --git a/ports/sdl2pp/fix-dependencies.patch b/ports/sdl2pp/fix-dependencies.patch index 273ed5288e6573..14300c0ded2307 100644 --- a/ports/sdl2pp/fix-dependencies.patch +++ b/ports/sdl2pp/fix-dependencies.patch @@ -46,11 +46,10 @@ index cdfd2a6..dc08748 100644 ENDIF(SDL2PP_WITH_IMAGE) IF(SDL2PP_WITH_TTF) -- FIND_PACKAGE(SDL2_ttf REQUIRED) + FIND_PACKAGE(SDL2_ttf REQUIRED) - SET(SDL2_ALL_INCLUDE_DIRS ${SDL2_ALL_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIR}) - SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} ${SDL2_TTF_LIBRARY}) -+ FIND_PACKAGE(sdl2-ttf CONFIG REQUIRED) -+ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} SDL2::SDL2_ttf) ++ SET(SDL2_ALL_LIBRARIES ${SDL2_ALL_LIBRARIES} $,SDL2_ttf::SDL2_ttf,SDL2_ttf::SDL2_ttf-static>) SET(SDL2_ALL_PKGCONFIG_MODULES "${SDL2_ALL_PKGCONFIG_MODULES} SDL2_ttf") ELSE(SDL2PP_WITH_TTF) MESSAGE(STATUS "SDL2_ttf support disabled") diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json index ec726511266862..3ed283ae02ba46 100644 --- a/ports/sdl2pp/vcpkg.json +++ b/ports/sdl2pp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2pp", "version": "0.16.1", - "port-version": 4, + "port-version": 5, "description": "C++11 bindings/wrapper for SDL2", "homepage": "https://sdl2pp.amdmi3.ru", "license": "Zlib", diff --git a/ports/sfml/fix-dependencies.patch b/ports/sfml/fix-dependencies.patch new file mode 100644 index 00000000000000..cea4ebff76af35 --- /dev/null +++ b/ports/sfml/fix-dependencies.patch @@ -0,0 +1,75 @@ +diff --git a/cmake/SFMLConfig.cmake.in b/cmake/SFMLConfig.cmake.in +index ce81953..bd2d330 100644 +--- a/cmake/SFMLConfig.cmake.in ++++ b/cmake/SFMLConfig.cmake.in +@@ -1,3 +1,8 @@ ++set(SFML_STATIC_LIBRARIES false) ++if(NOT "@BUILD_SHARED_LIBS@") ++ set(SFML_STATIC_LIBRARIES true) ++endif() ++include(CMakeFindDependencyMacro) + # This script provides the SFML libraries as imported targets + # ------------------------------------ + # +diff --git a/cmake/SFMLConfigDependencies.cmake.in b/cmake/SFMLConfigDependencies.cmake.in +index 1028110..927d1a4 100644 +--- a/cmake/SFMLConfigDependencies.cmake.in ++++ b/cmake/SFMLConfigDependencies.cmake.in +@@ -56,6 +56,9 @@ if(SFML_STATIC_LIBRARIES) + if (FIND_SFML_OS_WINDOWS) + set_property(TARGET OpenGL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "OpenGL32") + elseif(NOT FIND_SFML_OS_IOS) ++ set(OpenGL_GL_PREFERENCE "@EXPORT_OpenGL_GL_PREFERENCE@") ++ find_dependency(OpenGL) ++ set(OpenGL_LIB OpenGL::GL) + sfml_bind_dependency(TARGET OpenGL FRIENDLY_NAME "OpenGL" SEARCH_NAMES "OpenGL" "GL") + endif() + endif() +@@ -63,6 +66,8 @@ if(SFML_STATIC_LIBRARIES) + # sfml-graphics + list(FIND SFML_FIND_COMPONENTS "graphics" FIND_SFML_GRAPHICS_COMPONENT_INDEX) + if(FIND_SFML_GRAPHICS_COMPONENT_INDEX GREATER -1) ++ find_dependency(Freetype) ++ set(FreeType_LIB Freetype::Freetype) + sfml_bind_dependency(TARGET Freetype FRIENDLY_NAME "FreeType" SEARCH_NAMES "freetype") + endif() + +diff --git a/src/SFML/Graphics/CMakeLists.txt b/src/SFML/Graphics/CMakeLists.txt +index 883c758..402efbe 100644 +--- a/src/SFML/Graphics/CMakeLists.txt ++++ b/src/SFML/Graphics/CMakeLists.txt +@@ -97,7 +97,8 @@ sfml_add_library(sfml-graphics + target_link_libraries(sfml-graphics PUBLIC sfml-window) + + # stb_image sources +-target_include_directories(sfml-graphics PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/stb_image") ++find_path(STB_INCLUDE_DIR stb_image.h REQUIRED) ++target_include_directories(sfml-graphics PRIVATE "${STB_INCLUDE_DIR}") + + # let CMake know about our additional graphics libraries paths + if(SFML_OS_WINDOWS) +@@ -134,7 +134,8 @@ if(SFML_OS_ANDROID) + target_link_libraries(sfml-graphics PRIVATE z EGL GLESv1_CM) + endif() + +-sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY") ++set(FreeType_LIB Freetype::Freetype) ++sfml_find_package(Freetype LINK FreeType_LIB) + target_link_libraries(sfml-graphics PRIVATE Freetype) + + # add preprocessor symbols +diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt +index 98ea439..0f1fb53 100644 +--- a/src/SFML/Window/CMakeLists.txt ++++ b/src/SFML/Window/CMakeLists.txt +@@ -254,7 +254,9 @@ if(SFML_OPENGL_ES) + target_link_libraries(sfml-window PRIVATE EGL GLESv1_CM) + endif() + else() +- sfml_find_package(OpenGL INCLUDE "OPENGL_INCLUDE_DIR" LINK "OPENGL_LIBRARIES") ++ set(EXPORT_OpenGL_GL_PREFERENCE "${OpenGL_GL_PREFERENCE}" CACHE INTERNAL "") ++ set(OpenGL_LIB OpenGL::GL) ++ sfml_find_package(OpenGL LINK OpenGL_LIB) + target_link_libraries(sfml-window PRIVATE OpenGL) + endif() + diff --git a/ports/sfml/portfile.cmake b/ports/sfml/portfile.cmake index 2352bfabd2a62d..f3379806d730a1 100644 --- a/ports/sfml/portfile.cmake +++ b/ports/sfml/portfile.cmake @@ -4,15 +4,10 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH HEAD_REF master SHA512 7aed2fc29d1da98e6c4d598d5c86cf536cb4eb5c2079cdc23bb8e502288833c052579dadbe0ce13ad6461792d959bf6d9660229f54c54cf90a541c88c6b03d59 PATCHES - use-system-freetype.patch - stb_include.patch + fix-dependencies.patch arm64.patch ) -file(REMOVE_RECURSE "${SOURCE_PATH}/extlibs") -# Without this, we get error: list sub-command REMOVE_DUPLICATES requires list to be present. -file(MAKE_DIRECTORY "${SOURCE_PATH}/extlibs/libs") -file(WRITE "${SOURCE_PATH}/extlibs/libs/x" "") # The embedded FindFreetype doesn't properly handle debug libraries file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/Modules/FindFreetype.cmake") @@ -33,13 +28,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SFML) vcpkg_copy_pdbs() -FILE(READ "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" SFML_CONFIG) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES true)\ninclude(CMakeFindDependencyMacro)\nfind_dependency(Freetype)\n${SFML_CONFIG}") -else() - FILE(WRITE "${CURRENT_PACKAGES_DIR}/share/sfml/SFMLConfig.cmake" "set(SFML_STATIC_LIBRARIES false)\n${SFML_CONFIG}") -endif() - # move sfml-main to manual link dir if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib") file(COPY "${CURRENT_PACKAGES_DIR}/lib/sfml-main.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/manual-link") diff --git a/ports/sfml/stb_include.patch b/ports/sfml/stb_include.patch deleted file mode 100644 index 0ead09af5255d7..00000000000000 --- a/ports/sfml/stb_include.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -188,6 +188,9 @@ if(SFML_USE_SYSTEM_DEPS) - endforeach() - - list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH) -+ -+ find_path(STB_INCLUDE_DIR stb_image.h) -+ include_directories("${STB_INCLUDE_DIR}") - endif() - - # Visual C++: remove warnings regarding SL security and algorithms on pointers diff --git a/ports/sfml/use-system-freetype.patch b/ports/sfml/use-system-freetype.patch deleted file mode 100644 index 4d895b741e1949..00000000000000 --- a/ports/sfml/use-system-freetype.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/SFML/Graphics/CMakeLists.txt -+++ b/src/SFML/Graphics/CMakeLists.txt -@@ -135,7 +135,7 @@ if(SFML_OS_ANDROID) - endif() - - sfml_find_package(Freetype INCLUDE "FREETYPE_INCLUDE_DIRS" LINK "FREETYPE_LIBRARY") --target_link_libraries(sfml-graphics PRIVATE Freetype) -+target_link_libraries(sfml-graphics PRIVATE Freetype::Freetype) - - # add preprocessor symbols - target_compile_definitions(sfml-graphics PRIVATE "STBI_FAILURE_USERMSG") diff --git a/ports/sfml/vcpkg.json b/ports/sfml/vcpkg.json index f700631de62ac4..ba297ad701c105 100644 --- a/ports/sfml/vcpkg.json +++ b/ports/sfml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sfml", "version": "2.5.1", - "port-version": 13, + "port-version": 14, "description": "Simple and fast multimedia library", "homepage": "https://github.com/sfml/sfml", "license": "Zlib", @@ -11,6 +11,7 @@ "libogg", "libvorbis", "openal-soft", + "opengl", "stb", { "name": "vcpkg-cmake", diff --git a/ports/tgui/devendor-stb.patch b/ports/tgui/devendor-stb.patch new file mode 100644 index 00000000000000..d346b312ff2a84 --- /dev/null +++ b/ports/tgui/devendor-stb.patch @@ -0,0 +1,27 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ebabb8a..4a166dc 100755 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -173,6 +173,9 @@ else() + set_target_properties(tgui PROPERTIES RELWITHDEBINFO_POSTFIX -s) + endif() + ++find_path(STB_INCLUDE_DIR stb_image.h REQUIRED) ++target_include_directories(tgui PRIVATE "${STB_INCLUDE_DIR}") ++ + # Add the backend files to the library. + # Without the ability to call target_link_libraries in a subdirectory (which was only added in CMake 3.13 in policy CMP0079), + # the code would be more complicated when using add_subdirectory. So we just avoid creating a new scope by using include. +diff --git a/src/Loading/ImageLoader.cpp b/src/Loading/ImageLoader.cpp +index e3ec9c5..d2f691d 100644 +--- a/src/Loading/ImageLoader.cpp ++++ b/src/Loading/ImageLoader.cpp +@@ -45,7 +45,7 @@ + #define STB_IMAGE_STATIC + #define STBI_WINDOWS_UTF8 + #define STB_IMAGE_IMPLEMENTATION +-#include ++#include + + #if defined(__GNUC__) + #pragma GCC diagnostic pop diff --git a/ports/tgui/fix-dependencies.patch b/ports/tgui/fix-dependencies.patch index ad6b7107c0b8a5..9432abbc1865e3 100644 --- a/ports/tgui/fix-dependencies.patch +++ b/ports/tgui/fix-dependencies.patch @@ -1,27 +1,100 @@ +diff --git a/cmake/TGUIConfig.cmake.in b/cmake/TGUIConfig.cmake.in +index 5b58350..c9398b7 100644 +--- a/cmake/TGUIConfig.cmake.in ++++ b/cmake/TGUIConfig.cmake.in +@@ -44,6 +44,28 @@ + # add_executable(myapp ...) + # target_link_libraries(myapp tgui) + ++include(CMakeFindDependencyMacro) ++if("@TGUI_HAS_BACKEND_SFML@") ++ find_dependency(SFML CONFIG COMPONENTS graphics) ++endif() ++if("@TGUI_HAS_BACKEND_SDL@") ++ find_dependency(SDL2 CONFIG) ++ find_dependency(SDL2_ttf CONFIG) ++ find_dependency(Threads) ++endif() ++if("@EXPORT_USE_OPENGL@") ++ cmake_policy(PUSH) ++ if (POLICY CMP0072) ++ cmake_policy(SET CMP0072 NEW) ++ endif() ++ find_package(OpenGL REQUIRED) ++ cmake_policy(POP) ++endif() ++if("@EXPORT_USE_THREADS@") ++ set(THREADS_PREFER_PTHREAD_FLAG ON) ++ find_package(Threads REQUIRED) ++endif() ++ + set(FIND_TGUI_PATHS + "${CMAKE_CURRENT_LIST_DIR}/../.." + ${TGUI_ROOT} +@@ -58,7 +80,7 @@ set(FIND_TGUI_PATHS + /opt) + + # Choose which target definitions must be imported +-if (TGUI_STATIC_LIBRARIES) ++if (NOT "@BUILD_SHARED_LIBS@") + set(TGUI_IS_FRAMEWORK_INSTALL "@TGUI_BUILD_FRAMEWORKS@") + if (TGUI_IS_FRAMEWORK_INSTALL) + message(WARNING "Static frameworks are not supported by TGUI. Clear TGUI_DIR cache entry, \ +@@ -77,7 +99,10 @@ if (EXISTS "${targets_config_file}") + include("${targets_config_file}") + + # Search for X11 on Linux and BSD +- if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR CMAKE_SYSTEM_NAME MATCHES "^k?FreeBSD$" OR CMAKE_SYSTEM_NAME MATCHES "^OpenBSD$") ++ if(TARGET TGUI_X11) ++ find_dependency(X11) ++ set_property(TARGET TGUI_X11 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${TGUI_X11_LIB}") ++ elseif(0) + find_library(TGUI_X11_LIB NAMES X11 PATHS ${FIND_TGUI_PATHS} PATH_SUFFIXES lib NO_SYSTEM_ENVIRONMENT_PATH) + mark_as_advanced(TGUI_X11_LIB) + if(TGUI_X11_LIB) diff --git a/src/Backends/SDL/CMakeLists.txt b/src/Backends/SDL/CMakeLists.txt -index d86f11d..1e31e21 100644 +index d86f11d..3f3f3ce 100644 --- a/src/Backends/SDL/CMakeLists.txt +++ b/src/Backends/SDL/CMakeLists.txt -@@ -1,10 +1,10 @@ - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake_modules) - --find_package(SDL2 REQUIRED) --find_package(SDL2_ttf REQUIRED) -+find_package(SDL2 CONFIG REQUIRED) -+find_package(sdl2-ttf CONFIG REQUIRED) +@@ -4,7 +4,11 @@ find_package(SDL2 REQUIRED) + find_package(SDL2_ttf REQUIRED) # Link to SDL and set include and library search directories -target_link_libraries(tgui PRIVATE SDL2::Core SDL2::TTF) -+target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2::SDL2_ttf) ++if(TARGET SDL2_ttf::SDL2_ttf) ++ target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2_ttf::SDL2_ttf) ++else() ++ target_link_libraries(tgui PRIVATE SDL2::SDL2 SDL2_ttf::SDL2_ttf-static) ++endif() # Add the backend source files to the library target_sources(tgui PRIVATE -@@ -19,7 +19,7 @@ target_sources(tgui PRIVATE +@@ -19,10 +23,15 @@ target_sources(tgui PRIVATE ) add_library(tgui-sdl-interface INTERFACE) -target_link_libraries(tgui-sdl-interface INTERFACE SDL2::Core SDL2::TTF SDL2::Main) -+target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2::SDL2_ttf SDL2::SDL2main) ++if(TARGET SDL2_ttf::SDL2_ttf) ++ target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2_ttf::SDL2_ttf SDL2::SDL2main) ++else() ++ target_link_libraries(tgui-sdl-interface INTERFACE SDL2::SDL2 SDL2_ttf::SDL2_ttf-static SDL2::SDL2main) ++endif() # Also link to OpenGL or OpenGL ES if(NOT TGUI_USE_GLES) ++ set(EXPORT_USE_OPENGL 1 CACHE INTERNAL "") + find_package(OpenGL REQUIRED) + target_link_libraries(tgui PRIVATE OpenGL::GL) + target_link_libraries(tgui-sdl-interface INTERFACE OpenGL::GL) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a166dc..a53b58f 100755 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -213,6 +213,7 @@ if(TGUI_OS_LINUX OR TGUI_OS_BSD) + target_link_libraries(tgui PRIVATE TGUI_X11) + + # For the FileDialog we need to link to pthreads and dl on Linux and BSD (to load system icons in the background) ++ set(EXPORT_USE_THREADS 1 CACHE INTERNAL "") + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + target_link_libraries(tgui PRIVATE Threads::Threads) diff --git a/ports/tgui/fix-usage.patch b/ports/tgui/fix-usage.patch deleted file mode 100644 index cbc43b4e779d47..00000000000000 --- a/ports/tgui/fix-usage.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cmake/TGUIConfig.cmake.in b/cmake/TGUIConfig.cmake.in -index 63e8a45..01804cd 100644 ---- a/cmake/TGUIConfig.cmake.in -+++ b/cmake/TGUIConfig.cmake.in -@@ -44,6 +44,9 @@ - # add_executable(myapp ...) - # target_link_libraries(myapp tgui) - -+include(CMakeFindDependencyMacro) -+find_dependency(SFML COMPONENTS graphics CONFIG) -+ - set(FIND_TGUI_PATHS - "${CMAKE_CURRENT_LIST_DIR}/../.." - ${TGUI_ROOT} -@@ -58,7 +61,7 @@ set(FIND_TGUI_PATHS - /opt) - - # Choose which target definitions must be imported --if (TGUI_STATIC_LIBRARIES) -+if (NOT @TGUI_SHARED_LIBS@) - set(TGUI_IS_FRAMEWORK_INSTALL "@TGUI_BUILD_FRAMEWORKS@") - if (TGUI_IS_FRAMEWORK_INSTALL) - message(WARNING "Static frameworks are not supported by TGUI. Clear TGUI_DIR cache entry, \ diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake index fc5fa414f40f05..4ec9efbaaeb220 100644 --- a/ports/tgui/portfile.cmake +++ b/ports/tgui/portfile.cmake @@ -1,3 +1,13 @@ +if(NOT "sdl2" IN_LIST FEATURES AND NOT "sfml" IN_LIST FEATURES) + message(FATAL_ERROR "At least one of the backend features must be selected: sdl2 sfml") +endif() + +if(VCPKG_TARGET_IS_ANDROID) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +elseif(VCPKG_TARGET_IS_IOS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO texus/TGUI @@ -5,16 +15,17 @@ vcpkg_from_github( SHA512 109e64c114336979a4bd0d44765e4bc26cb4ecb6e4db92d7441230d148438b084d01cb56dd292f09a6fd28b0f7420044455ffb519147cc3aea71e322142cd9a0 HEAD_REF 0.9 PATCHES - fix-usage.patch fix-dependencies.patch + devendor-stb.patch ) -set(TGUI_SHARE_PATH ${CURRENT_PACKAGES_DIR}/share/tgui) -set(TGUI_TOOLS_PATH ${CURRENT_PACKAGES_DIR}/tools/tgui) +file(REMOVE_RECURSE "${SOURCE_PATH}/src/Backends/SDL/cmake_modules") # Config available +file(REMOVE_RECURSE "${SOURCE_PATH}/include/TGUI/extlibs/stb") -# Enable static build -file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindSFML.cmake") -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" TGUI_SHARED_LIBS) +set(TGUI_SHARE_PATH "${CURRENT_PACKAGES_DIR}/share/${PORT}") +set(TGUI_TOOLS_PATH "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" TGUI_USE_STATIC_STD_LIBS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -26,11 +37,19 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - OPTIONS ${FEATURE_OPTIONS} - -DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH} - -DTGUI_SHARED_LIBS=${TGUI_SHARED_LIBS} + OPTIONS + ${FEATURE_OPTIONS} + "-DTGUI_MISC_INSTALL_PREFIX=${TGUI_SHARE_PATH}" + "-DCMAKE_INSTALL_DOCDIR=${TGUI_SHARE_PATH}" + -DTGUI_USE_STATIC_STD_LIBS=${TGUI_USE_STATIC_STD_LIBS} -DTGUI_BACKEND=Custom - -DTGUI_BUILD_EXAMPLES=OFF + -DTGUI_BUILD_DOC=OFF + -DTGUI_BUILD_FRAMEWORK=OFF + -DTGUI_INSTALL_PKGCONFIG_FILES=OFF + OPTIONS_DEBUG + -DTGUI_BUILD_GUI_BUILDER=OFF + MAYBE_UNUSED_VARIABLES + TGUI_BUILD_FRAMEWORK ) vcpkg_cmake_install() @@ -52,14 +71,13 @@ if("tool" IN_LIST FEATURES) endif() endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/glad" - "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/stb" -) # All folders are empty - -file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/doc") - -vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + # Empty folders + "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/nanosvg" + "${CURRENT_PACKAGES_DIR}/include/TGUI/extlibs/glad" +) -# Handle copyright -file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/license.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/tgui/usage b/ports/tgui/usage new file mode 100644 index 00000000000000..af9c2504c331b1 --- /dev/null +++ b/ports/tgui/usage @@ -0,0 +1,4 @@ +tgui provides CMake targets: + + find_package(TGUI CONFIG REQUIRED) + target_link_libraries(main PRIVATE tgui) diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index 2dce591863e7bd..b7bba45c80c22d 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,11 +1,12 @@ { "name": "tgui", "version-date": "2021-04-19", - "port-version": 3, + "port-version": 4, "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", "license": "Zlib", "dependencies": [ + "stb", { "name": "vcpkg-cmake", "host": true @@ -16,46 +17,28 @@ } ], "default-features": [ - "sdl2", "sfml" ], "features": { "sdl2": { - "description": "build the SDL backend", + "description": "Build the SDL backend", "dependencies": [ + { + "name": "opengl", + "platform": "!android & !ios" + }, "sdl2", "sdl2-ttf" ] }, "sfml": { - "description": "build the SFML backend", + "description": "Build the SFML backend", "dependencies": [ - { - "name": "glad", - "features": [ - "egl" - ], - "platform": "!android & !ios" - }, - { - "name": "opengl", - "platform": "android | ios" - }, - "sfml", - "stb" + "sfml" ] }, "tool": { - "description": "Build GUI builder", - "dependencies": [ - { - "name": "tgui", - "features": [ - "sdl2", - "sfml" - ] - } - ] + "description": "Build GUI builder" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 0e7b4107507e21..f12a73f4e43724 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4594,7 +4594,7 @@ }, "milerius-sfml-imgui": { "baseline": "1.1", - "port-version": 4 + "port-version": 5 }, "mimalloc": { "baseline": "2.0.6", @@ -6517,12 +6517,12 @@ "port-version": 9 }, "sdl2-ttf": { - "baseline": "2.0.15", - "port-version": 5 + "baseline": "2.20.0", + "port-version": 0 }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 4 + "port-version": 5 }, "seal": { "baseline": "3.7.2", @@ -6574,7 +6574,7 @@ }, "sfml": { "baseline": "2.5.1", - "port-version": 13 + "port-version": 14 }, "sfsexp": { "baseline": "1.3.1", @@ -7050,7 +7050,7 @@ }, "tgui": { "baseline": "2021-04-19", - "port-version": 3 + "port-version": 4 }, "theia": { "baseline": "0.8", diff --git a/versions/m-/milerius-sfml-imgui.json b/versions/m-/milerius-sfml-imgui.json index 90859a944b5e09..884fcc3aca449e 100644 --- a/versions/m-/milerius-sfml-imgui.json +++ b/versions/m-/milerius-sfml-imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "959aac1b74b20fe931081e70cedd5e82533669fc", + "version": "1.1", + "port-version": 5 + }, { "git-tree": "4bfc198df4803019e174c0489fcc91e178f66930", "version": "1.1", diff --git a/versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json index 65d49c1b0281a3..632a3278bbf26d 100644 --- a/versions/s-/sdl2-ttf.json +++ b/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85feef1fd925955c314616f7dbb934a401b4a9d1", + "version": "2.20.0", + "port-version": 0 + }, { "git-tree": "cefc95479a9fa2c8a8c4f5539952978f77e3de99", "version-string": "2.0.15", diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json index abe5cc50a664ce..c759c94bf103b9 100644 --- a/versions/s-/sdl2pp.json +++ b/versions/s-/sdl2pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89665ed749a05bebacf76088e7781d0f1ef4c06a", + "version": "0.16.1", + "port-version": 5 + }, { "git-tree": "0d0efed99dd39ca3bbf35b1b601b7aec4a82b55b", "version": "0.16.1", diff --git a/versions/s-/sfml.json b/versions/s-/sfml.json index 3519276cfd4092..dc814d0bfec3f3 100644 --- a/versions/s-/sfml.json +++ b/versions/s-/sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ab010b7ce899203149c75197c19380506984683", + "version": "2.5.1", + "port-version": 14 + }, { "git-tree": "ca14334e4fdf097424958412912356dc2c186b9d", "version": "2.5.1", diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json index c808cac1122731..846a6dd1156300 100644 --- a/versions/t-/tgui.json +++ b/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71f51f9739edd1af085fd0b0c401b5e2bc297a84", + "version-date": "2021-04-19", + "port-version": 4 + }, { "git-tree": "0fe7d561ea6d038584711e8581f6a5a72062c543", "version-date": "2021-04-19", From 02b300f2a27c7f0b1bfeca33feb1f234022b00d5 Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Thu, 4 Aug 2022 22:29:28 -0400 Subject: [PATCH 310/791] [bshoshany-thread-pool] Updated to v3.3.0 (#26154) * [bshoshany-thread-pool] Updated to v3.3.0 * [bshoshany-thread-pool] Updated to v3.3.0 * Update ports/bshoshany-thread-pool/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/bshoshany-thread-pool/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * [bshoshany-thread-pool] Fixed SHA Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/bshoshany-thread-pool/portfile.cmake | 6 +++--- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index ff0ceeedf41847..b0ebdd28f63b28 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool - REF v3.2.0 - SHA512 785d6c4827e39b0128501ff4379ba0ffbf90ef4b612eccd0279027e6fc9ce9d2a463c2b8b93515ca0a1dc86dc4c34d9849bc281940b1f490086d1db49d5521bb + REF v3.3.0 + SHA512 980c8dfe90e04cbc622ee4ae2ce67444069311619f0dc5d7ac3b3a3ea59ead42d4c867e669e8ce9c71cdc2a4bae431402a8f5032ab29fdfc1ca507b0e7102d8f HEAD_REF master ) file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp") -file(INSTALL "${HEADER_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 6cc71015e3411a..f13c66749cfc69 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "3.2.0", + "version": "3.3.0", "maintainers": "Barak Shoshany ", "description": "BS::thread_pool: a fast, lightweight, and easy-to-use C++17 thread pool library", "homepage": "https://github.com/bshoshany/thread-pool", diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index d23ee2823a4b79..0ccb4edefb2641 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbe9095cfdb6128d117003b2495f84e50653c220", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "fee21d430188c7e3c7f7d92da0cb30c48b6cafba", "version": "3.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f12a73f4e43724..cc17dde2fdca7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1181,7 +1181,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "3.2.0", + "baseline": "3.3.0", "port-version": 0 }, "bsio": { From 52b66042533aaf7f5721941941fd12fbf46164d4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 5 Aug 2022 04:31:00 +0200 Subject: [PATCH 311/791] [libpq] update to 14.4 and pass flags in msbuild (#26051) * update libpq and pass flags to msbuild * v db * readd patch for linux * v db * readd patch * v db * Update ports/libpq/patches/fix-configure.patch * v db * use #pragma x_macro * v db * CI retrigger --- ports/libpq/libpq.props.in | 25 +++++++++++++++++++++ ports/libpq/patches/fix-configure.patch | 2 +- ports/libpq/patches/windows/macro-def.patch | 18 +++++++++++++++ ports/libpq/portfile.cmake | 13 +++++++---- ports/libpq/vcpkg.json | 7 ++++-- versions/baseline.json | 4 ++-- versions/l-/libpq.json | 5 +++++ 7 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 ports/libpq/libpq.props.in create mode 100644 ports/libpq/patches/windows/macro-def.patch diff --git a/ports/libpq/libpq.props.in b/ports/libpq/libpq.props.in new file mode 100644 index 00000000000000..d172a4af4017f4 --- /dev/null +++ b/ports/libpq/libpq.props.in @@ -0,0 +1,25 @@ + + + + + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_DEBUG@ + + + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_DEBUG@ + + + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_DEBUG@ + + + + + %(AdditionalOptions) @VCPKG_COMBINED_C_FLAGS_RELEASE@ + + + %(AdditionalOptions) @VCPKG_COMBINED_SHARED_LINKER_FLAGS_RELEASE@ + + + %(AdditionalOptions) @VCPKG_COMBINED_STATIC_LINKER_FLAGS_RELEASE@ + + + diff --git a/ports/libpq/patches/fix-configure.patch b/ports/libpq/patches/fix-configure.patch index bf7c606e7b96f3..716e7a0a9be69b 100644 --- a/ports/libpq/patches/fix-configure.patch +++ b/ports/libpq/patches/fix-configure.patch @@ -4,7 +4,7 @@ index fba79ee..4fadb94 100644 +++ b/configure.ac @@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [14.1], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [14.4], [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. +m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_warn([unsupported],[Autoconf version 2.69 is required. diff --git a/ports/libpq/patches/windows/macro-def.patch b/ports/libpq/patches/windows/macro-def.patch new file mode 100644 index 00000000000000..1d16c127082441 --- /dev/null +++ b/ports/libpq/patches/windows/macro-def.patch @@ -0,0 +1,18 @@ +diff --git a/src/include/common/checksum_helper.h b/src/include/common/checksum_helper.h +index cac7570ea..d0ca1243c 100644 +--- a/src/include/common/checksum_helper.h ++++ b/src/include/common/checksum_helper.h +@@ -33,7 +28,13 @@ + */ + typedef enum pg_checksum_type + { ++#pragma push_macro("CHECKSUM_TYPE_NONE") ++#ifdef CHECKSUM_TYPE_NONE ++// winioctl.h defines CHECKSUM_TYPE_NONE to 0 as a macro. ++#undef CHECKSUM_TYPE_NONE ++#endif + CHECKSUM_TYPE_NONE, ++#pragma pop_macro("CHECKSUM_TYPE_NONE") + CHECKSUM_TYPE_CRC32C, + CHECKSUM_TYPE_SHA224, + CHECKSUM_TYPE_SHA256, diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 09b36591dfc803..ceb44d57cf654c 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -1,11 +1,11 @@ -set(PORT_VERSION 14.1) +set(PORT_VERSION 14.4) # NOTE: the python patches must be regenerated on version update ## Download and extract sources vcpkg_download_distfile(ARCHIVE URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2" FILENAME "postgresql-${PORT_VERSION}.tar.bz2" - SHA512 4a0bec157d5464bb9e5f5c0eb0efdede55526e03f6f4d660b87d161a47705eb152fa0878960b1581bce42a5ed28a1f457825ea54e8d22e34b5b8eb36473ceefd + SHA512 dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb ) set(PATCHES @@ -18,7 +18,8 @@ set(PATCHES patches/windows/python_lib.patch patches/windows/fix-compile-flag-Zi.patch patches/windows/tcl_version.patch - patches/fix-configure.patch + patches/windows/macro-def.patch + patches/fix-configure.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -84,6 +85,9 @@ file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") ## Do the build if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_cmake_get_vars(vars_file) + include("${vars_file}") + file(GLOB SOURCE_FILES ${SOURCE_PATH}/*) foreach(_buildtype ${port_config_list}) # Copy libpq sources. @@ -165,6 +169,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(WRITE "${CONFIG_FILE}" "${_contents}") file(WRITE "${BUILDPATH_${_buildtype}}/src/tools/msvc/buildenv.pl" "${buildenv_contents}") + configure_file("${CURRENT_PORT_DIR}/libpq.props.in" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props" @ONLY) vcpkg_get_windows_sdk(VCPKG_TARGET_PLATFORM_VERSION) set(ENV{MSBFLAGS} "/p:PlatformToolset=${VCPKG_PLATFORM_TOOLSET} /p:VCPkgLocalAppDataDisabled=true @@ -172,6 +177,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) /p:WindowsTargetPlatformVersion=${VCPKG_TARGET_PLATFORM_VERSION} /m /p:ForceImportBeforeCppTargets=\"${SCRIPTS}/buildsystems/msbuild/vcpkg.targets\" + /p:ForceImportAfterCppTargets=\"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/libpq.props\" /p:VcpkgTriplet=${TARGET_TRIPLET} /p:VcpkgCurrentInstalledDir=\"${CURRENT_INSTALLED_DIR}\"" ) @@ -208,7 +214,6 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(STATUS "Installing libpq ${TARGET_TRIPLET}-${_buildtype}... done") endforeach() - message(STATUS "Cleanup libpq ${TARGET_TRIPLET}...") #Cleanup file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 3e2532f4b4c200..d8f59322b94d69 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libpq", - "version": "14.1", - "port-version": 2, + "version": "14.4", "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", @@ -14,6 +13,10 @@ "bonjour" ], "platform": "osx" + }, + { + "name": "vcpkg-cmake-get-vars", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index cc17dde2fdca7b..24d7edac1ef155 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3981,8 +3981,8 @@ "port-version": 14 }, "libpq": { - "baseline": "14.1", - "port-version": 2 + "baseline": "14.4", + "port-version": 0 }, "libpqxx": { "baseline": "7.7.3", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 13954499188274..f01f4c4651b0c0 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b3456bfb8b04525c44007f3c8a04b7e208d639d", + "version": "14.4", + "port-version": 0 + }, { "git-tree": "2b437be1592b794cb09437beba153937991a189a", "version": "14.1", From 498c6e90a1c6ca2a105a81e0687b5a4eb40d42c2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 5 Aug 2022 19:30:55 +0200 Subject: [PATCH 312/791] [openssl] Fix pc files (#26170) * Fix openssl libdir * Update versions --- ports/openssl/unix/CMakeLists.txt | 1 + ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 1ad224edf230f0..79e9f923f3c57c 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -227,6 +227,7 @@ else() ${DISABLES} ${PLATFORM} "--prefix=${CMAKE_INSTALL_PREFIX}" + "--libdir=${CMAKE_INSTALL_PREFIX}/lib" "--openssldir=/etc/ssl" ${CFLAGS} VERBATIM diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index d5a033ff3a667f..2fd99fedfacb18 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.5", - "port-version": 2, + "port-version": 3, "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", diff --git a/versions/baseline.json b/versions/baseline.json index 24d7edac1ef155..c469996a8fee73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5266,7 +5266,7 @@ }, "openssl": { "baseline": "3.0.5", - "port-version": 2 + "port-version": 3 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 416d94297b95d0..162f779d2389b0 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4fd408544a2a6635ce994badc226aa945c8f78a", + "version": "3.0.5", + "port-version": 3 + }, { "git-tree": "1172be56343ba751b0fe10a0fbb6acedc7871e65", "version": "3.0.5", From 4147b343c27f601cd41a8331d41c90756352f311 Mon Sep 17 00:00:00 2001 From: Ivan Stepanov Date: Fri, 5 Aug 2022 19:26:59 -0400 Subject: [PATCH 313/791] [docs] binarycaching.md: NuGet requires to set API Key for source (#22191) --- docs/users/binarycaching.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index c37fd96fd82435..b091c33ce3ab18 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -96,14 +96,17 @@ steps: - name: 'Setup NuGet Credentials' shell: 'bash' # Replace with your organization name - run: > - ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` - sources add - -source "https://nuget.pkg.github.com//index.json" - -storepasswordincleartext - -name "GitHub" - -username "" - -password "${{ secrets.GITHUB_TOKEN }}" + run: | + ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` \ + sources add \ + -source "https://nuget.pkg.github.com//index.json" \ + -storepasswordincleartext \ + -name "GitHub" \ + -username "" \ + -password "${{ secrets.GITHUB_TOKEN }}" + ${{ matrix.mono }} `./vcpkg/vcpkg fetch nuget | tail -n 1` \ + setapikey "${{ secrets.GITHUB_TOKEN }}" \ + -source "https://nuget.pkg.github.com//index.json" # Omit this step if you're using manifests - name: 'vcpkg package restore' From 388783371978e10ff32651ce272a85b2c8c60bc9 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Sat, 6 Aug 2022 08:09:54 +0200 Subject: [PATCH 314/791] [urdfdom] Update to 3.1.0 (#25591) * [urdfdom] Update to 3.1.0 * Enable static builds * version * Remove from ci baseline * Update headers as well * use version * version * Update dartsim * version * only dynamic * version * Fix version * version * Update dartsim * version * [dartsim] update to fix Windows build failure * Add fmt dependence * urdfdom supports * Update ref * license * version * dartsim isn't supported on 32 bits anymore * version * [dartsim] update to 6.12.2 * version * maybe unused * version * Fix patch * version * cr urdfdom-headers * dartsim * urdfdom * version * license * version --- ...le_unit_tests_examples_and_tutorials.patch | 19 +++- ports/dartsim/portfile.cmake | 12 ++- ports/dartsim/vcpkg.json | 6 +- ports/urdfdom-headers/fix-include-path.patch | 17 ++- ports/urdfdom-headers/portfile.cmake | 40 +++---- ports/urdfdom-headers/vcpkg.json | 16 ++- ports/urdfdom/0001_use_math_defines.patch | 27 ++--- ports/urdfdom/0002_fix_exports.patch | 29 ----- .../0004_fix-dependency-console_bridge.patch | 13 --- .../urdfdom/0005-fix-config-and-install.patch | 101 ++++-------------- ports/urdfdom/portfile.cmake | 24 ++--- ports/urdfdom/vcpkg.json | 5 +- scripts/ci.baseline.txt | 1 - versions/baseline.json | 12 +-- versions/d-/dartsim.json | 5 + versions/u-/urdfdom-headers.json | 5 + versions/u-/urdfdom.json | 5 + 17 files changed, 133 insertions(+), 204 deletions(-) delete mode 100644 ports/urdfdom/0002_fix_exports.patch delete mode 100644 ports/urdfdom/0004_fix-dependency-console_bridge.patch diff --git a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch index e20d8de079b60a..5836b28434eb1d 100644 --- a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch +++ b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch @@ -1,13 +1,26 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9940065eb8..b25fa4919a 100644 +index 100bfb8b59be..b0779885c788 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -298,7 +298,7 @@ add_subdirectory(dart) +@@ -292,7 +292,7 @@ add_subdirectory(dart) set(DART_IN_SOURCE_BUILD TRUE) -if(TARGET dart) -+if(false) ++if(0) # Add a "tests" target to build unit tests. enable_testing() +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 08ef983cdcfa..7092d89bb17d 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -1,6 +1,8 @@ + set(DART_DARTPY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/dartpy") + + add_subdirectory(dartpy) ++if(0) + add_subdirectory(tests) + add_subdirectory(examples) + add_subdirectory(tutorials) ++endif() diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake index 0a12d6a14f64e4..d250a27764d880 100644 --- a/ports/dartsim/portfile.cmake +++ b/ports/dartsim/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dartsim/dart - REF v6.11.0 - SHA512 01fbff039bcec71d41334db2d07d0973b1ba58d30d05b29e35e1e3cee853917753b64e1101881113a33adb801559855d38d274fbb3383cfb24d85565254d112d + REF v6.12.2 + SHA512 6d04da37d0eb40a35a3aaec583af024e2edf71d68bb38b6832760de21a349221387644ed9be0cc1e451c669bbf48eb53d8d0cd3be1b1b265a30be2aa17c7e48b HEAD_REF main PATCHES disable_unit_tests_examples_and_tutorials.patch @@ -22,9 +22,11 @@ vcpkg_cmake_configure( -DDART_SKIP_NLOPT=ON -DDART_SKIP_OPENGL=ON -DDART_SKIP_pagmo=ON - -Durdfdom_headers_VERSION_MAJOR=1 - -Durdfdom_headers_VERSION_MINOR=0 - -Durdfdom_headers_VERSION_PATCH=4 + -Durdfdom_headers_VERSION_MAJOR=1 # urdfdom-headers does not expose a header macro for its version. + -Durdfdom_headers_VERSION_MINOR=0 # versions of at least 1.0.0 use std:: constructs in their ABI instead of boost:: ones. + -Durdfdom_headers_VERSION_PATCH=0 + MAYBE_UNUSED_VARIABLES + DART_MSVC_DEFAULT_OPTIONS ) vcpkg_cmake_install() diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index 6bc7403f1884e1..2b3b3aa2ecb85a 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,9 +1,10 @@ { "name": "dartsim", - "version": "6.11.0", - "port-version": 3, + "version": "6.12.2", "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", + "license": "BSD-2-Clause", + "supports": "!x86", "dependencies": [ "assimp", "boost-algorithm", @@ -18,6 +19,7 @@ "ccd", "eigen3", "fcl", + "fmt", "octomap", "ode", "tinyxml2", diff --git a/ports/urdfdom-headers/fix-include-path.patch b/ports/urdfdom-headers/fix-include-path.patch index 6ecfad8eb9cf91..e29dddaf75f7d8 100644 --- a/ports/urdfdom-headers/fix-include-path.patch +++ b/ports/urdfdom-headers/fix-include-path.patch @@ -1,12 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25c3704..247ca0b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,7 +54,7 @@ install(FILES + DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} COMPONENT cmake) + + # Make the package config file +-if (NOT MSVC) ++if (1) + set(PACKAGE_DESC "Unified Robot Description Format") + set(pkg_conf_file "urdfdom_headers.pc") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY) diff --git a/cmake/urdfdom_headers-config.cmake.in b/cmake/urdfdom_headers-config.cmake.in -index 4686d39..026b65e 100644 +index b53e466..b35805a 100644 --- a/cmake/urdfdom_headers-config.cmake.in +++ b/cmake/urdfdom_headers-config.cmake.in @@ -3,8 +3,8 @@ if (@PACKAGE_NAME@_CONFIG_INCLUDED) endif() set(@PACKAGE_NAME@_CONFIG_INCLUDED TRUE) --set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/include") +-set(@PACKAGE_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") +set(@PACKAGE_NAME@_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include") -include("${@PACKAGE_NAME@_DIR}/@PACKAGE_NAME@Export.cmake") diff --git a/ports/urdfdom-headers/portfile.cmake b/ports/urdfdom-headers/portfile.cmake index eac0cb96e7c1a0..08df291fdd01f1 100644 --- a/ports/urdfdom-headers/portfile.cmake +++ b/ports/urdfdom-headers/portfile.cmake @@ -1,41 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ros/urdfdom_headers - REF a15d906ff16a7fcbf037687b9c63b946c0cc04a1 # 1.0.5 - SHA512 794acd3b077a1d8fa27d0a698cecbce42f3a7b30f867e79b9897b0d97dcd9e80d2cf3b0c75ee34f628f73afb871c439fffe4a1d7ed85c7fac6553fb1e5b56c36 + REF 2981892df9da19d10f58dc84de63820e4f554f63 # 1.1.0 + SHA512 cc47d2fb9781f4c7f1af25ccfb4dc8cc9e72d2ec22cb2fe16866bb0e7ed40494181a413dcd74cb0407b4f5c20262f076f8ae87d605ba0e5477a57ff29ba30967 HEAD_REF master PATCHES fix-include-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/urdfdom_headers) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake PACKAGE_NAME urdfdom_headers) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/urdfdom_headers/cmake TARGET_PATH share/urdfdom_headers) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/urdfdom_headers/cmake PACKAGE_NAME urdfdom_headers) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/urdfdom_headers") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/urdfdom_headers") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) - vcpkg_fixup_pkgconfig() -endif() - -# The config files for this project use underscore -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/urdfdom-headers ${CURRENT_PACKAGES_DIR}/share/urdfdom_headers) -endif() +vcpkg_fixup_pkgconfig() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/urdfdom-headers/vcpkg.json b/ports/urdfdom-headers/vcpkg.json index 4326813b3d48b4..f0b3c11c7df092 100644 --- a/ports/urdfdom-headers/vcpkg.json +++ b/ports/urdfdom-headers/vcpkg.json @@ -1,7 +1,17 @@ { "name": "urdfdom-headers", - "version-string": "1.0.5", - "port-version": 2, + "version": "1.1.0", "description": "The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.", - "homepage": "https://github.com/ros/urdfdom_headers" + "homepage": "https://github.com/ros/urdfdom_headers", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/urdfdom/0001_use_math_defines.patch b/ports/urdfdom/0001_use_math_defines.patch index b791533aa7dd0b..5197b5693ef75b 100644 --- a/ports/urdfdom/0001_use_math_defines.patch +++ b/ports/urdfdom/0001_use_math_defines.patch @@ -1,26 +1,15 @@ -From a374a5b04db27fde58a11cc2ba5ea10a0d0a7dad Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Sun, 3 Sep 2017 23:24:55 +0300 -Subject: [PATCH] define _USE_MATH_DEFINES - ---- - urdf_parser/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt -index 333226e..2158965 100644 +index ac7c079..67f175d 100644 --- a/urdf_parser/CMakeLists.txt +++ b/urdf_parser/CMakeLists.txt -@@ -1,5 +1,9 @@ - include_directories(include) +@@ -23,6 +23,10 @@ macro(add_urdfdom_library) + SOVERSION ${URDF_MAJOR_MINOR_VERSION}) + endmacro() +if(MSVC) -+add_definitions(-D_USE_MATH_DEFINES) ++ add_definitions(-D_USE_MATH_DEFINES) +endif() + - add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp) - target_link_libraries(urdfdom_world ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) - set_target_properties(urdfdom_world PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) --- -2.12.2.windows.2 - + if(TARGET console_bridge::console_bridge) + set(console_bridge_link_libs "console_bridge::console_bridge") + else() diff --git a/ports/urdfdom/0002_fix_exports.patch b/ports/urdfdom/0002_fix_exports.patch deleted file mode 100644 index 727883f8ddb99f..00000000000000 --- a/ports/urdfdom/0002_fix_exports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 06aa5a06ee543102bf1a4057601adba3490dad60 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Sun, 3 Sep 2017 23:55:11 +0300 -Subject: [PATCH] fix exports - ---- - urdf_parser/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt -index 2158965..c209228 100644 ---- a/urdf_parser/CMakeLists.txt -+++ b/urdf_parser/CMakeLists.txt -@@ -15,10 +15,12 @@ set_target_properties(urdfdom_model PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERS - add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp) - target_link_libraries(urdfdom_sensor urdfdom_model ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) - set_target_properties(urdfdom_sensor PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) -+set_target_properties(urdfdom_sensor PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - - add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp) - target_link_libraries(urdfdom_model_state ${TinyXML_LIBRARIES} ${console_bridge_LIBRARIES}) - set_target_properties(urdfdom_model_state PROPERTIES SOVERSION ${URDF_MAJOR_MINOR_VERSION}) -+set_target_properties(urdfdom_model_state PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) - - # -------------------------------- - --- -2.12.2.windows.2 - diff --git a/ports/urdfdom/0004_fix-dependency-console_bridge.patch b/ports/urdfdom/0004_fix-dependency-console_bridge.patch deleted file mode 100644 index 4e149b1a08dd26..00000000000000 --- a/ports/urdfdom/0004_fix-dependency-console_bridge.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 92762f1..f0d115d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,7 @@ if (NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() - --find_package(console_bridge 0.3 REQUIRED) -+find_package(console_bridge REQUIRED) - include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS}) - link_directories(${console_bridge_LIBRARY_DIRS}) - diff --git a/ports/urdfdom/0005-fix-config-and-install.patch b/ports/urdfdom/0005-fix-config-and-install.patch index a0b654fd0c699e..902d6337d9445b 100644 --- a/ports/urdfdom/0005-fix-config-and-install.patch +++ b/ports/urdfdom/0005-fix-config-and-install.patch @@ -1,101 +1,40 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f0d115d..9acbfbe 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,17 +58,18 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}" - - enable_testing() - --add_subdirectory(urdf_parser) -- - if(WIN32 AND NOT CYGWIN) - set(CMAKE_CONFIG_INSTALL_DIR CMake) - else() - set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/) - endif() - -+add_subdirectory(urdf_parser) -+ - set(PKG_NAME ${PROJECT_NAME}) - set(PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world) - set(PKG_DEPENDS urdfdom_headers console_bridge) -+set(PKG_EXPORTS urdfdom) - set(cmake_conf_file "cmake/urdfdom-config.cmake") - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${cmake_conf_file}.in" "${CMAKE_BINARY_DIR}/${cmake_conf_file}" @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/${cmake_conf_file} diff --git a/cmake/urdfdom-config.cmake.in b/cmake/urdfdom-config.cmake.in -index fb81b47..8b4ef8f 100644 +index d8eb93d..3e5c42a 100644 --- a/cmake/urdfdom-config.cmake.in +++ b/cmake/urdfdom-config.cmake.in @@ -3,8 +3,12 @@ if (@PKG_NAME@_CONFIG_INCLUDED) endif() set(@PKG_NAME@_CONFIG_INCLUDED TRUE) --set(@PKG_NAME@_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include" "@TinyXML_INCLUDE_DIRS@") +-set(@PKG_NAME@_INCLUDE_DIRS "${@PROJECT_NAME@_DIR}/@RELATIVE_PATH_CMAKE_DIR_TO_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "@TinyXML_INCLUDE_DIRS@") +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - ++ +set(@PKG_NAME@_INCLUDE_DIRS "${_IMPORT_PREFIX}/include" "@TinyXML_INCLUDE_DIRS@") -+ + +if (0) foreach(lib @PKG_LIBRARIES@) set(onelib "${lib}-NOTFOUND") - find_library(onelib ${lib} -@@ -25,3 +29,13 @@ foreach(dep @PKG_DEPENDS@) - list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS}) - list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES}) + set(onelibd "${lib}-NOTFOUND") +@@ -29,10 +33,14 @@ foreach(lib @PKG_LIBRARIES@) + endif() + list(APPEND @PKG_NAME@_TARGETS @PROJECT_NAME@::${lib}) endforeach() +endif() + +include(CMakeFindDependencyMacro) +find_dependency(console_bridge) -+ -+foreach(exp @PKG_EXPORTS@) -+ include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake) -+endforeach() -+ -+set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) -\ No newline at end of file -diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt -index 731b57a..ebd0586 100644 ---- a/urdf_parser/CMakeLists.txt -+++ b/urdf_parser/CMakeLists.txt -@@ -39,10 +39,32 @@ if(BUILD_TESTING) - add_subdirectory(test) - endif() --INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test -- DESTINATION ${CMAKE_INSTALL_BINDIR}) --INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR}) --INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+INSTALL( -+ TARGETS -+ check_urdf -+ urdf_to_graphiz -+ urdf_mem_test -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+) -+INSTALL( -+ TARGETS -+ urdfdom_model -+ urdfdom_world -+ urdfdom_sensor -+ urdfdom_model_state -+ EXPORT -+ urdfdom -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+) -+install( -+ EXPORT urdfdom -+ DESTINATION ${CMAKE_CONFIG_INSTALL_DIR} -+ NAMESPACE "${PROJECT_NAME}::" -+ FILE "urdfdomExport.cmake" -+) + foreach(dep @PKG_DEPENDS@) + if(NOT ${dep}_FOUND) +- find_package(${dep}) ++ find_dependency(${dep}) + endif() + list(APPEND @PKG_NAME@_INCLUDE_DIRS ${${dep}_INCLUDE_DIRS}) + list(APPEND @PKG_NAME@_LIBRARIES ${${dep}_LIBRARIES}) +@@ -41,3 +49,5 @@ endforeach() + foreach(exp @PKG_EXPORTS@) + include(${@PROJECT_NAME@_DIR}/${exp}Export.cmake) + endforeach() + - INSTALL(DIRECTORY include/urdf_parser DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++set(@PKG_NAME@_LIBRARIES urdfdom::urdfdom_model urdfdom::urdfdom_world urdfdom::urdfdom_sensor urdfdom::urdfdom_model_state) diff --git a/ports/urdfdom/portfile.cmake b/ports/urdfdom/portfile.cmake index ef1dfa803618fa..5a2e8a0aef8070 100644 --- a/ports/urdfdom/portfile.cmake +++ b/ports/urdfdom/portfile.cmake @@ -1,26 +1,26 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ros/urdfdom - REF 0da4b20675cdbe14b532d484a1c17df85b4e1584 # 1.0.4 - SHA512 cad59307fef466e2bbe3769a4123571d48223ea25a80dde76cb25c9f6dfc961570090d188ddaf8fc93f41f355ffa240eb00abe20cdea4a5ee3e49f56d1258686 - HEAD_REF master - PATCHES - 0001_use_math_defines.patch - 0002_fix_exports.patch - 0004_fix-dependency-console_bridge.patch - 0005-fix-config-and-install.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO ros/urdfdom + REF 99ec1f99f2d175f07cc26e63082502ee62982dac # 3.1.0 + SHA512 64bd96c6b56c300b92e2bd6a875c4bc3c4c5d2ee332a75a8d98099aee0db3e9c33fa7d75fdc4d013e7b6ac47296f524ef713639b06e66035135dfc2a8cca0276 + HEAD_REF master + PATCHES + 0001_use_math_defines.patch + 0005-fix-config-and-install.patch ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES check_urdf urdf_mem_test urdf_to_graphiz urdf_to_graphviz AUTO_CLEAN) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_cmake_config_fixup(CONFIG_PATH CMake) diff --git a/ports/urdfdom/vcpkg.json b/ports/urdfdom/vcpkg.json index 0b9ee602cb2187..97764859ed28ed 100644 --- a/ports/urdfdom/vcpkg.json +++ b/ports/urdfdom/vcpkg.json @@ -1,9 +1,10 @@ { "name": "urdfdom", - "version": "1.0.4", - "port-version": 5, + "version": "3.1.0", "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.", "homepage": "https://github.com/ros/urdfdom", + "license": "BSD-3-Clause", + "supports": "!staticcrt", "dependencies": [ "console-bridge", "tinyxml", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 22569ef9d7fd5b..8657defe91c2b1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1121,7 +1121,6 @@ unicorn-lib:x64-uwp=fail unittest-cpp:arm64-windows=fail unittest-cpp:arm-uwp=fail unittest-cpp:x64-uwp=fail -urdfdom:x64-windows-static=fail usd:x86-windows=fail uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index c469996a8fee73..b7ea7b5fd9d9f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1813,8 +1813,8 @@ "port-version": 2 }, "dartsim": { - "baseline": "6.11.0", - "port-version": 3 + "baseline": "6.12.2", + "port-version": 0 }, "dataframe": { "baseline": "1.19.0", @@ -7337,12 +7337,12 @@ "port-version": 0 }, "urdfdom": { - "baseline": "1.0.4", - "port-version": 5 + "baseline": "3.1.0", + "port-version": 0 }, "urdfdom-headers": { - "baseline": "1.0.5", - "port-version": 2 + "baseline": "1.1.0", + "port-version": 0 }, "urho3d": { "baseline": "2021-03-01", diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index bea457455c3730..00c5eb62d7a377 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "887126d7800fe033a8e70bfa369e0b990434c921", + "version": "6.12.2", + "port-version": 0 + }, { "git-tree": "8b816d852610f6ef105eedc49bcbe6ae4881f759", "version": "6.11.0", diff --git a/versions/u-/urdfdom-headers.json b/versions/u-/urdfdom-headers.json index 149af41f3f0973..c3b80c1b1673d6 100644 --- a/versions/u-/urdfdom-headers.json +++ b/versions/u-/urdfdom-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd11423fb71779a21a08de42cc5e0486478ad959", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "557188bd804b7c57c882f39710ca21deb1b91db5", "version-string": "1.0.5", diff --git a/versions/u-/urdfdom.json b/versions/u-/urdfdom.json index 8c71cc56c88d86..391d13c438c248 100644 --- a/versions/u-/urdfdom.json +++ b/versions/u-/urdfdom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35eed492633e8ac2b137093a51d13ad325d9e7c5", + "version": "3.1.0", + "port-version": 0 + }, { "git-tree": "a74450532028f2079b8ea0b20bb82ded93e951d6", "version": "1.0.4", From 4614a12dd21e560ca2a8825ba35d0bb9967c7365 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 6 Aug 2022 08:15:45 +0200 Subject: [PATCH 315/791] [boost] Look for /Zi and other flags (#25863) * minor fixes to the boost build helper * v db * use the correct extra % instead of ' * v db * bump port-version * v db --- ports/boost-modular-build-helper/CMakeLists.txt | 17 +++++++++++++++-- ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 20859011a85665..280ec08e3f1f13 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -9,7 +9,7 @@ set(USER_CONFIG_TOOLSET_OPTIONS "") set(USER_CONFIG_EXTRA_LINES "") set(USER_CONFIG_REQUIREMENTS "") -set(B2_OPTIONS) +set(B2_OPTIONS "") include("${VCPKG_CMAKE_VARS_FILE}") @@ -106,7 +106,7 @@ if(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(JOIN libpath_args " " libpath_arg) string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") list(APPEND B2_OPTIONS windows-api=store) - list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) + list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) # TODO: Fix this; Probably should use a VCPKG_DETECTED_ variable and also be applied in the !store case endif() set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${VCPKG_DETECTED_CMAKE_CXX_COMPILER}\"") @@ -117,10 +117,23 @@ string(APPEND CFLAGS "${COMPILEFLAGS}") foreach(var CXXFLAGS CFLAGS LDFLAGS ARFLAGS) string(REPLACE [[\]] [[\\]] ${var} "${${var}}") string(REPLACE [["]] [[\"]] ${var} "${${var}}") + if(WIN32) + # env variables need extra %%var%% to be not expanded early + string(REGEX REPLACE [[(%[^%]+%)]] [[%\1%]] ${var} "${${var}}") + # remove PDB flag, until the pdb install rule of boost-build can be deactivated. + string(REGEX REPLACE "-PDB:[^ ]+" "" ${var} "${${var}}") + endif() string(REGEX REPLACE "[ \t\r\n]+" " " ${var} "${${var}}") string(STRIP "${${var}}" ${var}) endforeach() +if(CFLAGS MATCHES "-Zi" OR CXXFLAGS MATCHES "-Zi") + list(APPEND B2_OPTIONS + debug-store=database + pch=off + ) +endif() + if(USER_CONFIG_TOOLSET STREQUAL "msvc") file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) string(APPEND USER_CONFIG_TOOLSET_OPTIONS diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index c0a50275d121c0..526b1bd9ccc7bb 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.79.0", - "port-version": 6, + "port-version": 7, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 2ab40c85fc1f8e..3a0566c2f7199a 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cca1e2f883cfd638a53964027473a00e6b571e49", + "version": "1.79.0", + "port-version": 7 + }, { "git-tree": "9428ba48caa81512147423f26559c7a57b37e71b", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index b7ea7b5fd9d9f5..0731edadc0d31f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -842,7 +842,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 6 + "port-version": 7 }, "boost-move": { "baseline": "1.79.0", From dba0645e88e9673cc83dce57a65cbb82816198c1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 6 Aug 2022 08:25:53 +0200 Subject: [PATCH 316/791] [dlib] Fix pc file, cleanup, drop lib suffixes for MSVC (#25997) * Minor cleanup, drop debug postfix * Force finding packages without patch * Trim and rename dependencies patch * Fix pc file, disable MSVC config postfix * Disable random libwebp dependency * Update versions --- ports/dlib/fix-dependencies.patch | 80 +++++++++++++++++++++++ ports/dlib/fix-sqlite3-fftw-linkage.patch | 60 ----------------- ports/dlib/force_finding_packages.patch | 44 ------------- ports/dlib/portfile.cmake | 20 ++---- ports/dlib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/dlib.json | 5 ++ 7 files changed, 93 insertions(+), 119 deletions(-) create mode 100644 ports/dlib/fix-dependencies.patch delete mode 100644 ports/dlib/fix-sqlite3-fftw-linkage.patch delete mode 100644 ports/dlib/force_finding_packages.patch diff --git a/ports/dlib/fix-dependencies.patch b/ports/dlib/fix-dependencies.patch new file mode 100644 index 00000000000000..8077fd393fc66b --- /dev/null +++ b/ports/dlib/fix-dependencies.patch @@ -0,0 +1,80 @@ +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +index 9f3001d..962cfc4 100644 +--- a/dlib/CMakeLists.txt ++++ b/dlib/CMakeLists.txt +@@ -287,6 +287,7 @@ if (NOT TARGET dlib) + + set(dlib_needed_libraries) + set(dlib_needed_includes) ++ set(pkg_config_dlib_requires_private "") + + if (DLIB_ISO_CPP_ONLY) + add_library(dlib ${source_files} ) +@@ -814,6 +815,10 @@ if (NOT TARGET dlib) + + + if (DLIB_LINK_WITH_SQLITE3) ++ find_package(unofficial-sqlite3 CONFIG REQUIRED) ++ list(APPEND dlib_needed_libraries unofficial::sqlite3::sqlite3) ++ string(APPEND pkg_config_dlib_requires_private " sqlite3") ++ elseif(0) + find_library(sqlite sqlite3) + # make sure sqlite3.h is in the include path + find_path(sqlite_path sqlite3.h) +@@ -829,6 +834,10 @@ if (NOT TARGET dlib) + + + if (DLIB_USE_FFTW) ++ find_package(FFTW3 CONFIG REQUIRED) ++ list(APPEND dlib_needed_libraries FFTW3::fftw3) ++ string(APPEND pkg_config_dlib_requires_private " fftw3") ++ elseif(0) + find_library(fftw fftw3) + # make sure fftw3.h is in the include path + find_path(fftw_path fftw3.h) +@@ -964,6 +973,8 @@ if (NOT TARGET dlib) + + ## dlib-1.pc generation and installation + ++ string (REGEX REPLACE " m " " -lm " pkg_config_dlib_needed_libraries "${pkg_config_dlib_needed_libraries} ") ++ string (REGEX REPLACE "[^ ]*::[^ ]*" "" pkg_config_dlib_needed_libraries "${pkg_config_dlib_needed_libraries}") + configure_file("cmake_utils/dlib.pc.in" "dlib-1.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dlib-1.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +@@ -977,7 +988,7 @@ if (NOT TARGET dlib) + + endif() + +-if (MSVC) ++if (0) + # Give the output library files names that are unique functions of the + # visual studio mode that compiled them. We do this so that people who + # compile dlib and then copy the .lib files around (which they shouldn't be +diff --git a/dlib/cmake_utils/dlib.pc.in b/dlib/cmake_utils/dlib.pc.in +index 9060110..2ec27e8 100644 +--- a/dlib/cmake_utils/dlib.pc.in ++++ b/dlib/cmake_utils/dlib.pc.in +@@ -6,3 +6,4 @@ Description: Numerical and networking C++ library + Version: @VERSION@ + Libs: -L${libdir} -ldlib @pkg_config_dlib_needed_libraries@ + Cflags: -I${includedir} @pkg_config_dlib_needed_includes@ ++Requires.private: @pkg_config_dlib_requires_private@ +diff --git a/dlib/cmake_utils/dlibConfig.cmake.in b/dlib/cmake_utils/dlibConfig.cmake.in +index 2667a2e..cc7b4a2 100644 +--- a/dlib/cmake_utils/dlibConfig.cmake.in ++++ b/dlib/cmake_utils/dlibConfig.cmake.in +@@ -31,6 +31,14 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR) + unset(dlib_deps_threads_check) + endif() + ++include(CMakeFindDependencyMacro) ++if("@DLIB_USE_FFTW@") ++ find_dependency(FFTW3 CONFIG) ++endif() ++if("@DLIB_LINK_WITH_SQLITE3@") ++ find_dependency(unofficial-sqlite3 CONFIG) ++endif() ++ + set(dlib_LIBRARIES dlib::dlib) + set(dlib_LIBS dlib::dlib) + set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") diff --git a/ports/dlib/fix-sqlite3-fftw-linkage.patch b/ports/dlib/fix-sqlite3-fftw-linkage.patch deleted file mode 100644 index ddf86ced37ec13..00000000000000 --- a/ports/dlib/fix-sqlite3-fftw-linkage.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt -index 9f3001d..962cfc4 100644 ---- a/dlib/CMakeLists.txt -+++ b/dlib/CMakeLists.txt -@@ -814,32 +814,15 @@ if (NOT TARGET dlib) - - - if (DLIB_LINK_WITH_SQLITE3) -- find_library(sqlite sqlite3) -- # make sure sqlite3.h is in the include path -- find_path(sqlite_path sqlite3.h) -- if (sqlite AND sqlite_path) -- set(dlib_needed_includes ${dlib_needed_includes} ${sqlite_path}) -- set(dlib_needed_libraries ${dlib_needed_libraries} ${sqlite} ) -- else() -- set(DLIB_LINK_WITH_SQLITE3 OFF CACHE STRING ${DLIB_LINK_WITH_SQLITE3_STR} FORCE ) -- endif() -- mark_as_advanced(sqlite sqlite_path) -+ find_package(unofficial-sqlite3 CONFIG) -+ set(dlib_needed_libraries ${dlib_needed_libraries} unofficial::sqlite3::sqlite3) - endif() - - - - if (DLIB_USE_FFTW) -- find_library(fftw fftw3) -- # make sure fftw3.h is in the include path -- find_path(fftw_path fftw3.h) -- if (fftw AND fftw_path) -- set(dlib_needed_includes ${dlib_needed_includes} ${fftw_path}) -- set(dlib_needed_libraries ${dlib_needed_libraries} ${fftw} ) -- else() -- set(DLIB_USE_FFTW OFF CACHE STRING ${DLIB_USE_FFTW_STR} FORCE ) -- toggle_preprocessor_switch(DLIB_USE_FFTW) -- endif() -- mark_as_advanced(fftw fftw_path) -+ find_package(FFTW3 CONFIG) -+ set(dlib_needed_libraries ${dlib_needed_libraries} FFTW3::fftw3) - endif() - - -diff --git a/dlib/cmake_utils/dlibConfig.cmake.in b/dlib/cmake_utils/dlibConfig.cmake.in -index 2667a2e..cc7b4a2 100644 ---- a/dlib/cmake_utils/dlibConfig.cmake.in -+++ b/dlib/cmake_utils/dlibConfig.cmake.in -@@ -31,6 +31,14 @@ if(NOT TARGET dlib-shared AND NOT dlib_BINARY_DIR) - unset(dlib_deps_threads_check) - endif() - -+include(CMakeFindDependencyMacro) -+if("@DLIB_USE_FFTW@") -+ find_dependency(FFTW3 CONFIG) -+endif() -+if("@DLIB_LINK_WITH_SQLITE3@") -+ find_dependency(unofficial-sqlite3 CONFIG) -+endif() -+ - set(dlib_LIBRARIES dlib::dlib) - set(dlib_LIBS dlib::dlib) - set(dlib_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@" "@dlib_needed_includes@") diff --git a/ports/dlib/force_finding_packages.patch b/ports/dlib/force_finding_packages.patch deleted file mode 100644 index 558b75f1fe881d..00000000000000 --- a/ports/dlib/force_finding_packages.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/dlib/cmake_utils/find_libjpeg.cmake b/dlib/cmake_utils/find_libjpeg.cmake -index 3b9e656..d741f31 100644 ---- a/dlib/cmake_utils/find_libjpeg.cmake -+++ b/dlib/cmake_utils/find_libjpeg.cmake -@@ -14,7 +14,7 @@ if (DEFINED JPEG_FOUND) - return() - endif() - --find_package(JPEG QUIET) -+find_package(JPEG REQUIRED) - - if(JPEG_FOUND) - set(JPEG_TEST_CMAKE_FLAGS -@@ -31,7 +31,7 @@ if(JPEG_FOUND) - message (STATUS "Found system copy of libjpeg: ${JPEG_LIBRARY}") - if(NOT test_for_libjpeg_worked) - set(JPEG_FOUND 0) -- message (STATUS "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.") -+ message (FATAL_ERROR "System copy of libjpeg is broken or too old. Will build our own libjpeg and use that instead.") - endif() - endif() - -diff --git a/dlib/cmake_utils/find_libpng.cmake b/dlib/cmake_utils/find_libpng.cmake -index 1b35604..489a4c8 100644 ---- a/dlib/cmake_utils/find_libpng.cmake -+++ b/dlib/cmake_utils/find_libpng.cmake -@@ -14,7 +14,7 @@ if (DEFINED PNG_FOUND) - return() - endif() - --find_package(PNG QUIET) -+find_package(PNG REQUIRED) - - if(PNG_FOUND) - set(PNG_TEST_CMAKE_FLAGS -@@ -31,7 +31,7 @@ if(PNG_FOUND) - message (STATUS "Found system copy of libpng: ${PNG_LIBRARIES}") - if(NOT test_for_libpng_worked) - set(PNG_FOUND 0) -- message (STATUS "System copy of libpng is broken. Will build our own libpng and use that instead.") -+ message (FATAL_ERROR "System copy of libpng is broken. Will build our own libpng and use that instead.") - endif() - endif() - diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index bf78160381035f..2b8d56d31e1d94 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -7,19 +7,11 @@ vcpkg_from_github( SHA512 4bdcecdf0f986abc748245d21616bf2c304461e9a37572c66743f69141fc3f37eb846fdaedc6c910135d986534f7989cbcc52a884ae7a52464fbb2a07b16a327 HEAD_REF master PATCHES - fix-sqlite3-fftw-linkage.patch - force_finding_packages.patch + fix-dependencies.patch find_blas.patch ) -file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libjpeg") -file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/libpng") -file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external/zlib") - -# This fixes static builds; dlib doesn't pull in the needed transitive dependencies -file(READ "${SOURCE_PATH}/dlib/CMakeLists.txt" DLIB_CMAKE) -string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") -file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") +file(REMOVE_RECURSE "${SOURCE_PATH}/dlib/external") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -33,12 +25,14 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DDLIB_PNG_SUPPORT=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON -DDLIB_JPEG_SUPPORT=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=ON -DDLIB_USE_BLAS=ON -DDLIB_USE_LAPACK=ON -DDLIB_GIF_SUPPORT=OFF + -DDLIB_WEBP_SUPPORT=OFF -DDLIB_USE_MKL_FFT=OFF - -DCMAKE_DEBUG_POSTFIX=d OPTIONS_DEBUG -DDLIB_ENABLE_ASSERTS=ON #-DDLIB_ENABLE_STACK_TRACE=ON @@ -50,9 +44,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/dlib) vcpkg_fixup_pkgconfig() -# There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") # Remove other files not required in package file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/all") @@ -73,6 +67,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/dlib/external/libpng/arm") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "/* #undef ENABLE_ASSERTS */" "#if defined(_DEBUG)\n#define ENABLE_ASSERTS\n#endif") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dlib/config.h" "#define DLIB_DISABLE_ASSERTS" "#if !defined(_DEBUG)\n#define DLIB_DISABLE_ASSERTS\n#endif") -# Handle copyright file(INSTALL "${SOURCE_PATH}/dlib/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json index f059790a9db73d..bcfa9c0c9413f8 100644 --- a/ports/dlib/vcpkg.json +++ b/ports/dlib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dlib", "version": "19.24", + "port-version": 1, "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", "homepage": "https://github.com/davisking/dlib", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0731edadc0d31f..1f66e91314dc9d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1950,7 +1950,7 @@ }, "dlib": { "baseline": "19.24", - "port-version": 0 + "port-version": 1 }, "dmlc": { "baseline": "2019-08-12", diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index d4dae9563bed7f..78f7d41e1ebbd6 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "975dbde01f120a124488aae7930005b4b0409e58", + "version": "19.24", + "port-version": 1 + }, { "git-tree": "69c4335588e3785a09f580a40c128bf4d1bc5339", "version": "19.24", From c1f48cbfbec438dd18af27283c523c9ce139402e Mon Sep 17 00:00:00 2001 From: GPUCode <47210458+GPUCode@users.noreply.github.com> Date: Sat, 6 Aug 2022 09:33:42 +0300 Subject: [PATCH 317/791] [cryptopp]: Fix compilation with clang-cl (#26151) * cryptopp: Fix compilation with clang-cl * Add clang-cl 12.0+ to supported configurations * Use MSVC path to detect CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS * cryptopp: Update port version * cryptopp: Fix clang-cl SIMD flag detection * Patch CheckCompileLinkOption to use try_compile on all platforms * Use GNU path when detecing SSE options with clang-cl --- ports/cryptopp/cmake.patch | 48 ++++++++++++++++++++++++++++++++++++++ ports/cryptopp/patch.patch | 32 +++++++++++++++++++++---- ports/cryptopp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cryptopp.json | 5 ++++ 5 files changed, 82 insertions(+), 6 deletions(-) diff --git a/ports/cryptopp/cmake.patch b/ports/cryptopp/cmake.patch index b0839bca7e2f14..5fe607c863cffa 100644 --- a/ports/cryptopp/cmake.patch +++ b/ports/cryptopp/cmake.patch @@ -2,6 +2,43 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index fb43b95..c39e470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt +@@ -281,26 +281,6 @@ function(CheckCompileOption opt var) + endfunction(CheckCompileOption) + + function(CheckCompileLinkOption opt var prog) +- +- if (MSVC) +- +- # TODO: improve this... +- CHECK_CXX_COMPILER_FLAG(${opt} ${var}) +- +- elseif (APPLE) +- +- message(STATUS "Performing Test ${var}") +- try_compile(COMMAND_SUCCESS ${CMAKE_BINARY_DIR} ${prog} COMPILE_DEFINITIONS ${opt}) +- if (COMMAND_SUCCESS) +- set(${var} 1 PARENT_SCOPE) +- message(STATUS "Performing Test ${var} - Success") +- else () +- set(${var} 0 PARENT_SCOPE) +- message(STATUS "Performing Test ${var} - Failed") +- endif () +- +- else () +- + message(STATUS "Performing Test ${var}") + try_compile(COMMAND_SUCCESS ${CMAKE_BINARY_DIR} ${prog} COMPILE_DEFINITIONS ${opt}) + if (COMMAND_SUCCESS) +@@ -310,9 +290,6 @@ function(CheckCompileLinkOption opt var prog) + set(${var} 0 PARENT_SCOPE) + message(STATUS "Performing Test ${var} - Failed") + endif () +- +- endif () +- + endfunction(CheckCompileLinkOption) + + function(AddCompileOption opt) @@ -451,6 +451,10 @@ if (MSVC) endif() endif () @@ -13,6 +50,17 @@ index fb43b95..c39e470 100644 # Enable PIC for all target machines except 32-bit i386 due to register pressures. if (NOT CRYPTOPP_I386) SET(CMAKE_POSITION_INDEPENDENT_CODE 1) +@@ -605,8 +605,8 @@ endif () + # New as of Pull Request 461, http://github.com/weidai11/cryptopp/pull/461. + # Must use CMAKE_CXX_COMPILER here due to XLC 13.1 and LLVM front-end. + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR CMAKE_CXX_COMPILER MATCHES "xlC") +- +- if (CRYPTOPP_AMD64 OR CRYPTOPP_I386) ++ # If CMAKE_CXX_COMPILER_ID is Clang and MSVC is true then we are using clang-cl ++ if (CRYPTOPP_AMD64 OR CRYPTOPP_I386 OR MSVC) + + # For Darwin and a GCC port compiler, we need to check for -Wa,-q first. -Wa,-q + # is a GCC option, and it tells GCC to use the Clang Integrated Assembler. We @@ -1022,10 +1026,10 @@ endif () # add_compile_definitions added in CMake 3.12 if (${CMAKE_VERSION} VERSION_LESS "3.12") diff --git a/ports/cryptopp/patch.patch b/ports/cryptopp/patch.patch index c202564e9eab14..de8d7cd1b9ba55 100644 --- a/ports/cryptopp/patch.patch +++ b/ports/cryptopp/patch.patch @@ -1,8 +1,30 @@ -diff --git a/config_os.h b/config_os.h -index da27de22..9703f77d 100644 ---- a/config_os.h -+++ b/config_os.h -@@ -126,6 +126,7 @@ +diff --git a/config_cxx.h b/config_cxx.h +index 03153ba..6d9187d 100644 +--- a/config_cxx.h ++++ b/config_cxx.h +@@ -214,7 +214,7 @@ + // Also see https://github.com/weidai11/cryptopp/issues/980. I'm not sure what + // to do when the compiler defines __cpp_lib_uncaught_exceptions but the platform + // does not support std::uncaught_exceptions. What was Apple thinking??? +-#if defined(__clang__) ++#if defined(__clang__) && !defined(CRYPTOPP_MSC_VERSION) + # if __EXCEPTIONS && __has_feature(cxx_exceptions) + # if __cpp_lib_uncaught_exceptions >= 201411L + # define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1 +diff --git a/config_os.h b/config_os.h +index da27de22..9703f77d 100644 +--- a/config_os.h ++++ b/config_os.h +@@ -29,7 +29,7 @@ + // https://www.cryptopp.com/wiki/Release_Process#Self_Tests + // The problems with Clang pretending to be other compilers is + // discussed at http://github.com/weidai11/cryptopp/issues/147. +-#if (defined(_MSC_VER) && defined(__clang__) && \ ++#if (defined(_MSC_VER) && _MSC_VER < 1930 && defined(__clang__) && \ + !(defined( __clang_analyzer__)) && !defined(__INTEL_LLVM_COMPILER)) + # error: "Unsupported configuration" + #endif +@@ -126,6 +126,7 @@ #endif #ifdef CRYPTOPP_WIN32_AVAILABLE diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json index 02ffa51b16b412..7df521c850cdda 100644 --- a/ports/cryptopp/vcpkg.json +++ b/ports/cryptopp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cryptopp", "version": "8.6.0", + "port-version": 1, "description": "Crypto++ is a free C++ class library of cryptographic schemes.", "homepage": "https://github.com/weidai11/cryptopp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1f66e91314dc9d..0655df2ae1a3c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1730,7 +1730,7 @@ }, "cryptopp": { "baseline": "8.6.0", - "port-version": 0 + "port-version": 1 }, "cspice": { "baseline": "67", diff --git a/versions/c-/cryptopp.json b/versions/c-/cryptopp.json index 879c3d14c7264e..1baa4cdc868b53 100644 --- a/versions/c-/cryptopp.json +++ b/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d23fcfb280c3508aabac1d7e0f83440dcb8627f", + "version": "8.6.0", + "port-version": 1 + }, { "git-tree": "0d47535ac1767600626347e025079450a909c6ba", "version": "8.6.0", From 3cd26e8f4e1d70dd77032aeb8556256ed0d63975 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sat, 6 Aug 2022 09:34:13 +0300 Subject: [PATCH 318/791] [ace] Update to 7.0.8 (#26155) --- ports/ace/portfile.cmake | 30 +++++++----------------------- ports/ace/vcpkg.json | 3 +-- versions/a-/ace.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index a9312dcaafdc91..b9f735b69142f2 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,39 +1,23 @@ # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -set(ACE_VERSION 7.0.6) +set(ACE_VERSION 7.0.8) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS) - # Don't change to vcpkg_from_github! This points to a release and not an archive - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" - FILENAME ACE-TAO-${ACE_VERSION}.zip - SHA512 faef212f066263f9a87a688d105f15097f6b78fd77baf9e2b7da008027cd9ad0478b1f016892ee2d36fcb5aa6b14cc6fbb8fb906f018db6a1089820d522c65f9 - ) - else() - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" - FILENAME ACE-TAO-${ACE_VERSION}.tar.gz - SHA512 5d0bbeb1f729c3304637a15979303ba6efdbe52bb5d4ac73930fe9b86dbb73a5d74325476809863b26e1a3fc39a205d9d3a9909bce7bbdc5869de3e30f1bc317 - ) - endif() -else() - if(VCPKG_TARGET_IS_WINDOWS) # Don't change to vcpkg_from_github! This points to a release and not an archive vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" - FILENAME ACE-src-${ACE_VERSION}.zip - SHA512 91f35727afc652f537ce242eb0a9e10878b51b63f9c10f72bddd6491481f10eec5d9d8469f79da3b95adeab7d6848eb1e8bad4e43f61db63daf796a2cd205d61 + URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" + FILENAME ACE-TAO-${ACE_VERSION}.tar.gz + SHA512 deb84570a000c6bbd8d8debe6f2dd099ad446df00a80715fd536a551ceb253915d4fc4e7886657299e16909a89175f4c8fe0610c33a893396cb56399bede38ed ) - else() +else() + # Don't change to vcpkg_from_github! This points to a release and not an archive vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" FILENAME ACE-src-${ACE_VERSION}.tar.gz - SHA512 9770fab3552835803a93c9a234218c9dd961ecde67227ee92e0972cd2e2ff267147b255ab437453a887bc47b20f70c7a64efeada5dde5d3ea2cade54200e8354 + SHA512 80aac11ba99abade016b8532e8e67f752f383db3fa1cfcd79a78cad3713f69fb0ef5e9d0b3685f54de4114e0178fc367fa800aa29fd31b6c790b8d072d6a38c6 ) - endif() endif() vcpkg_extract_source_archive_ex( diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 3d2ff0a718eb64..625db7292c0808 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ace", - "version": "7.0.6", - "port-version": 3, + "version": "7.0.8", "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index b9dd64ebab2a00..7b07ce61be66ac 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a22887d1c18c9aa6dddf95aecf25c7595d071ca3", + "version": "7.0.8", + "port-version": 0 + }, { "git-tree": "d20fc0a9eac1744ff9fb5c5427eade58234e35c9", "version": "7.0.6", diff --git a/versions/baseline.json b/versions/baseline.json index 0655df2ae1a3c6..5d42d14b70b43a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -21,8 +21,8 @@ "port-version": 1 }, "ace": { - "baseline": "7.0.6", - "port-version": 3 + "baseline": "7.0.8", + "port-version": 0 }, "activemq-cpp": { "baseline": "3.9.5", From 5843d817ecb9b9a799ceb2180f2226cc8a740b3f Mon Sep 17 00:00:00 2001 From: Nursultan Zarlyk Date: Sat, 6 Aug 2022 08:35:40 +0200 Subject: [PATCH 319/791] [botan] Add arm64-windows support (#26156) * Fix botan:arm64-windows * Add version * Add no support for arm-uwp * Fix SHA for botan Co-authored-by: Nursultan Zarlyk --- ports/botan/arm64-windows.patch | 23 +++++++++++++++++++++++ ports/botan/portfile.cmake | 1 + ports/botan/vcpkg.json | 3 ++- versions/b-/botan.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ports/botan/arm64-windows.patch diff --git a/ports/botan/arm64-windows.patch b/ports/botan/arm64-windows.patch new file mode 100644 index 00000000000000..54f98b7a9dfb8b --- /dev/null +++ b/ports/botan/arm64-windows.patch @@ -0,0 +1,23 @@ +diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h +index 8cdaae2..54bb670 100644 +--- a/src/lib/utils/mul128.h ++++ b/src/lib/utils/mul128.h +@@ -39,10 +39,15 @@ namespace Botan { + #elif defined(BOTAN_BUILD_COMPILER_IS_MSVC) && defined(BOTAN_TARGET_CPU_HAS_NATIVE_64BIT) + + #include +-#pragma intrinsic(_umul128) +- +-#define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ ++#if defined(_M_ARM64) ++ #pragma intrinsic(__umulh) ++ #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ ++ do { *lo = a * b; *hi = __umulh(a, b); } while(0) ++#else ++ #pragma intrinsic(_umul128) ++ #define BOTAN_FAST_64X64_MUL(a,b,lo,hi) \ + do { *lo = _umul128(a, b, hi); } while(0) ++#endif + + #elif defined(BOTAN_USE_GCC_INLINE_ASM) + diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index dc8173601cf80e..ca6b08933690f5 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES fix-generate-build-path.patch embed-debug-info.patch + arm64-windows.patch ) if(CMAKE_HOST_WIN32) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index f75b557be47e3e..3fd59b31865a94 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,10 +1,11 @@ { "name": "botan", "version": "2.19.1", + "port-version": 1, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "license": "BSD-2-Clause", - "supports": "!(windows & arm)", + "supports": "!(arm & uwp)", "features": { "amalgamation": { "description": "Do an amalgamation build of the library" diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 7812086c6c9cd8..8dfe749eff510c 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46addf1e5297d40d351cf84d2a62d831592df1d1", + "version": "2.19.1", + "port-version": 1 + }, { "git-tree": "3fb61b05e32ed52193542dd9d5b86b7e2021dd99", "version": "2.19.1", diff --git a/versions/baseline.json b/versions/baseline.json index 5d42d14b70b43a..6e72df8c5a95a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1146,7 +1146,7 @@ }, "botan": { "baseline": "2.19.1", - "port-version": 0 + "port-version": 1 }, "box2d": { "baseline": "2.4.1", From 00413b753771679de6fcc97a8bf84d0f5ea9f0f6 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sat, 6 Aug 2022 08:46:37 +0200 Subject: [PATCH 320/791] [tree-sitter] add new port (#26058) * [tree-sitter] add new port * ci: test support for uwp * fixup: address review comments * chore: update git-version * fixup: skip removing non-existent binaries * refactor: patch the upstream pkgconfig instead * fixup: remove unnecessary vcpkg-cmake-wrapper this is only used for overriding CMake's builtins * Bump cmake_minimum_required Co-authored-by: Robert Schumacher * Fix version database Co-authored-by: Billy O'Neal Co-authored-by: Robert Schumacher --- ports/tree-sitter/CMakeLists.txt | 51 +++++++++++++++++++++++++++++++ ports/tree-sitter/pkgconfig.patch | 22 +++++++++++++ ports/tree-sitter/portfile.cmake | 30 ++++++++++++++++++ ports/tree-sitter/vcpkg.json | 17 +++++++++++ versions/baseline.json | 4 +++ versions/t-/tree-sitter.json | 9 ++++++ 6 files changed, 133 insertions(+) create mode 100644 ports/tree-sitter/CMakeLists.txt create mode 100644 ports/tree-sitter/pkgconfig.patch create mode 100644 ports/tree-sitter/portfile.cmake create mode 100644 ports/tree-sitter/vcpkg.json create mode 100644 versions/t-/tree-sitter.json diff --git a/ports/tree-sitter/CMakeLists.txt b/ports/tree-sitter/CMakeLists.txt new file mode 100644 index 00000000000000..b1cbe67712de7b --- /dev/null +++ b/ports/tree-sitter/CMakeLists.txt @@ -0,0 +1,51 @@ +cmake_minimum_required(VERSION 3.20) + +project( + tree-sitter + LANGUAGES C + VERSION 0.26.0 +) + +set(TS_SOVERSION_MAJOR 0) +set(TS_SOVERSION_MINOR 0) + +file(GLOB TS_SRC_FILES "${PROJECT_SOURCE_DIR}/src/*.c") +list(REMOVE_ITEM TS_SRC_FILES "${PROJECT_SOURCE_DIR}/src/lib.c") # skip amalgamation + +include(GNUInstallDirs) + +add_library(tree-sitter ${TS_SRC_FILES}) +target_include_directories( + tree-sitter + PRIVATE $ + PUBLIC $ + $) + +set_target_properties( + tree-sitter + PROPERTIES C_STANDARD 99 + C_STANDARD_REQUIRED ON + POSITION_INDEPENDENT_CODE ON + SOVERSION ${TS_SOVERSION_MAJOR}.${TS_SOVERSION_MINOR}) + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/tree-sitter.pc.in" + "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter.pc" @ONLY) + +install( + TARGETS tree-sitter + EXPORT unofficial-tree-sitter-config + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") + +install(FILES "${PROJECT_SOURCE_DIR}/include/tree_sitter/api.h" + "${PROJECT_SOURCE_DIR}/include/tree_sitter/parser.h" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/tree_sitter") + +install( + EXPORT unofficial-tree-sitter-config + NAMESPACE unofficial::tree-sitter:: + DESTINATION share/unofficial-tree-sitter) + +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tree-sitter.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") diff --git a/ports/tree-sitter/pkgconfig.patch b/ports/tree-sitter/pkgconfig.patch new file mode 100644 index 00000000000000..b75bbc10e8eea2 --- /dev/null +++ b/ports/tree-sitter/pkgconfig.patch @@ -0,0 +1,22 @@ +diff --git a/tree-sitter.pc.in b/lib/tree-sitter.pc.in +similarity index 61% +rename from tree-sitter.pc.in +rename to lib/tree-sitter.pc.in +index f98816cb..71a3b4f9 100644 +--- a/tree-sitter.pc.in ++++ b/lib/tree-sitter.pc.in +@@ -1,10 +1,10 @@ +-prefix=@PREFIX@ +-libdir=@LIBDIR@ +-includedir=@INCLUDEDIR@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++libdir=${prefix}@/lib ++includedir=${prefix}/include + + Name: tree-sitter + Description: An incremental parsing system for programming tools + URL: https://tree-sitter.github.io/ +-Version: @VERSION@ ++Version: @PROJECT_VERSION@ + Libs: -L${libdir} -ltree-sitter + Cflags: -I${includedir} diff --git a/ports/tree-sitter/portfile.cmake b/ports/tree-sitter/portfile.cmake new file mode 100644 index 00000000000000..5714aed7213461 --- /dev/null +++ b/ports/tree-sitter/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tree-sitter/tree-sitter + REF ccd6bf554d922596ce905730d98a77af368bba5c #v0.26.0 + SHA512 ab7eeecafc9d7d17093e25479903fa8c77a84ce4c3a41d737d49bcf9348ab6cc55cf3d6cce0229781292c2b05342fbf45641e40545ea3fde09e441e02f2cdb83 + HEAD_REF master + PATCHES pkgconfig.patch +) + +# currently not supported upstream +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/lib") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/lib" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-tree-sitter") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tree-sitter/vcpkg.json b/ports/tree-sitter/vcpkg.json new file mode 100644 index 00000000000000..6d166f2bd0c22a --- /dev/null +++ b/ports/tree-sitter/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "tree-sitter", + "version-semver": "0.26.0", + "description": "An incremental parsing system for programming tools.", + "homepage": "https://github.com/tree-sitter/tree-sitter", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6e72df8c5a95a5..e61f944286996a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7240,6 +7240,10 @@ "baseline": "0.8.0", "port-version": 4 }, + "tree-sitter": { + "baseline": "0.26.0", + "port-version": 0 + }, "treehh": { "baseline": "3.16", "port-version": 0 diff --git a/versions/t-/tree-sitter.json b/versions/t-/tree-sitter.json new file mode 100644 index 00000000000000..1a33a261d05c87 --- /dev/null +++ b/versions/t-/tree-sitter.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a912cc848f08c05d9cbd87e24e47194b0ad43bd6", + "version-semver": "0.26.0", + "port-version": 0 + } + ] +} From c567729cbcb61eadc874813b92088fb1ff9a3cd4 Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Sat, 6 Aug 2022 10:47:19 +0400 Subject: [PATCH 321/791] [magic-enum] Update to v0.8.1 (#26166) * [magic-enum] Update to v0.8.1 * vcpkg x-add-version magic-enum --- ports/magic-enum/portfile.cmake | 4 ++-- ports/magic-enum/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/magic-enum.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/magic-enum/portfile.cmake b/ports/magic-enum/portfile.cmake index 27108907457123..0ea6fc111972a3 100644 --- a/ports/magic-enum/portfile.cmake +++ b/ports/magic-enum/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/magic_enum - REF v0.8.0 - SHA512 097260c234a1b716d26b537cd80a8d3eca255422e8dce46183708a27b1d4ad1d81c6be05f1b7d300db3362eafa243cccc39c9d12f1bcbfdb0d7755701a222808 + REF v0.8.1 + SHA512 97b14ddfa2fec4b582f4658cea96f61510b3eb1f367d770a642136ffbaf7e5d87e6a8c950f7ac6af47cc605899d0ff8e2b9c71a19a28ad1dfaa724f003339edc HEAD_REF master ) diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json index 642141ff753b0c..3fc2b956d952ab 100644 --- a/ports/magic-enum/vcpkg.json +++ b/ports/magic-enum/vcpkg.json @@ -1,6 +1,6 @@ { "name": "magic-enum", - "version": "0.8.0", + "version": "0.8.1", "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", "homepage": "https://github.com/Neargye/magic_enum", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index e61f944286996a..4d0146dccb471b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4433,7 +4433,7 @@ "port-version": 0 }, "magic-enum": { - "baseline": "0.8.0", + "baseline": "0.8.1", "port-version": 0 }, "magic-get": { diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 445bc5af81e967..e39e687e286845 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c67da42e72855b5d2d5d72d570fafb3a1149fa01", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "2b170feb45c6c04a727f51a40d65fd01b5f0afdc", "version": "0.8.0", From 05d00352101430bc42920947253d0535e321ca1c Mon Sep 17 00:00:00 2001 From: Daniil Goncharov Date: Sat, 6 Aug 2022 10:47:46 +0400 Subject: [PATCH 322/791] [nameof] Update to 0.10.2 (#26168) * [nameof] Update to 0.10.2 * vcpkg x-add-version nameof * modernization * overwrite-version * license * overwrite-version * fix review * overwrite-version --- ports/nameof/portfile.cmake | 17 ++++++++--------- ports/nameof/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/n-/nameof.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/nameof/portfile.cmake b/ports/nameof/portfile.cmake index 52230b40783804..4b4ba12fce7548 100644 --- a/ports/nameof/portfile.cmake +++ b/ports/nameof/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/nameof - REF v0.10.1 - SHA512 9b3ed7a3f5dcf1ad309341102d2aaa07fc8e9d6db7e08e42c2d9b5453c822ec16d6c6910adf7c4af8879c4084cac362f4fb4c07559cc49594b72b4917816ef5d + REF v0.10.2 + SHA512 1ec508378d12eb4a65da1bee8011302f65e78bbcab82aae716afc673665af5283a5aae5f1d0de85c7d6f59bb7268e02fc01b171f50de26bb86dc27c3b46097fa HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNAMEOF_OPT_BUILD_EXAMPLES=OFF -DNAMEOF_OPT_BUILD_TESTS=OFF -DNAMEOF_OPT_INSTALL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nameof TARGET_PATH share/nameof) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/nameof/vcpkg.json b/ports/nameof/vcpkg.json index 78bce0d8e056a8..47f997a2dac88b 100644 --- a/ports/nameof/vcpkg.json +++ b/ports/nameof/vcpkg.json @@ -1,7 +1,17 @@ { "name": "nameof", - "version-string": "0.10.1", - "port-version": 1, + "version": "0.10.2", "description": "Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum.", - "homepage": "https://github.com/Neargye/nameof" + "homepage": "https://github.com/Neargye/nameof", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4d0146dccb471b..05943f54f14870 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4821,8 +4821,8 @@ "port-version": 3 }, "nameof": { - "baseline": "0.10.1", - "port-version": 1 + "baseline": "0.10.2", + "port-version": 0 }, "nana": { "baseline": "1.7.4", diff --git a/versions/n-/nameof.json b/versions/n-/nameof.json index 2bce04d6369903..9db7ec0e2c5c8e 100644 --- a/versions/n-/nameof.json +++ b/versions/n-/nameof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6e74d9d06b8f8982ecfbad4b07e5215c8ea054b", + "version": "0.10.2", + "port-version": 0 + }, { "git-tree": "73b076af7e5bb74d8531885c3172ccdea74bce80", "version-string": "0.10.1", From 73cdecc07ae1e5b0b0b038459dfba551304e5b7e Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 5 Aug 2022 23:48:10 -0700 Subject: [PATCH 323/791] [azure-core-tracing-opentelemetry-cpp] Update to 1.0.0-beta.3 (#26176) ## 1.0.0-beta.3 (2022-08-04) ### Other Changes - Removed hard dependency on `opentelemetry-cpp` package version. --- .../3844.patch | 22 ------------------- .../portfile.cmake | 6 ++--- .../vcpkg.json | 3 +-- .../azure-core-tracing-opentelemetry-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 ports/azure-core-tracing-opentelemetry-cpp/3844.patch diff --git a/ports/azure-core-tracing-opentelemetry-cpp/3844.patch b/ports/azure-core-tracing-opentelemetry-cpp/3844.patch deleted file mode 100644 index 39874cc5af0c82..00000000000000 --- a/ports/azure-core-tracing-opentelemetry-cpp/3844.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e1fd9ed9f476fc94f4143df6ba8b683113af33ed Mon Sep 17 00:00:00 2001 -From: Larry Osterman -Date: Fri, 22 Jul 2022 11:37:48 -0700 -Subject: [PATCH] Removed hard dependency on opentelemetry version - ---- - sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt -index bf3077e676..6d0dc15151 100644 ---- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt -+++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt -@@ -36,7 +36,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) - find_package(azure-core-cpp REQUIRED) - endif() - endif() -- find_package(opentelemetry-cpp "1.3.0" CONFIG REQUIRED) -+ find_package(opentelemetry-cpp CONFIG REQUIRED) - - set( - AZURE_CORE_OPENTELEMETRY_HEADER diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake index e0a091319d1047..f333cffe3dc77b 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake +++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -1,10 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core-tracing-opentelemetry_1.0.0-beta.2 - SHA512 a0697ed440a08f3814013adf476c2a1333b462a2eb96bac18c47939c54686396639935568e229dad6bbbae06f54c324da82544634c6384a2c1498f9959836b6d - PATCHES - "3844.patch" # https://github.com/Azure/azure-sdk-for-cpp/pull/3844 "Removed hard dependency on opentelemetry version" + REF azure-core-tracing-opentelemetry_1.0.0-beta.3 + SHA512 184c275cdbea0384b7f5e26258828101f7cf5b6e376305e396201c7f43676f04583d8095f42d79e417a479eab0f2042b0603cfac381ab044049fa3a92c53df5d ) vcpkg_cmake_configure( diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json index 1afd086ae4e4ff..631965ec6fc302 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json +++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-core-tracing-opentelemetry-cpp", - "version-semver": "1.0.0-beta.2", - "port-version": 1, + "version-semver": "1.0.0-beta.3", "description": [ "Microsoft Azure Core Tracing OpenTelemetry SDK for C++", "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs." diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json index 819909b76e1ec9..18ef57de324f55 100644 --- a/versions/a-/azure-core-tracing-opentelemetry-cpp.json +++ b/versions/a-/azure-core-tracing-opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6c807cb48e2dcdd3ed49e058822402cf1c71d79", + "version-semver": "1.0.0-beta.3", + "port-version": 0 + }, { "git-tree": "e0228c8ec49e7dbde7c7044c915945425ce5092d", "version-semver": "1.0.0-beta.2", diff --git a/versions/baseline.json b/versions/baseline.json index 05943f54f14870..f47a916f878636 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -329,8 +329,8 @@ "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { - "baseline": "1.0.0-beta.2", - "port-version": 1 + "baseline": "1.0.0-beta.3", + "port-version": 0 }, "azure-identity-cpp": { "baseline": "1.3.0", From b74f8f68b4181ece784fb4236abbdb4b09c232f5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 6 Aug 2022 08:48:36 +0200 Subject: [PATCH 324/791] [arrow] fix build with clang-cl (#26182) * arrow: fix build with clang-cl and some minor fixes * v db --- ports/arrow/portfile.cmake | 10 ++++++---- ports/arrow/vcpkg.json | 7 +++++-- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 4ba5cc9a7a9bf3..b0439310759c3a 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -38,15 +38,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS cuda ARROW_CUDA ) -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) -elseif("jemalloc" IN_LIST FEATURES) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + list(APPEND FEATURE_OPTIONS "-DARROW_USE_NATIVE_INT128=OFF") +endif() + +if("jemalloc" IN_LIST FEATURES) set(MALLOC_OPTIONS -DARROW_JEMALLOC=ON) else() set(MALLOC_OPTIONS -DARROW_JEMALLOC=OFF) endif() -if(VCPKG_TARGET_IS_WINDOWS AND ("mimalloc" IN_LIST FEATURES)) +if("mimalloc" IN_LIST FEATURES) set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=ON) else() set(MALLOC_OPTIONS ${MALLOC_OPTIONS} -DARROW_MIMALLOC=OFF) diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 803cd858e3e545..6cdd7c5e4ed1a9 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arrow", "version": "8.0.1", + "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -64,7 +65,8 @@ ] }, "jemalloc": { - "description": "jemalloc allocator" + "description": "jemalloc allocator", + "supports": "!windows" }, "json": { "description": "JSON support", @@ -73,7 +75,8 @@ ] }, "mimalloc": { - "description": "mimalloc allocator" + "description": "mimalloc allocator", + "supports": "windows" }, "orc": { "description": "ORC support", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index b5cc28fad790cd..a8ea48212f258b 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d53797d201548a07be19eaf7d12d87198c458636", + "version": "8.0.1", + "port-version": 1 + }, { "git-tree": "6935bb6b1a309931f2f85bd8da334b9777d51a4a", "version": "8.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index f47a916f878636..9fe5dffd2d83d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -178,7 +178,7 @@ }, "arrow": { "baseline": "8.0.1", - "port-version": 0 + "port-version": 1 }, "ashes": { "baseline": "2022-06-08", From 493fa222076bce23f288439452fe284f7e38a069 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 6 Aug 2022 08:48:52 +0200 Subject: [PATCH 325/791] [graphene] fix clang-cl build (#26183) * graphene fix build with clang-cl * v db --- ports/graphene/fix_clang-cl.patch | 40 +++++++++++++++++++++++++++++++ ports/graphene/portfile.cmake | 2 ++ ports/graphene/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/graphene.json | 5 ++++ 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 ports/graphene/fix_clang-cl.patch diff --git a/ports/graphene/fix_clang-cl.patch b/ports/graphene/fix_clang-cl.patch new file mode 100644 index 00000000000000..0b71ea3bbbe479 --- /dev/null +++ b/ports/graphene/fix_clang-cl.patch @@ -0,0 +1,40 @@ +diff --git a/meson.build b/meson.build +index 1a93dbb95..2f5f7c891 100644 +--- a/meson.build ++++ b/meson.build +@@ -55,7 +55,7 @@ conf = configuration_data() + common_cflags = [] + common_ldflags = [] + +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + # Make MSVC more pedantic, this is a recommended pragma list + # from _Win32_Programming_ by Rector and Newcomer. Taken from + # glib's msvc_recommended_pragmas.h--please see that file for +@@ -117,7 +117,7 @@ endif + common_cflags = cc.get_supported_arguments(test_cflags) + + # MSVC: Let C4819 error out if we do not have the -utf-8 compiler flag +-if cc.get_id() == 'msvc' ++if cc.get_argument_syntax() == 'msvc' + if not common_cflags.contains('-utf-8') + common_cflags += cc.get_supported_arguments('-we4819') + endif +@@ -202,7 +202,7 @@ if get_option('default_library') != 'static' + if host_system == 'windows' + conf.set('DLL_EXPORT', true) + conf.set('_GRAPHENE_PUBLIC', '__declspec(dllexport) extern') +- if cc.get_id() != 'msvc' ++ if cc.get_argument_syntax() != 'msvc' + extra_args += ['-fvisibility=hidden'] + endif + else +@@ -226,7 +226,7 @@ if get_option('gobject_types') + ) + build_gobject = gobject.found() + if build_gobject +- if cc.get_id() == 'msvc' ++ if cc.get_argument_syntax() == 'msvc' + extra_args += ['/FImsvc_recommended_pragmas.h'] + endif + endif diff --git a/ports/graphene/portfile.cmake b/ports/graphene/portfile.cmake index 8b50663679bb62..2c16cdbc5b7c69 100644 --- a/ports/graphene/portfile.cmake +++ b/ports/graphene/portfile.cmake @@ -10,6 +10,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + fix_clang-cl.patch ) vcpkg_configure_meson( diff --git a/ports/graphene/vcpkg.json b/ports/graphene/vcpkg.json index f34bcb79961d21..01f0cb6f78acba 100644 --- a/ports/graphene/vcpkg.json +++ b/ports/graphene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphene", "version": "1.10.2", - "port-version": 2, + "port-version": 3, "description": "A thin layer of types for graphic libraries.", "homepage": "https://www.gtk.org/", "supports": "!(arm & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index 9fe5dffd2d83d9..3bc4e680dd6139 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2682,7 +2682,7 @@ }, "graphene": { "baseline": "1.10.2", - "port-version": 2 + "port-version": 3 }, "graphicsmagick": { "baseline": "1.3.37", diff --git a/versions/g-/graphene.json b/versions/g-/graphene.json index 9a023fe39a2d73..c41e87db1bfdd6 100644 --- a/versions/g-/graphene.json +++ b/versions/g-/graphene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a55f155dd8a61f69cfd04bc85fcbb7bba5efcaed", + "version": "1.10.2", + "port-version": 3 + }, { "git-tree": "35d8f02c154c44312abd824ba408d52855dbf138", "version": "1.10.2", From 1a5244ef8b34dcd056fa8a47c0d4fb8a38b0f054 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 6 Aug 2022 08:50:01 +0200 Subject: [PATCH 326/791] [Luasocket] fix builds without pdbs (#26185) * luasocket: only rename pdbs if they exist * v db --- ports/luasocket/portfile.cmake | 16 ++++++++++++---- ports/luasocket/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/luasocket.json | 5 +++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ports/luasocket/portfile.cmake b/ports/luasocket/portfile.cmake index a951dcdad208fc..2b08c476903f09 100644 --- a/ports/luasocket/portfile.cmake +++ b/ports/luasocket/portfile.cmake @@ -23,15 +23,23 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/luasocket/LICENSE" "${CURRENT_PACKAGE if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # Handle socket dll name file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/bin/socket/core.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb") + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/socket/core.pdb") + endif() file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/socket/socket.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/socket/core.pdb") + endif() # Handle mime dll name file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/bin/mime/core.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb") + if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/bin/mime/core.pdb") + endif() file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.dll") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/mime/mime.core.pdb" "${CURRENT_PACKAGES_DIR}/debug/bin/mime/core.pdb") + endif() endif() # Allow empty include directory diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json index 269310c791f9d8..c8a6525690f4da 100644 --- a/ports/luasocket/vcpkg.json +++ b/ports/luasocket/vcpkg.json @@ -1,6 +1,7 @@ { "name": "luasocket", "version": "3.0.0", + "port-version": 1, "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.", "homepage": "https://lunarmodules.github.io/luasocket/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 3bc4e680dd6139..010b46610046f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4406,7 +4406,7 @@ }, "luasocket": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "lunasvg": { "baseline": "2.3.1", diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json index d7a4594a125125..fcddb746f7cd84 100644 --- a/versions/l-/luasocket.json +++ b/versions/l-/luasocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4e4099cfa80585c7df33b66e37580cea982e83d", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "2f809809d4b061b2579f41521b20a7c4a0992558", "version": "3.0.0", From 49bafb98670a6d52d2da3e00c754bd930dba0fd7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 5 Aug 2022 23:51:35 -0700 Subject: [PATCH 327/791] [gdk-pixbuf] Enable build in CI. (#26207) https://dev.azure.com/vcpkg/public/_build/results?buildId=76107 PASSING, REMOVE FROM FAIL LIST: gdk-pixbuf:x64-windows-static (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8657defe91c2b1..f37d24eb85f3a2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -270,7 +270,6 @@ ftgl:arm-uwp=fail functions-framework-cpp:x64-uwp=fail gazebo:x64-linux=fail -gdk-pixbuf:x64-windows-static=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip gsoap:x86-windows = skip From f3e60821bce97524d6c65979b914207a2c3c6960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 6 Aug 2022 06:57:32 +0000 Subject: [PATCH 328/791] [vcpkg baseline][libcaer] Disable parallel configure (#26180) * [vcpkg baseline][libcaer] Disable parallel configure * version * version * version --- ports/libcaer/portfile.cmake | 23 ++++++++++++----------- ports/libcaer/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libcaer.json | 5 +++++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ports/libcaer/portfile.cmake b/ports/libcaer/portfile.cmake index 109b423972c90d..5cc697d5edf6c5 100644 --- a/ports/libcaer/portfile.cmake +++ b/ports/libcaer/portfile.cmake @@ -1,18 +1,19 @@ vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com/inivation/ - OUT_SOURCE_PATH SOURCE_PATH - REPO dv/libcaer - REF 933dfa60a138091afb03014f8c24183bab7bba4e - SHA512 6e74e308833ca3c923b318a42bab30edb04f763cdd5b243701416b72278d7315fdd8a62ebb87b704212507f76c3e45bc9728df17ea2d1eab5133dfcf550c8c35 - HEAD_REF master + GITLAB_URL https://gitlab.com/inivation/ + OUT_SOURCE_PATH SOURCE_PATH + REPO dv/libcaer + REF 933dfa60a138091afb03014f8c24183bab7bba4e + SHA512 6e74e308833ca3c923b318a42bab30edb04f763cdd5b243701416b72278d7315fdd8a62ebb87b704212507f76c3e45bc9728df17ea2d1eab5133dfcf550c8c35 + HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DENABLE_OPENCV=ON - -DEXAMPLES_INSTALL=OFF - -DBUILD_CONFIG_VCPKG=ON + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DENABLE_OPENCV=ON + -DEXAMPLES_INSTALL=OFF + -DBUILD_CONFIG_VCPKG=ON ) vcpkg_cmake_install() diff --git a/ports/libcaer/vcpkg.json b/ports/libcaer/vcpkg.json index e2801c57c73f2b..7518099fa91452 100644 --- a/ports/libcaer/vcpkg.json +++ b/ports/libcaer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libcaer", "version-date": "2022-07-25", + "port-version": 1, "description": "Minimal C library to access, configure and get data from neuromorphic sensors and processors.", "homepage": "https://gitlab.com/inivation/dv/libcaer", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 010b46610046f8..5dd075faa9168e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3506,7 +3506,7 @@ }, "libcaer": { "baseline": "2022-07-25", - "port-version": 0 + "port-version": 1 }, "libcanberra": { "baseline": "0.30", diff --git a/versions/l-/libcaer.json b/versions/l-/libcaer.json index ef505c428f1728..0fc607cb742d39 100644 --- a/versions/l-/libcaer.json +++ b/versions/l-/libcaer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd2fc3b1a8232d4d15ab248ce77f379e825296a3", + "version-date": "2022-07-25", + "port-version": 1 + }, { "git-tree": "7b5ee918213a05dc43d5e7f3eb33b2961609c430", "version-date": "2022-07-25", From b939b6a8dac88c4dc33122f9d50d5ffbf02dbd96 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 6 Aug 2022 14:58:44 +0800 Subject: [PATCH 329/791] [ffmpeg] Fix prefix detection (#26163) --- ports/ffmpeg/portfile.cmake | 2 +- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 47296865a3e640..f9aa7247c504af 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -461,7 +461,7 @@ endif() set(OPTIONS_CROSS " --enable-cross-compile") # ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling. -if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "(/.+)gcc$") +if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$") string(APPEND OPTIONS_CROSS " --cross-prefix=${CMAKE_MATCH_1}") endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 4d1444cfbc2e2c..b183bbac0bf6a6 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 14, + "port-version": 15, "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." diff --git a/versions/baseline.json b/versions/baseline.json index 5dd075faa9168e..c4f4134c280da3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2250,7 +2250,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 14 + "port-version": 15 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 7579ec1bf4305c..5bebae04402092 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d42747aed3213bf6d62a4a986fb915bdfd854a08", + "version": "4.4.1", + "port-version": 15 + }, { "git-tree": "bd232549fb2bcffed0dcfac1e7e6a54f5a91b5cc", "version": "4.4.1", From d87009a62b1959c3fa1fb30245ae49da42d38700 Mon Sep 17 00:00:00 2001 From: Arsen Tufankjian Date: Sat, 6 Aug 2022 00:04:01 -0700 Subject: [PATCH 330/791] [vulkan-headers] Updating port to latest version (#26194) * Updating vulkan headers to latest * Formatting manifest * Updating version --- ports/vulkan-headers/portfile.cmake | 6 +++--- ports/vulkan-headers/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vulkan-headers.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index 45b6eddf9a9c8b..64f31c6d01e902 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers - REF 52a76fd0a693708eb8c25bd0ab7a1008091f64d4 #v1.2.203 - SHA512 e3a337f0f1d0d003db522385b40ed187416e2246e64718b7d980ecdd92ac400a9e96b06dbb52c6f09cf7725772b5772727efb61c0e2f3a67989fe693fa569d38 - HEAD_REF master + REF 2b55157592bf4c639b76cc16d64acaef565cc4b5 + SHA512 f1ea894ebc16d05d03addacba1e4dbd67fb5963d0fc4c084725bca5fb4e944eb7c46ef54febca8dd1530d36e9c8633001ba37ba3c24023a8d0391d030ca66ebe + HEAD_REF v1.3.224 ) # This must be vulkan as other vulkan packages expect it there. diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index 72f26304519bcc..b9b32fa7779b0a 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version": "1.2.203", + "version": "1.3.224", "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers" } diff --git a/versions/baseline.json b/versions/baseline.json index c4f4134c280da3..5c5a7ee8e22351 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7553,7 +7553,7 @@ "port-version": 2 }, "vulkan-headers": { - "baseline": "1.2.203", + "baseline": "1.3.224", "port-version": 0 }, "vulkan-hpp": { diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index e1f1052545357a..c8bff9bd2f8f44 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91d99bf9fe3492ffda0fbb13befda47b00ae388a", + "version": "1.3.224", + "port-version": 0 + }, { "git-tree": "b5192b1575959f03e204edc4712351461b6a2c23", "version": "1.2.203", From 674ea1427e923011c74fa1d8021833e85c7f3eca Mon Sep 17 00:00:00 2001 From: Arsen Tufankjian Date: Sat, 6 Aug 2022 00:04:23 -0700 Subject: [PATCH 331/791] [spirv-headers] Updating to latest version (#26196) * Updating spirv-headers version * Updating spirv-headers version --- ports/spirv-headers/portfile.cmake | 4 ++-- ports/spirv-headers/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spirv-headers.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/spirv-headers/portfile.cmake b/ports/spirv-headers/portfile.cmake index 272746438deca3..dd4ba975806ffc 100644 --- a/ports/spirv-headers/portfile.cmake +++ b/ports/spirv-headers/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Headers - REF sdk-1.3.204.1 - SHA512 ef994e0a5232cb21377ed39ef6a941b59eb45524f1d78092a6476245e4e0fb692780e98f5cc2176fdc2fd95430cce523fa376b0eed97042523b5f14a0586955f + REF sdk-1.3.216.0 + SHA512 951715cf62a643bfce6a3854f2206b95dd65e60b27355a2f290e829da0f06e19877e9dfcbf53f455b8a0524fb851a851742f3e16bb29be2f470cd62d3a8fc8f0 HEAD_REF master ) diff --git a/ports/spirv-headers/vcpkg.json b/ports/spirv-headers/vcpkg.json index ff5cf7cf86289c..64e7fc879693a6 100644 --- a/ports/spirv-headers/vcpkg.json +++ b/ports/spirv-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-headers", - "version": "1.3.204.1", + "version": "1.3.216.0", "description": "Machine-readable files for the SPIR-V Registry", "homepage": "https://github.com/KhronosGroup/SPIRV-Headers" } diff --git a/versions/baseline.json b/versions/baseline.json index 5c5a7ee8e22351..54d5851c1fafc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6813,7 +6813,7 @@ "port-version": 2 }, "spirv-headers": { - "baseline": "1.3.204.1", + "baseline": "1.3.216.0", "port-version": 0 }, "spirv-reflect": { diff --git a/versions/s-/spirv-headers.json b/versions/s-/spirv-headers.json index 99267955d99c89..db313aa0a874a8 100644 --- a/versions/s-/spirv-headers.json +++ b/versions/s-/spirv-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b17fe28f5ada58a1a3e1435c20d59410b82e501", + "version": "1.3.216.0", + "port-version": 0 + }, { "git-tree": "2b51afa759a0312e325533a909418ed5b7803cda", "version": "1.3.204.1", From 778c58db3b718a962ac72ad7b2e70c9fbce52ee0 Mon Sep 17 00:00:00 2001 From: Arsen Tufankjian Date: Sat, 6 Aug 2022 00:04:35 -0700 Subject: [PATCH 332/791] [spirv-tools] Updating port from 2022.1 to 2022.2 (#26197) * Updating spirv-tools port * Updating spirv-tools port version --- ports/spirv-tools/portfile.cmake | 4 ++-- ports/spirv-tools/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spirv-tools.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/spirv-tools/portfile.cmake b/ports/spirv-tools/portfile.cmake index 3997af9ef9883b..bfb5f13108e150 100644 --- a/ports/spirv-tools/portfile.cmake +++ b/ports/spirv-tools/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/SPIRV-Tools - REF v2022.1 - SHA512 19ff4386c74c15f9b870d5348b76c7d643da5bf1637b1faed153d9ec9f00de941a83a22782f169b4aa5001c715721937c3bb3bc07541a60e503a0455a1d2287e + REF v2022.2 + SHA512 027819bb68a3cb42f086cab8089e0fe0b2ebcf40607811c6848d7d9f412ed3c977498d32dc7e37b828d0e6eb6924878e7c975c461fc5b171142a4ee1da2c1caa ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/spirv-tools/vcpkg.json b/ports/spirv-tools/vcpkg.json index 01d71eb66c1c8e..49b5581f479ac6 100644 --- a/ports/spirv-tools/vcpkg.json +++ b/ports/spirv-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spirv-tools", - "version": "2022.1", + "version": "2022.2", "description": "API and commands for processing SPIR-V modules", "homepage": "https://github.com/KhronosGroup/SPIRV-Tools", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 54d5851c1fafc7..578d829f736e5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6821,7 +6821,7 @@ "port-version": 0 }, "spirv-tools": { - "baseline": "2022.1", + "baseline": "2022.2", "port-version": 0 }, "spix": { diff --git a/versions/s-/spirv-tools.json b/versions/s-/spirv-tools.json index 7d6a5510b407a5..79ee76f3386540 100644 --- a/versions/s-/spirv-tools.json +++ b/versions/s-/spirv-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "337e34849b8c1c574890350394069279f1a0ccad", + "version": "2022.2", + "port-version": 0 + }, { "git-tree": "459985359177e0c0774ac341db9721650499844b", "version": "2022.1", From 9b22b40c6c61bf0da2d46346dd44a11e90972cc9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 6 Aug 2022 09:16:14 +0200 Subject: [PATCH 333/791] [gts] fix build with clang-cl (#26184) * gts fix dllexport definitions. * v db * Revert trailing whitespace addition. Co-authored-by: Billy O'Neal --- ports/gts/fix-dllexport_2.patch | 13 +++++++++++++ ports/gts/fix_missing_extern.patch | 13 +++++++++++++ ports/gts/portfile.cmake | 4 ++-- ports/gts/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gts.json | 5 +++++ 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 ports/gts/fix-dllexport_2.patch create mode 100644 ports/gts/fix_missing_extern.patch diff --git a/ports/gts/fix-dllexport_2.patch b/ports/gts/fix-dllexport_2.patch new file mode 100644 index 00000000000000..52ad11cce6c983 --- /dev/null +++ b/ports/gts/fix-dllexport_2.patch @@ -0,0 +1,13 @@ +diff --git a/src/gts.h b/src/gts.h +index 1b76915..ae1d888 100644 +--- a/src/gts.h ++++ b/src/gts.h +@@ -38,7 +38,7 @@ extern "C" { + * we prefix variable declarations so they can + * properly get exported in windows dlls. + */ +-#ifdef NATIVE_WIN32 ++#if 1 + # ifdef GTS_COMPILATION + # define GTS_C_VAR __declspec(dllexport) + # else /* not GTS_COMPILATION */ diff --git a/ports/gts/fix_missing_extern.patch b/ports/gts/fix_missing_extern.patch new file mode 100644 index 00000000000000..0e798c48efbeda --- /dev/null +++ b/ports/gts/fix_missing_extern.patch @@ -0,0 +1,13 @@ +diff --git a/src/gts.h b/src/gts.h +index 1b7691531..1e87167bc 100644 +--- a/src/gts.h ++++ b/src/gts.h +@@ -40,7 +40,7 @@ extern "C" { + */ + #if 1 + # ifdef GTS_COMPILATION +-# define GTS_C_VAR __declspec(dllexport) ++# define GTS_C_VAR extern __declspec(dllexport) + # else /* not GTS_COMPILATION */ + # define GTS_C_VAR extern __declspec(dllimport) + # endif /* not GTS_COMPILATION */ diff --git a/ports/gts/portfile.cmake b/ports/gts/portfile.cmake index 62613257e719b7..2f31dcd49af0ad 100644 --- a/ports/gts/portfile.cmake +++ b/ports/gts/portfile.cmake @@ -1,7 +1,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(patches fix-dllexport.patch) -else() - set(patches "") +elseif(VCPKG_TARGET_IS_WINDOWS) + set(patches fix-dllexport_2.patch fix_missing_extern.patch) endif() vcpkg_from_sourceforge( diff --git a/ports/gts/vcpkg.json b/ports/gts/vcpkg.json index d97f553c2fc442..3b5549f3aa1e3e 100644 --- a/ports/gts/vcpkg.json +++ b/ports/gts/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gts", "version": "0.7.6", - "port-version": 6, + "port-version": 7, "description": "3D surfaces meshed with interconnected triangles", "homepage": "http://gts.sourceforge.net/", "supports": "!osx", diff --git a/versions/baseline.json b/versions/baseline.json index 578d829f736e5a..78c7090499d296 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2750,7 +2750,7 @@ }, "gts": { "baseline": "0.7.6", - "port-version": 6 + "port-version": 7 }, "guetzli": { "baseline": "2020-09-14", diff --git a/versions/g-/gts.json b/versions/g-/gts.json index 42db7d7326b119..dbd92b12773896 100644 --- a/versions/g-/gts.json +++ b/versions/g-/gts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bce412085edcd46e3f358cca2c3bb1cffb25cfa", + "version": "0.7.6", + "port-version": 7 + }, { "git-tree": "fbe5bc5629f2ec46a083b4e861589cae5b559c5f", "version": "0.7.6", From 8da0ddec984be0100b91df0205562932695feeca Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 8 Aug 2022 05:54:05 +0200 Subject: [PATCH 334/791] [tree-sitter] fix typo in version number (#26209) --- ports/tree-sitter/CMakeLists.txt | 2 +- ports/tree-sitter/portfile.cmake | 2 +- ports/tree-sitter/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tree-sitter.json | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/tree-sitter/CMakeLists.txt b/ports/tree-sitter/CMakeLists.txt index b1cbe67712de7b..aef0bddb6177ba 100644 --- a/ports/tree-sitter/CMakeLists.txt +++ b/ports/tree-sitter/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.20) project( tree-sitter LANGUAGES C - VERSION 0.26.0 + VERSION 0.20.6 ) set(TS_SOVERSION_MAJOR 0) diff --git a/ports/tree-sitter/portfile.cmake b/ports/tree-sitter/portfile.cmake index 5714aed7213461..46ec95667b88c3 100644 --- a/ports/tree-sitter/portfile.cmake +++ b/ports/tree-sitter/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tree-sitter/tree-sitter - REF ccd6bf554d922596ce905730d98a77af368bba5c #v0.26.0 + REF ccd6bf554d922596ce905730d98a77af368bba5c #v0.20.6 SHA512 ab7eeecafc9d7d17093e25479903fa8c77a84ce4c3a41d737d49bcf9348ab6cc55cf3d6cce0229781292c2b05342fbf45641e40545ea3fde09e441e02f2cdb83 HEAD_REF master PATCHES pkgconfig.patch diff --git a/ports/tree-sitter/vcpkg.json b/ports/tree-sitter/vcpkg.json index 6d166f2bd0c22a..935489c48e3bdb 100644 --- a/ports/tree-sitter/vcpkg.json +++ b/ports/tree-sitter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tree-sitter", - "version-semver": "0.26.0", + "version-semver": "0.20.6", "description": "An incremental parsing system for programming tools.", "homepage": "https://github.com/tree-sitter/tree-sitter", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 78c7090499d296..5b9a6da961f267 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7241,7 +7241,7 @@ "port-version": 4 }, "tree-sitter": { - "baseline": "0.26.0", + "baseline": "0.20.6", "port-version": 0 }, "treehh": { diff --git a/versions/t-/tree-sitter.json b/versions/t-/tree-sitter.json index 1a33a261d05c87..a12eb6b52d8499 100644 --- a/versions/t-/tree-sitter.json +++ b/versions/t-/tree-sitter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a96085943d7eb28c30fa8d53eb5452e4dccdfd93", + "version-semver": "0.20.6", + "port-version": 0 + }, { "git-tree": "a912cc848f08c05d9cbd87e24e47194b0ad43bd6", "version-semver": "0.26.0", From 75260879edfd87345260cd913f4f065c399253d1 Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Mon, 8 Aug 2022 05:57:41 +0200 Subject: [PATCH 335/791] [eve] Update to latest version (#26173) * Updated EVE ports * Added versions changes * Fix date in eve ports Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update versions * Fix version database. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy O'Neal --- ports/eve/portfile.cmake | 6 +++--- ports/eve/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/e-/eve.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/eve/portfile.cmake b/ports/eve/portfile.cmake index 621fe8a3ccef58..ffa8b990ef1a8b 100644 --- a/ports/eve/portfile.cmake +++ b/ports/eve/portfile.cmake @@ -3,9 +3,9 @@ message(WARNING "EVE requires a C++ 20 compliant compiler. GCC-11 and clang-12 a vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jfalcou/eve - REF v2021.10.0 - SHA512 bdac483d07c968cfe2cd2e0f26df68f0e3b6cd83fbfe4b89650dc58fb534fd37c5540682283a2ee29a82e87bdfc678beac3651e40cde5b4cf30c20ea8304c72c - HEAD_REF master + REF v2022.03.0 + SHA512 9ca2cb69a179bf05046696ba83a1cea4e558a0a883ca1d664effc2564e07123f631fc3885256d0dede09c8ec10b23a3feca0ec19ed9c73000cf698384ab4663d + HEAD_REF main ) vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") diff --git a/ports/eve/vcpkg.json b/ports/eve/vcpkg.json index 24d27832a9e825..9c1348f7d80ffa 100644 --- a/ports/eve/vcpkg.json +++ b/ports/eve/vcpkg.json @@ -1,9 +1,10 @@ { "name": "eve", - "version-date": "2021-10-16", + "version-date": "2022-03-15", "description": "EVE - the Expressive Vector Engine", "homepage": "https://github.com/jfalcou/eve", - "documentation": "https://jfalcou.github.io/eve/html/pages.html", + "documentation": "https://jfalcou.github.io/eve/", + "license": "MIT", "supports": "!windows", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 5b9a6da961f267..5d86054f8692e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2133,7 +2133,7 @@ "port-version": 1 }, "eve": { - "baseline": "2021-10-16", + "baseline": "2022-03-15", "port-version": 0 }, "eventpp": { diff --git a/versions/e-/eve.json b/versions/e-/eve.json index 8b4b6b2b3bce18..a1c8e52f0f1645 100644 --- a/versions/e-/eve.json +++ b/versions/e-/eve.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "017b4485d7d6330770a47783a7e8f9fe7216c454", + "version-date": "2022-03-15", + "port-version": 0 + }, { "git-tree": "95251169868c628e8099f89d14671ef946fd918d", "version-date": "2021-10-16", From 137dd8ec8f81009aa2d8cf0dad576ba33876b26a Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 9 Aug 2022 02:14:37 +0800 Subject: [PATCH 336/791] [tree-sitter] Remove the invalid records (#26224) --- versions/t-/tree-sitter.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/t-/tree-sitter.json b/versions/t-/tree-sitter.json index a12eb6b52d8499..9e57b626e1ca20 100644 --- a/versions/t-/tree-sitter.json +++ b/versions/t-/tree-sitter.json @@ -4,11 +4,6 @@ "git-tree": "a96085943d7eb28c30fa8d53eb5452e4dccdfd93", "version-semver": "0.20.6", "port-version": 0 - }, - { - "git-tree": "a912cc848f08c05d9cbd87e24e47194b0ad43bd6", - "version-semver": "0.26.0", - "port-version": 0 } ] } From 8c23fb816f70f862bbed51fb936ec723f4d6f597 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 9 Aug 2022 02:53:28 +0800 Subject: [PATCH 337/791] [expected-lite] update to v0.6.2 (#26225) * [expected-lite] update to v0.6.2 * update version --- ports/expected-lite/portfile.cmake | 4 ++-- ports/expected-lite/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/expected-lite.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/expected-lite/portfile.cmake b/ports/expected-lite/portfile.cmake index a0fffa756df87a..2e4b119c408dd7 100644 --- a/ports/expected-lite/portfile.cmake +++ b/ports/expected-lite/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/expected-lite - REF v0.6.0 - SHA512 83b6b1ab2f1683aede5b9d00798f821299a1e78ab10d4d321c3def0d1d4be25f0f9fd244530715408940fc36c1dff7d635861cf52f10f7dbd3b975840150c121 + REF 95b9cb015fa17baa749c2b396b335906e1596a9e # v0.6.2 + SHA512 f4d46daf45d857137d9b026fdeac3101c7707868aa133b696ee3c5cfc208ea402c71db73882eeece0c2eb6271ee06495c7afde4eefb20de0a98ad9bc5727dc35 HEAD_REF master ) diff --git a/ports/expected-lite/vcpkg.json b/ports/expected-lite/vcpkg.json index 4111de4fd926b8..faa68b9b094985 100644 --- a/ports/expected-lite/vcpkg.json +++ b/ports/expected-lite/vcpkg.json @@ -1,6 +1,6 @@ { "name": "expected-lite", - "version": "0.6.0", + "version": "0.6.2", "description": "Expected objects in C++11 and later in a single-file header-only library", "homepage": "https://github.com/martinmoene/expected-lite", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5d86054f8692e5..a8e0c515aac5db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2153,7 +2153,7 @@ "port-version": 1 }, "expected-lite": { - "baseline": "0.6.0", + "baseline": "0.6.2", "port-version": 0 }, "exprtk": { diff --git a/versions/e-/expected-lite.json b/versions/e-/expected-lite.json index 2107de2fea2be1..54293e66de505c 100644 --- a/versions/e-/expected-lite.json +++ b/versions/e-/expected-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c8f107476fb8d2afc13ab7b743b31d1e07ea5cd", + "version": "0.6.2", + "port-version": 0 + }, { "git-tree": "2b0c1f8e0fb5c88c9e3a98018d767c0e99997d94", "version": "0.6.0", From e4eb7d6d5f78225c9c13cdb6a47381bff8547f09 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Tue, 9 Aug 2022 02:54:00 +0800 Subject: [PATCH 338/791] [glad] update to v0.1.36 (#26227) * [glad] update to v0.1.36 * update version * update * overwrite version --- ports/glad/portfile.cmake | 8 +++++--- ports/glad/vcpkg.json | 9 +++++---- versions/baseline.json | 4 ++-- versions/g-/glad.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/glad/portfile.cmake b/ports/glad/portfile.cmake index f37f873c8cb42c..a64bb54112a996 100644 --- a/ports/glad/portfile.cmake +++ b/ports/glad/portfile.cmake @@ -3,10 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dav1dde/glad - REF 7ece538856bf124d798ab323c8e1e64ebb83cb50 - SHA512 f6a8ba7d0d09b89c23b6f76962d3e6eef1babc8e1a659e238d30e143eb33ccba424957e5a6d46d99a714bfa2967523b193586d0ff24e29ad8d86c92c9faf9c02 + REF 1ecd45775d96f35170458e6b148eb0708967e402 # 0.1.36 + SHA512 f6292e9dbce503a95b6eca927a90cf8a06f5e3de39b84f9a47e0d9273a6ea3f6591a64d35f2e33b5ea353e0c784f15c38579fc15aa6c5b180154e241ccbb16fe HEAD_REF master - PATCHES encoding.patch find_python.patch + PATCHES + encoding.patch + find_python.patch ) if(NOT GLAD_PROFILE) diff --git a/ports/glad/vcpkg.json b/ports/glad/vcpkg.json index 2be2bd2a13c502..dec813399b2374 100644 --- a/ports/glad/vcpkg.json +++ b/ports/glad/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glad", - "version": "0.1.34", - "port-version": 3, + "version": "0.1.36", "description": "Multi-Language Vulkan/GL/GLES/EGL/GLX/WGL Loader-Generator based on the official specs.", "homepage": "https://github.com/Dav1dde/glad", "documentation": "https://github.com/Dav1dde/glad/wiki", @@ -341,13 +340,15 @@ ] }, "glx": { - "description": "Use `glx` spec instead of `gl`. Only available with the X Window System." + "description": "Use `glx` spec instead of `gl`. Only available with the X Window System.", + "supports": "!(windows | uwp)" }, "loader": { "description": "Generate loader logic." }, "wgl": { - "description": "Use `wgl` spec instead of `gl`. Only available for Windows and UWP platforms." + "description": "Use `wgl` spec instead of `gl`. Only available for Windows and UWP platforms.", + "supports": "!(linux | osx)" } } } diff --git a/versions/baseline.json b/versions/baseline.json index a8e0c515aac5db..8e6603789a8b94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2573,8 +2573,8 @@ "port-version": 4 }, "glad": { - "baseline": "0.1.34", - "port-version": 3 + "baseline": "0.1.36", + "port-version": 0 }, "glbinding": { "baseline": "3.1.0", diff --git a/versions/g-/glad.json b/versions/g-/glad.json index a0c3aed4d8fa7a..052be36f860953 100644 --- a/versions/g-/glad.json +++ b/versions/g-/glad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa93b14c1581057e1d14650f5f15c9b0757dd548", + "version": "0.1.36", + "port-version": 0 + }, { "git-tree": "2ebf6ed85a860c74f8649571e168900426cbb944", "version": "0.1.34", From f44ee28a2da7d21aa23361db0f29bfb280e465f3 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 8 Aug 2022 11:54:50 -0700 Subject: [PATCH 339/791] [azure-storage-blobs-cpp] Update to 12.5.0 (#26222) ## 12.5.0 (2022-08-08) ### Features Added - Features in `12.5.0.beta1` and `12.5.0.beta2` are now generally available. --- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 4 ++-- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 3b69597be3cb00..8aba22e22b4917 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.4.0 - SHA512 8d60970d0eff794cfcb6fb8471e7b0086cd8620072845195f67ae2fe2a7e1ecdaf21f10a80a708c981afa3589115f0fd2477a8c398d06b66b4babcd49f0c4c9a + REF azure-storage-blobs_12.5.0 + SHA512 84553588dae919691bd5548c8957d0f3a98cddc8d8879f7dc6d2aa4c06661e2fa5de8c77cb9ca7517cb2024fc3d7433933d3f34b5bc7225ee4855cbf4f3548df ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 2847c101f2ad8b..f253d39633fd1c 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.4.0", + "version-semver": "12.5.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.3" + "version>=": "12.2.4" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 1fb64da9763b79..be74490a02215c 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7120a5be966cbf0a79ac6c1efca6ce43c7818d75", + "version-semver": "12.5.0", + "port-version": 0 + }, { "git-tree": "ff9783605f383c1f596ada3a10d2dde88a931f56", "version-semver": "12.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8e6603789a8b94..a663c4167d98bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -365,7 +365,7 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.4.0", + "baseline": "12.5.0", "port-version": 0 }, "azure-storage-common-cpp": { From 3c2ab5f8e29435642ddf4e3dfa2fa8d3c3dd3f19 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Mon, 8 Aug 2022 14:55:07 -0400 Subject: [PATCH 340/791] [DiscordCoreAPI] Update to version 2022-08-07 (#26216) * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! * Updates! --- ports/discordcoreapi/portfile.cmake | 4 ++-- ports/discordcoreapi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 594c4a4c0487e2..29820ca10a6e23 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF b2e9be0f8f4475b0907dbe07d98b22e40ba8c933 - SHA512 979b4fbaf325b060607dd5af7300b2815b2d9df8ccdbf825cf70261276af4882aafaee09ddb4eb060c0f7ec8cccd23f28d8b8c69cf7eb7b267af164698a2bcfa + REF c54811cbf735edb3661470aa0b487b94f715a929 + SHA512 52b2a66efa8b1d54c8a72caefd3d9e88515fce29726401216c36343e83f594035c424ae2b4293fb6b7b9d610cf8a3550a666f32b62105c73f30b6702673c66fb HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 0d5356b482a084..8ee3856063da13 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version-date": "2022-07-05", + "version-date": "2022-08-07", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "AGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index a663c4167d98bd..d35eb4c323e813 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1929,7 +1929,7 @@ "port-version": 1 }, "discordcoreapi": { - "baseline": "2022-07-05", + "baseline": "2022-08-07", "port-version": 0 }, "discount": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 2c0727a54bafe7..6ca382cc52a200 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3519d6dd1dc6918b16f9c9679c23a12ae673456", + "version-date": "2022-08-07", + "port-version": 0 + }, { "git-tree": "81b6a00219f65e2ccabcf1330b132f1c2fdbc361", "version-date": "2022-07-05", From fe8bfdaa063a3a89861047bb01b453c8b3a48819 Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Mon, 8 Aug 2022 14:55:26 -0400 Subject: [PATCH 341/791] [azmq] update to v1.0.3 (#26212) * Update azmq to v1.0.3 * Clarify version in comment --- ports/azmq/portfile.cmake | 4 ++-- ports/azmq/vcpkg.json | 3 +-- versions/a-/azmq.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/azmq/portfile.cmake b/ports/azmq/portfile.cmake index c2d333f608e321..3e1c73683bf157 100644 --- a/ports/azmq/portfile.cmake +++ b/ports/azmq/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/azmq - REF 6bb101eecb357ad9735ebc36e276b7526652d42d # commit on 2019-05-01 - SHA512 18812fd73c3c57aca8b17c2df0af01afb7864253d6ac6ce042e01ef04e81dd454438c9d01f5bb0fd7a4a445082a2eb3dd334ca1e05dafbe4ba602cad95ce7134 + REF 7da2fd0a1b2bd4e6f50ccd17d54579e6084ef1f7 # v1.0.3 + SHA512 3f6b07fab9345c7506a46d7418eb672e1ee28a72bb02914ee1f945b3c41090d94722079469359664232e9688beac4e354e49d99711fc5b0bd1d6f7936ed62a3c HEAD_REF master ) diff --git a/ports/azmq/vcpkg.json b/ports/azmq/vcpkg.json index 6344423fa7ca8e..12dacac0ef88b4 100644 --- a/ports/azmq/vcpkg.json +++ b/ports/azmq/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azmq", - "version-string": "2020-03-03", - "port-version": 1, + "version": "1.0.3", "description": [ "Boost Asio style bindings for ZeroMQ", "This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular.", diff --git a/versions/a-/azmq.json b/versions/a-/azmq.json index 350ac34d51fb7d..d29dbb5862f3d8 100644 --- a/versions/a-/azmq.json +++ b/versions/a-/azmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c4381f52a268bbf8084db2b1684ad740d3e4408", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "a82754fa9f38845c88912eb424dbfc718a155fe7", "version-string": "2020-03-03", diff --git a/versions/baseline.json b/versions/baseline.json index d35eb4c323e813..fcbe083a651c71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -317,8 +317,8 @@ "port-version": 1 }, "azmq": { - "baseline": "2020-03-03", - "port-version": 1 + "baseline": "1.0.3", + "port-version": 0 }, "azure-c-shared-utility": { "baseline": "2022-01-21", From 88f70923c9b012b145123cd41946c6f6cf2e1c73 Mon Sep 17 00:00:00 2001 From: Fawdlstty Date: Tue, 9 Aug 2022 02:55:40 +0800 Subject: [PATCH 342/791] [libfv] update libfv version to v0.0.8 (#26210) * update libfv version * run vcpkg x-add-version --all --- ports/fawdlstty-libfv/portfile.cmake | 4 ++-- ports/fawdlstty-libfv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fawdlstty-libfv.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/fawdlstty-libfv/portfile.cmake b/ports/fawdlstty-libfv/portfile.cmake index 868d11aee129f6..f5eed2bd228c11 100644 --- a/ports/fawdlstty-libfv/portfile.cmake +++ b/ports/fawdlstty-libfv/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fawdlstty/libfv - REF v0.0.6 - SHA512 0fdc947cc7035f4218259810ba4a2c951cd45a510daa9cf98caccfbb184808ea76af916db55cac662127a981e8b9c3db76149b6ec1748778728cff98d3f396a2 + REF v0.0.8 + SHA512 66071db541269de9793c643fba6154d1743b047ac32486067207c88d61b706e81266ce365a5c96c203a1cea0ec4e406927d8a8df1e047bb8b9218cf741dae4f1 HEAD_REF master ) diff --git a/ports/fawdlstty-libfv/vcpkg.json b/ports/fawdlstty-libfv/vcpkg.json index 210dfeb69f5f22..c3c8f00a5120c3 100644 --- a/ports/fawdlstty-libfv/vcpkg.json +++ b/ports/fawdlstty-libfv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fawdlstty-libfv", - "version": "0.0.6", + "version": "0.0.8", "description": "libfv is C++20 header-only network library, support TCP/SSL/Http/websocket server and client", "homepage": "https://github.com/fawdlstty/libfv", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index fcbe083a651c71..50479eff97e081 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2225,7 +2225,7 @@ "port-version": 0 }, "fawdlstty-libfv": { - "baseline": "0.0.6", + "baseline": "0.0.8", "port-version": 0 }, "fbgemm": { diff --git a/versions/f-/fawdlstty-libfv.json b/versions/f-/fawdlstty-libfv.json index 8abc3ba842fa80..9420ff483a52bf 100644 --- a/versions/f-/fawdlstty-libfv.json +++ b/versions/f-/fawdlstty-libfv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d91c20aee1a33a221803e6e89147f751e3b78549", + "version": "0.0.8", + "port-version": 0 + }, { "git-tree": "f763fa0612d3a1416497c810a16cdcac36936822", "version": "0.0.6", From bea0562dbbc5d5d4ca6adaf0d85246fa2148e536 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Mon, 8 Aug 2022 12:01:04 -0700 Subject: [PATCH 343/791] [minio-cpp] chore(version): updated to v0.1.0 (#26145) --- ports/minio-cpp/fix_cmake_file.patch | 12 ------------ ports/minio-cpp/portfile.cmake | 7 +++---- ports/minio-cpp/vcpkg.json | 10 +++++++--- versions/baseline.json | 2 +- versions/m-/minio-cpp.json | 5 +++++ 5 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 ports/minio-cpp/fix_cmake_file.patch diff --git a/ports/minio-cpp/fix_cmake_file.patch b/ports/minio-cpp/fix_cmake_file.patch deleted file mode 100644 index f4f6d95b417714..00000000000000 --- a/ports/minio-cpp/fix_cmake_file.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6df202c..98eeeb0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -114,6 +114,6 @@ else (DOXYGEN_FOUND) - message("Doxygen need to be installed to generate the doxygen documentation") - endif (DOXYGEN_FOUND) - - configure_file(miniocpp.pc.in miniocpp.pc @ONLY) --install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) -+install(FILES ${CMAKE_BINARY_DIR}/miniocpp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - diff --git a/ports/minio-cpp/portfile.cmake b/ports/minio-cpp/portfile.cmake index 1fe1394579d2f0..31c508bb42d74f 100644 --- a/ports/minio-cpp/portfile.cmake +++ b/ports/minio-cpp/portfile.cmake @@ -1,16 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO minio/minio-cpp - REF 0847e56f31e13d32c924029d5ffaa865f8396462 - SHA512 47817c8acc92060afca5ebd7c9bc7c9a9e09a50046180d7d3d67993f207d295c90e491417702ebb1ab2b0a6e85a5fcc334054ce4f6d542cb42c3675b5aed1c3f + REF v0.1.0 + SHA512 40442ff91e2894945425cbfc21bbd7448201a454c36bea84ffcfee70ab5a71c18e0948f7a1c5453205b7199914fa8fa820f53961c8262cd4fdf646470846f65e HEAD_REF main - PATCHES - fix_cmake_file.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DBUILD_DOC=OFF -DBUILD_EXAMPLES=OFF ) diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json index ce272682456c7d..d68ad770eb5918 100644 --- a/ports/minio-cpp/vcpkg.json +++ b/ports/minio-cpp/vcpkg.json @@ -1,10 +1,14 @@ { "name": "minio-cpp", - "version-date": "2022-01-03", - "description": "MinIO C++ Client SDK for Amazon S3 Compatible Cloud Storage", - "supports": "!uwp", + "version": "0.1.0", + "description": "The MinIO C++ Client SDK provides simple APIs to access any Amazon S3 compatible object storage", + "homepage": "https://github.com/minio/minio-cpp", + "license": "Apache-2.0", + "supports": "!windows & !osx & !uwp", "dependencies": [ "curlpp", + "inih", + "nlohmann-json", "openssl", "pugixml", { diff --git a/versions/baseline.json b/versions/baseline.json index 50479eff97e081..498839f5ba4121 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4617,7 +4617,7 @@ "port-version": 0 }, "minio-cpp": { - "baseline": "2022-01-03", + "baseline": "0.1.0", "port-version": 0 }, "minisat-master-keying": { diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index 66dde1213cdbc1..52fe9c55d5bc4a 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e406e5f0c1d14b66ad6e58c91d122ca0d01df04c", + "version": "0.1.0", + "port-version": 0 + }, { "git-tree": "0b0fe1b9353fd016b3f2e3212ae30a7a82b71ceb", "version-date": "2022-01-03", From 82da19b3693b3b76588c5d206d2f1ddd037f659a Mon Sep 17 00:00:00 2001 From: Florian Albrechtskirchinger Date: Mon, 8 Aug 2022 21:07:58 +0200 Subject: [PATCH 344/791] [pdal] Prepare for nlohmann-json 3.11.x (#26206) * [pdal] Prepare for nlohmann-json 3.11.x In nlohmann-json 3.11.0, json_fwd.hpp changed. Replace PDAL's internal copy of the file as part of the de-vendoring process. * [pdal] Bump port version * [pdal] Add dependency nlohmann-json * [pdal] Update versions --- ports/pdal/portfile.cmake | 4 ++++ ports/pdal/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/p-/pdal.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 1a297c56c5f552..c06472fb705cd9 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -23,10 +23,14 @@ endforeach() file(REMOVE_RECURSE "${SOURCE_PATH}/vendor/nanoflann" "${SOURCE_PATH}/vendor/nlohmann" + "${SOURCE_PATH}/pdal/JsonFwd.hpp" ) file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nanoflann.hpp" DESTINATION "${SOURCE_PATH}/vendor/nanoflann") file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json.hpp" DESTINATION "${SOURCE_PATH}/vendor/nlohmann/nlohmann") file(APPEND "${SOURCE_PATH}/vendor/nlohmann/nlohmann/json.hpp" "namespace NL = nlohmann;\n") +file(INSTALL "${CURRENT_INSTALLED_DIR}/include/nlohmann/json_fwd.hpp" DESTINATION "${SOURCE_PATH}/pdal") +file(RENAME "${SOURCE_PATH}/pdal/json_fwd.hpp" "${SOURCE_PATH}/pdal/JsonFwd.hpp") +file(APPEND "${SOURCE_PATH}/pdal/JsonFwd.hpp" "namespace NL = nlohmann;\n") unset(ENV{OSGEO4W_HOME}) diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 2dc6a4e36b441e..42ce602696a25c 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pdal", "version": "2.4.0", + "port-version": 1, "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, @@ -17,6 +18,7 @@ "libgeotiff", "libxml2", "nanoflann", + "nlohmann-json", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 498839f5ba4121..4493cbd024fd07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5446,7 +5446,7 @@ }, "pdal": { "baseline": "2.4.0", - "port-version": 0 + "port-version": 1 }, "pdal-c": { "baseline": "2.1", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 8e3fa6214ff164..a47ab6d0720c95 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c5321217b19b80c58854e9cd2141633e00c0fc7", + "version": "2.4.0", + "port-version": 1 + }, { "git-tree": "674fea8cc4044272fef94a061252c4aeb4e6373c", "version": "2.4.0", From 30619e717ab9ca7bf9e4af03fdfd6b7a2b71b0ac Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Mon, 8 Aug 2022 21:08:40 +0200 Subject: [PATCH 345/791] [libsrt] Update to 1.5.0 (#26219) * [libsrt] Update port to 1.5.0 * Remove unnecessary port-version and ci.baseline.txt entries. Co-authored-by: Billy O'Neal --- ports/libsrt/portfile.cmake | 22 +++++++++++----------- ports/libsrt/vcpkg.json | 8 ++++++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 ++-- versions/l-/libsrt.json | 5 +++++ 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index 35ebd06543b88d..e033691d71d777 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -1,19 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Haivision/srt - REF v1.4.4 - SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA + REF v1.5.0 + SHA512 68ab5fe316cfbbbba31b5b2354f657e23c90e14674f8dac01df2bf98c4776a7fafcd690a4dfad3a340e6be577a22360ca04ef2397c8a0dd507adebdd54dc22fb HEAD_REF master PATCHES fix-dependency-install.patch ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(BUILD_DYNAMIC ON) - set(BUILD_STATIC OFF) -else() - set(BUILD_DYNAMIC OFF) - set(BUILD_STATIC ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -24,8 +19,9 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DENABLE_SHARED=${BUILD_DYNAMIC} - -DENABLE_STATIC=${BUILD_STATIC} + -DENABLE_CXX11=ON + -DENABLE_SHARED=${KEYSTONE_BUILD_STATIC} + -DENABLE_STATIC=${KEYSTONE_BUILD_SHARED} -DENABLE_UNITTESTS=OFF -DUSE_OPENSSL_PC=OFF ) @@ -36,4 +32,8 @@ vcpkg_fixup_pkgconfig() 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/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index 02de23beb7f5b9..e152d4a0ba26c1 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,15 +1,19 @@ { "name": "libsrt", - "version": "1.4.4", - "port-version": 2, + "version": "1.5.0", "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", + "license": "MPL-2.0", "supports": "!uwp", "dependencies": [ "openssl", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f37d24eb85f3a2..d2c2bf6d99efb7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -515,8 +515,6 @@ libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail libspatialite:arm-uwp=fail libspatialite:x64-uwp=fail -libsrt:arm-uwp=fail -libsrt:x64-uwp=fail libssh:arm64-windows=fail libssh:arm-uwp=fail libssh:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 4493cbd024fd07..6e6db4f2e52471 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4117,8 +4117,8 @@ "port-version": 11 }, "libsrt": { - "baseline": "1.4.4", - "port-version": 2 + "baseline": "1.5.0", + "port-version": 0 }, "libsrtp": { "baseline": "2.4.2", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index 80e2ed58c70cfd..b1e7e233b10bd2 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb7fad3230d33ce43f4e008d3ec92cb286fe01e5", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "bec354df76b0c680977252a11a9e88b1ae6818b9", "version": "1.4.4", From 31194760c2334a223dc6fad5d8e97445adddfdcb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 8 Aug 2022 21:09:35 +0200 Subject: [PATCH 346/791] [rapidjson] Fix cmake config (#26165) * [rapidjson] Fix cmake config * version * There are no pc files on Windows * version * Different config paths on Windows * version * Fix config path * version * Upstream messed up cmake config on Windows * version * Remove PACKAGE_NAME on Windows * version * Fix config location * version * Revert FILE_DISAMBIGUATOR removal because it invalidates existing downloads for no reason. * Fix version DB Co-authored-by: Billy O'Neal --- ports/rapidjson/portfile.cmake | 27 +++++++++++++++++++-------- ports/rapidjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rapidjson.json | 5 +++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ports/rapidjson/portfile.cmake b/ports/rapidjson/portfile.cmake index 96f2d6bde0ce22..232fe2203a7a5d 100644 --- a/ports/rapidjson/portfile.cmake +++ b/ports/rapidjson/portfile.cmake @@ -12,21 +12,32 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DRAPIDJSON_BUILD_DOC:BOOL=OFF - -DRAPIDJSON_BUILD_EXAMPLES:BOOL=OFF - -DRAPIDJSON_BUILD_TESTS:BOOL=OFF - -DCMAKE_INSTALL_DIR:STRING=cmake + -DRAPIDJSON_BUILD_DOC=OFF + -DRAPIDJSON_BUILD_EXAMPLES=OFF + -DRAPIDJSON_BUILD_TESTS=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RapidJSON) +endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/doc") +vcpkg_fixup_pkgconfig() -file(READ "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" _contents) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +endif() + +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" _contents) string(REPLACE "\${RapidJSON_SOURCE_DIR}" "\${RapidJSON_CMAKE_DIR}/../.." _contents "${_contents}") string(REPLACE "set( RapidJSON_SOURCE_DIR \"${SOURCE_PATH}\")" "" _contents "${_contents}") string(REPLACE "set( RapidJSON_DIR \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\")" "" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/rapidjson/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n") +string(REPLACE "\${RapidJSON_CMAKE_DIR}/../../../include" "\${RapidJSON_CMAKE_DIR}/../../include" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/RapidJSONConfig.cmake" "${_contents}\nset(RAPIDJSON_INCLUDE_DIRS \"\${RapidJSON_INCLUDE_DIRS}\")\n") file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rapidjson/vcpkg.json b/ports/rapidjson/vcpkg.json index ad6c7b894d0831..c62de944b8ce36 100644 --- a/ports/rapidjson/vcpkg.json +++ b/ports/rapidjson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rapidjson", "version-date": "2022-06-28", - "port-version": 2, + "port-version": 3, "description": "A fast JSON parser/generator for C++ with both SAX/DOM style API ", "homepage": "http://rapidjson.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6e6db4f2e52471..d865e945491b2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6194,7 +6194,7 @@ }, "rapidjson": { "baseline": "2022-06-28", - "port-version": 2 + "port-version": 3 }, "rapidxml": { "baseline": "1.13", diff --git a/versions/r-/rapidjson.json b/versions/r-/rapidjson.json index 37386b453f507d..0837af0b5358a2 100644 --- a/versions/r-/rapidjson.json +++ b/versions/r-/rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b33122751fc9d722f05cc50538aa9b6d08e2d105", + "version-date": "2022-06-28", + "port-version": 3 + }, { "git-tree": "f3770e13ddf21ddf223c84dab78f3d04d4f25750", "version-date": "2022-06-28", From a0454d6e18b335cf12da34d925538897d598219b Mon Sep 17 00:00:00 2001 From: GPUCode <47210458+GPUCode@users.noreply.github.com> Date: Mon, 8 Aug 2022 22:14:26 +0300 Subject: [PATCH 347/791] libusb: Fix compilation on MinGW (#26152) * libusb: Fix compilation on MinGW * libusb: Update port version --- ports/libusb/portfile.cmake | 2 +- ports/libusb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 34f6664dac8c91..e00798cd55f59f 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") set(MSVS_VERSION 2019) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index d89566f0cca22a..e7d498d40ba347 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libusb", "version": "1.0.26", + "port-version": 1, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1", diff --git a/versions/baseline.json b/versions/baseline.json index d865e945491b2d..6a1d9448e7f1b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4210,7 +4210,7 @@ }, "libusb": { "baseline": "1.0.26", - "port-version": 0 + "port-version": 1 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 5496021afbd6e7..b54e2c0ec932a1 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd3501fc0abc3d7ce598175f8f7f593f642a4973", + "version": "1.0.26", + "port-version": 1 + }, { "git-tree": "67fc457e16066e047803888e45b8ea3aaf713501", "version": "1.0.26", From a7466798d4c5fcd2c03c0bc4428b21a3d540158d Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 9 Aug 2022 14:51:49 -0400 Subject: [PATCH 348/791] [grpc] Fix protobuf protoc executable variable (#26199) * [grpc] Fix protobuf protoc executable variable * Update versions --- ports/grpc/portfile.cmake | 2 +- ports/grpc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 6a05289b31c00d..39bcd1a4c0353a 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -61,7 +61,7 @@ vcpkg_cmake_configure( -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" - "-DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + "-DProtobuf_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" MAYBE_UNUSED_VARIABLES gRPC_MSVC_STATIC_RUNTIME ) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index f0997d69738c73..140fa1eab36f6d 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "grpc", "version-semver": "1.48.0", + "port-version": 1, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6a1d9448e7f1b0..1327494f4bee3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2706,7 +2706,7 @@ }, "grpc": { "baseline": "1.48.0", - "port-version": 0 + "port-version": 1 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index f64c4ebc7f90e6..f7bab7cd11a894 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b2206a9758481b4773a93435aa6cfe7de4bf9e5", + "version-semver": "1.48.0", + "port-version": 1 + }, { "git-tree": "ef80a11383e8ff6bd068d50e620ea681cea3a22e", "version-semver": "1.48.0", From 8a23d2e1240911050d1c105e83f866ed2ffa30b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 9 Aug 2022 18:56:06 +0000 Subject: [PATCH 349/791] [pybind11] Fix usage (#26239) * [pybind11] Fix usage * version --- ports/pybind11/fix-usage.patch | 24 ++++++++++++++++++++++++ ports/pybind11/portfile.cmake | 1 + ports/pybind11/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/pybind11.json | 5 +++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 ports/pybind11/fix-usage.patch diff --git a/ports/pybind11/fix-usage.patch b/ports/pybind11/fix-usage.patch new file mode 100644 index 00000000000000..368c81973ed402 --- /dev/null +++ b/ports/pybind11/fix-usage.patch @@ -0,0 +1,24 @@ +diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake +index 5535e87..6576b2e 100644 +--- a/tools/pybind11Tools.cmake ++++ b/tools/pybind11Tools.cmake +@@ -130,15 +130,16 @@ if(CMAKE_VERSION VERSION_LESS 3.11) + APPEND + PROPERTY INTERFACE_LINK_LIBRARIES pybind11::pybind11 $) + else() ++ add_library(pybind11::_ClassicPythonLibraries IMPORTED INTERFACE) ++ target_link_libraries(pybind11::_ClassicPythonLibraries INTERFACE ${PYTHON_LIBRARIES}) + target_link_libraries( + pybind11::module + INTERFACE + pybind11::python_link_helper +- "$<$,$>:$>" +- ) ++ "$<$,$>:pybind11::_ClassicPythonLibraries>") + + target_link_libraries(pybind11::embed INTERFACE pybind11::pybind11 +- $) ++ pybind11::_ClassicPythonLibraries) + + endif() + diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 120ba5a81ad9c7..fa12f9e2af7852 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v2.10.0 SHA512 93112ce530a0652b2b4458a137b4a35f2fd8607f82ad96698ef422128d0b53e16e1d06c239ee4643b821acafae09c74eb0f72bc4ee5584aa9fcdaff4d79980d9 HEAD_REF master + PATCHES fix-usage.patch ) vcpkg_cmake_configure( diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index 3936e60049f87a..809d4a73cf873d 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pybind11", "version": "2.10.0", + "port-version": 1, "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1327494f4bee3c..8885b166ecc66f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5730,7 +5730,7 @@ }, "pybind11": { "baseline": "2.10.0", - "port-version": 0 + "port-version": 1 }, "pystring": { "baseline": "1.1.3", diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index aca56957479968..e71c1029e9397a 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c6350f32b68fc7216251526449e5d6b5342b2a9", + "version": "2.10.0", + "port-version": 1 + }, { "git-tree": "84251d247cc46bde6696ad9043326981370e1a79", "version": "2.10.0", From 4b4766c7935aa9ce682b92a5bcb1e9fb04d54386 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 9 Aug 2022 22:28:25 +0200 Subject: [PATCH 350/791] [breakpad] Update to 2022.07.12 (#26232) * [breakpad] Update to 2022.07.12 * Also add arm64-windows to 'supports' because pe_util.cc(280) assumes IMAGE_RUNTIME_FUNCTION_ENTRY has a member UnwindInfoAddress which is only true on x86 and x64. (Note that _IMAGE_ARM_RUNTIME_FUNCTION_ENTRY, _IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY, and _IMAGE_ALPHA_RUNTIME_FUNCTION_ENTRY do not have this member) Simplifying to CNF: !uwp & !(windows & (arm | arm64 | alpha)) // except of course alpha doesn''t exist !uwp & (!windows | !(arm | arm64)) !uwp & (!windows | (!arm & !arm64)) !uwp & (!windows | !arm) & (!windows | !arm64) Co-authored-by: Billy O'Neal --- ports/breakpad/fix-unordered_map.patch | 14 -------------- ports/breakpad/portfile.cmake | 5 ++--- ports/breakpad/vcpkg.json | 6 +++--- scripts/ci.baseline.txt | 1 - versions/b-/breakpad.json | 5 +++++ versions/baseline.json | 4 ++-- 6 files changed, 12 insertions(+), 23 deletions(-) delete mode 100644 ports/breakpad/fix-unordered_map.patch diff --git a/ports/breakpad/fix-unordered_map.patch b/ports/breakpad/fix-unordered_map.patch deleted file mode 100644 index 0d131d2b8db3d7..00000000000000 --- a/ports/breakpad/fix-unordered_map.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/common/unordered.h b/src/common/unordered.h -index c9cbd58..7743eda 100644 ---- a/src/common/unordered.h -+++ b/src/common/unordered.h -@@ -46,7 +46,8 @@ struct unordered_map : public __gnu_cxx::hash_map {}; - template > - struct unordered_set : public __gnu_cxx::hash_set {}; - --#elif defined(_LIBCPP_VERSION) // c++11 -+#elif (__cplusplus >= 201103L) || defined(_LIBCPP_VERSION) || \ -+ (defined(_MSC_VER) && (_MSC_VER >= 1800)) // c++11 - #include - #include - using std::unordered_map; diff --git a/ports/breakpad/portfile.cmake b/ports/breakpad/portfile.cmake index 9e083c42e591e3..44c9895998e486 100644 --- a/ports/breakpad/portfile.cmake +++ b/ports/breakpad/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/breakpad - REF 9c4671f2e3a63c0f155d9b2511192d0b5fa7f760 # accessed on 2020-09-14 - SHA512 4c9ed9b675a772f9a6a84692865381130901820cb395b725511e7a9e2cbf4aaa5212a9ef5f87086baf58bb9d729082232b564bd827a205f87b5c1ffc1c53892a + REF v2022.07.12 + SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f HEAD_REF master PATCHES fix-unique_ptr.patch - fix-unordered_map.patch ) if(VCPKG_HOST_IS_LINUX OR VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_ANDROID) diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json index 59d1b8f7853841..25dff5d4a590e7 100644 --- a/ports/breakpad/vcpkg.json +++ b/ports/breakpad/vcpkg.json @@ -1,10 +1,10 @@ { "name": "breakpad", - "version-date": "2020-09-14", - "port-version": 5, + "version-date": "2022-07-12", + "port-version": 1, "description": "a set of client and server components which implement a crash-reporting system.", "homepage": "https://github.com/google/breakpad", - "supports": "!uwp", + "supports": "!uwp & (!windows | !arm) & (!windows | !arm64)", "dependencies": [ "libdisasm", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d2c2bf6d99efb7..a2b72a3f7be51f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -60,7 +60,6 @@ bond:x64-osx=fail bond:arm64-osx=fail bond:x64-uwp=fail botan:x64-uwp=fail -breakpad:arm64-windows=fail caf:arm-uwp=fail caf:x64-uwp=fail caffe2:x86-windows=fail diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index 8051dbd44e2f54..df04326d32e977 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b789572b559ed292fc35ad004d51d6d975b7d7f", + "version-date": "2022-07-12", + "port-version": 1 + }, { "git-tree": "1765629f89b1d8d3020f5e4baa35116b9da02c0a", "version-date": "2020-09-14", diff --git a/versions/baseline.json b/versions/baseline.json index 8885b166ecc66f..4d0b22640d110b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1157,8 +1157,8 @@ "port-version": 0 }, "breakpad": { - "baseline": "2020-09-14", - "port-version": 5 + "baseline": "2022-07-12", + "port-version": 1 }, "brigand": { "baseline": "1.3.0", From 6e5edabf65f772da6f833c7a1bb55369b888789c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 9 Aug 2022 20:33:30 +0000 Subject: [PATCH 351/791] [harfbuzz] Fix build error (#26229) * [harfbuzz] Fix build error * version --- ports/harfbuzz/fix-win32-build.patch | 19 ++++++++++++++++--- ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/ports/harfbuzz/fix-win32-build.patch b/ports/harfbuzz/fix-win32-build.patch index e4ad0003eda57b..901def6275e374 100644 --- a/ports/harfbuzz/fix-win32-build.patch +++ b/ports/harfbuzz/fix-win32-build.patch @@ -1,11 +1,24 @@ diff --git a/src/meson.build b/src/meson.build -index e336037a2..a7c501b78 100644 +index e336037..35af00e 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -473,7 +473,7 @@ defs_list = [harfbuzz_def] +@@ -349,6 +349,11 @@ hb_subset_sources = files( + 'hb-subset.hh', + ) + ++extra_hb_cpp_args = [] ++if cpp.get_argument_syntax() == 'msvc' ++ extra_hb_cpp_args += ['/bigobj'] ++endif ++ + hb_subset_headers = files( + 'hb-subset.h', + 'hb-subset-repacker.h' +@@ -472,8 +477,7 @@ defs_list = [harfbuzz_def] + version = '0.@0@.0'.format(hb_version_int) - extra_hb_cpp_args = [] +-extra_hb_cpp_args = [] -if cpp.get_id() == 'msvc' +if cpp.get_argument_syntax() == 'msvc' if get_option('default_library') != 'static' diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 00ffdb46db05eb..13bed7c3856ebd 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", "version": "5.0.1", - "port-version": 1, + "port-version": 2, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index 4d0b22640d110b..04efbcfb087471 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2794,7 +2794,7 @@ }, "harfbuzz": { "baseline": "5.0.1", - "port-version": 1 + "port-version": 2 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index ecf2a9a040df33..af7dd766c8dde9 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64cea6fad2515aeabcdb82768bbb9b4b30db7af6", + "version": "5.0.1", + "port-version": 2 + }, { "git-tree": "890fd1dc4836a76fac4de6ee409c762ac0afe587", "version": "5.0.1", From 7ef97003d78178948068ccd6fa7964f938f41c76 Mon Sep 17 00:00:00 2001 From: MikeG Date: Tue, 9 Aug 2022 22:34:13 +0200 Subject: [PATCH 352/791] [aws-c-*] update aws-c-common and aws-c-io (#26230) * aws-c-common from 0.6.9 -> 0.6.20 * aws-c-io from 0.10.7 -> 0.10.22 --- ports/aws-c-common/portfile.cmake | 4 ++-- ports/aws-c-common/vcpkg.json | 3 +-- ports/aws-c-io/portfile.cmake | 4 ++-- ports/aws-c-io/vcpkg.json | 3 +-- versions/a-/aws-c-common.json | 5 +++++ versions/a-/aws-c-io.json | 5 +++++ versions/baseline.json | 8 ++++---- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index 1ab9f8b7240418..d8672c140f9970 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common - REF fdd4a10243903260f412f587cc748f0ac79629b4 # v0.6.9 - SHA512 969c9b85af58fc144480f6548e78126cf3fe758951ecbdffb579163b9a505a7ea58c32430390102ff620e828bf241dd24c0167f205306949d36dcf4504efa09a + REF 68f28f8df258390744f3c5b460250f8809161041 # v0.6.20 + SHA512 a8be405e0e1586a06db038a0068df2c9277772ff7b8df2c542d18d2aae4b2bc0fd89de668ab10d84476446834390e4e27383b68d86c7d9f0d0749b57802866f1 HEAD_REF master PATCHES disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index 7d927640d42147..a775cf692d9999 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aws-c-common", - "version": "0.6.9", - "port-version": 2, + "version": "0.6.20", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", "supports": "!(windows & arm) & !uwp", diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake index b3a5996bf9b263..d72cdaed69a970 100644 --- a/ports/aws-c-io/portfile.cmake +++ b/ports/aws-c-io/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-io - REF 57b00febac48e78f8bf8cff4c82a249e6648842a # v0.10.7 - SHA512 ffcf5ba4ccdff23ca390fc4eb935f88040447589886348234aa1c24b531401521df99a6ac578c1679a3c1a06dfcef6deb833a0b9d53e31d42576a3ad03ade6fc + REF cfe553a770e9c2d1c93b8cdfb870b9f2a46b436e # v0.10.22 + SHA512 7a741f5b1c895ceb11f73b67828fd3623c180cb8a3863f3b63a67ac1437d2c47911d50510777b13ee66fd0a009ab09a8c83fd036a0fca2f25a0835f48f023de7 HEAD_REF master PATCHES fix-cmake-target-path.patch ) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json index 9fddd3bf3e2783..203f3649fd7da5 100644 --- a/ports/aws-c-io/vcpkg.json +++ b/ports/aws-c-io/vcpkg.json @@ -1,7 +1,6 @@ { "name": "aws-c-io", - "version": "0.10.7", - "port-version": 2, + "version": "0.10.22", "description": "Handles all IO and TLS work for application protocols.", "homepage": "https://github.com/awslabs/aws-c-io", "supports": "!(windows & arm) & !uwp", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 6add7a56ce4165..cb690deee031f9 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f38081d38190d2b787b38df2ffe3804fea7746b", + "version": "0.6.20", + "port-version": 0 + }, { "git-tree": "56b4972c2535a4e8991826b6c595e433b0e80bf9", "version": "0.6.9", diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json index 1ea423119de0af..6f1ff5397244b4 100644 --- a/versions/a-/aws-c-io.json +++ b/versions/a-/aws-c-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dc402977f4ed08054b2661b89a211064005e280", + "version": "0.10.22", + "port-version": 0 + }, { "git-tree": "7456b996bdeeeeb59fb39770d797fa2966d0a951", "version": "0.10.7", diff --git a/versions/baseline.json b/versions/baseline.json index 04efbcfb087471..9c5a39c5cf6767 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -273,8 +273,8 @@ "port-version": 2 }, "aws-c-common": { - "baseline": "0.6.9", - "port-version": 2 + "baseline": "0.6.20", + "port-version": 0 }, "aws-c-compression": { "baseline": "0.2.14", @@ -289,8 +289,8 @@ "port-version": 2 }, "aws-c-io": { - "baseline": "0.10.7", - "port-version": 2 + "baseline": "0.10.22", + "port-version": 0 }, "aws-c-mqtt": { "baseline": "0.7.6", From ce4aaba77fd620046ab049293a415cfb9fa315de Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Tue, 9 Aug 2022 13:44:03 -0700 Subject: [PATCH 353/791] [opentelemetry-cpp] update version to 1.5.0 (#26234) --- ports/opentelemetry-cpp/portfile.cmake | 4 ++-- ports/opentelemetry-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index a6c80c10b412a2..57ad6a593da4cc 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/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.4.1 - SHA512 090cd8e7283bddaf0bc44b202586fbb0648be9c35965f93dddbdc988fe64c20157f2a4926605f449a76429cc502eff580bc74d50418b29cb7a0a8ab832a7d249 + REF v1.5.0 + SHA512 a506973223c49531d4b0c3febf5734dfe2e44c22f8854ed96935cda0783a14d0819cc3dbb2d3f8373f960f27acf78aafc777ee76aeb14828df9c4b4434e4fe6f HEAD_REF main ) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index ba7db3c99c145e..7ebd51d501441a 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.4.1", + "version-semver": "1.5.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." diff --git a/versions/baseline.json b/versions/baseline.json index 9c5a39c5cf6767..ec6f8fc928649f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5285,7 +5285,7 @@ "port-version": 4 }, "opentelemetry-cpp": { - "baseline": "1.4.1", + "baseline": "1.5.0", "port-version": 0 }, "opentracing": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 6fab8f927c29a2..df2872028a97d8 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ec3fad654735c88e146be395fd84629c209de6e", + "version-semver": "1.5.0", + "port-version": 0 + }, { "git-tree": "614e2f4d01b0a003fe4c6df695eb669b41627736", "version-semver": "1.4.1", From e47ff308b0779555934038c35fe0de6c70ea2314 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 9 Aug 2022 13:58:37 -0700 Subject: [PATCH 354/791] [crashrpt] Fix build error (#26231) * [crashrpt] Fix build error * x-add-version * fix build error * add license * x-add-version * Correct license Co-authored-by: Billy O'Neal --- ports/crashrpt/002-fix-wtl-includepath.patch | 148 ++++++++++++++++++ .../crashrpt/003-add-definition-UNICODE.patch | 39 +++++ ports/crashrpt/portfile.cmake | 17 +- ports/crashrpt/vcpkg.json | 7 +- versions/baseline.json | 2 +- versions/c-/crashrpt.json | 5 + 6 files changed, 207 insertions(+), 11 deletions(-) create mode 100644 ports/crashrpt/002-fix-wtl-includepath.patch create mode 100644 ports/crashrpt/003-add-definition-UNICODE.patch diff --git a/ports/crashrpt/002-fix-wtl-includepath.patch b/ports/crashrpt/002-fix-wtl-includepath.patch new file mode 100644 index 00000000000000..8c2d37aac7feae --- /dev/null +++ b/ports/crashrpt/002-fix-wtl-includepath.patch @@ -0,0 +1,148 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ed9e3d3..d842aa7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,7 +122,7 @@ if(NOT TINYXML_INCLUDE_DIR) + message(FATAL_ERROR "tinyxml include dir not found") + endif() + +-find_path(WTL_INCLUDE_DIR wtl/atlapp.h) ++find_path(WTL_INCLUDE_DIR atlapp.h) + if(NOT WTL_INCLUDE_DIR) + message(FATAL_ERROR "WTL include dir not found") + endif() +diff --git a/processing/crashrptprobe/CrashRptProbe.rc b/processing/crashrptprobe/CrashRptProbe.rc +index e12b8e9..a08f63e 100644 +--- a/processing/crashrptprobe/CrashRptProbe.rc ++++ b/processing/crashrptprobe/CrashRptProbe.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "wtl/atlres.h" ++#include "atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -32,7 +32,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""wtl/atlres.h""\r\n" ++ "#include ""atlres.h""\r\n" + "\0" + END + +diff --git a/processing/crashrptprobe/stdafx.h b/processing/crashrptprobe/stdafx.h +index 0b60659..2b027b2 100644 +--- a/processing/crashrptprobe/stdafx.h ++++ b/processing/crashrptprobe/stdafx.h +@@ -70,13 +70,13 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + extern CAppModule _Module; + #include + + // CString-related includes + #define _WTL_USE_CSTRING +-#include ++#include + + #if _MSC_VER<1400 + #define WCSNCPY_S(strDest, sizeInBytes, strSource, count) wcsncpy(strDest, strSource, count) +diff --git a/reporting/crashrpt/CrashRpt.rc b/reporting/crashrpt/CrashRpt.rc +index a8c821b..95e7502 100644 +--- a/reporting/crashrpt/CrashRpt.rc ++++ b/reporting/crashrpt/CrashRpt.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "wtl/atlres.h" ++#include "atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -32,7 +32,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""wtl/atlres.h""\r\n" ++ "#include ""atlres.h""\r\n" + "\0" + END + +diff --git a/reporting/crashrpt/StdAfx.h b/reporting/crashrpt/StdAfx.h +index 13bbe50..3ed0a55 100644 +--- a/reporting/crashrpt/StdAfx.h ++++ b/reporting/crashrpt/StdAfx.h +@@ -54,12 +54,12 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + extern CAppModule _Module; + #include + // CString-related includes + #define _WTL_USE_CSTRING +-#include ++#include + #include + #include + #include +diff --git a/reporting/crashsender/CrashSender.rc b/reporting/crashsender/CrashSender.rc +index e10e269..0502962 100644 +--- a/reporting/crashsender/CrashSender.rc ++++ b/reporting/crashsender/CrashSender.rc +@@ -7,7 +7,7 @@ + // + // Generated from the TEXTINCLUDE 2 resource. + // +-#include "wtl/atlres.h" ++#include "atlres.h" + + ///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS +@@ -243,7 +243,7 @@ END + + 2 TEXTINCLUDE + BEGIN +- "#include ""wtl/atlres.h""\r\n" ++ "#include ""atlres.h""\r\n" + "\0" + END + +diff --git a/reporting/crashsender/stdafx.h b/reporting/crashsender/stdafx.h +index 4494d3a..9bbbe3a 100644 +--- a/reporting/crashsender/stdafx.h ++++ b/reporting/crashsender/stdafx.h +@@ -61,19 +61,19 @@ namespace ATL + }; + #endif // _WTL_SUPPORT_SDK_ATL3 + +-#include ++#include + + extern CAppModule _Module; + + #include + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #define _WTL_USE_CSTRING +-#include ++#include + + #include + #include diff --git a/ports/crashrpt/003-add-definition-UNICODE.patch b/ports/crashrpt/003-add-definition-UNICODE.patch new file mode 100644 index 00000000000000..1a8b60ac69522c --- /dev/null +++ b/ports/crashrpt/003-add-definition-UNICODE.patch @@ -0,0 +1,39 @@ +diff --git a/processing/crashrptprobe/CMakeLists.txt b/processing/crashrptprobe/CMakeLists.txt +index c513c6d..8ac306a 100644 +--- a/processing/crashrptprobe/CMakeLists.txt ++++ b/processing/crashrptprobe/CMakeLists.txt +@@ -13,7 +13,7 @@ list(REMOVE_ITEM srcs_using_precomp ./CrashRptProbe.rc ./CrashRptProbe.def ./st + add_msvc_precompiled_header(stdafx.h ./stdafx.cpp srcs_using_precomp) + + # Define _UNICODE (use wide-char encoding) +-add_definitions(-D_UNICODE) ++add_definitions(-D_UNICODE -DUNICODE) + + fix_default_compiler_settings_() + +diff --git a/reporting/crashrpt/CMakeLists.txt b/reporting/crashrpt/CMakeLists.txt +index c7e4fd6..da9cef1 100644 +--- a/reporting/crashrpt/CMakeLists.txt ++++ b/reporting/crashrpt/CMakeLists.txt +@@ -12,7 +12,7 @@ list(REMOVE_ITEM srcs_using_precomp ./CrashRpt.rc ./StdAfx.cpp ./CrashRpt.def) + add_msvc_precompiled_header(stdafx.h ./StdAfx.cpp srcs_using_precomp) + + # Define _UNICODE (use wide-char encoding) +-add_definitions(-D_UNICODE -D_CRT_SECURE_NO_DEPRECATE) ++add_definitions(-D_UNICODE -DUNICODE -D_CRT_SECURE_NO_DEPRECATE) + + # Modify default compiler settings + fix_default_compiler_settings_() +diff --git a/reporting/crashsender/CMakeLists.txt b/reporting/crashsender/CMakeLists.txt +index aa4ab8a..f081254 100644 +--- a/reporting/crashsender/CMakeLists.txt ++++ b/reporting/crashsender/CMakeLists.txt +@@ -15,7 +15,7 @@ list(APPEND source_files + ${CMAKE_SOURCE_DIR}/reporting/CrashRpt/SharedMem.cpp) + + # Define _UNICODE (use wide-char encoding) +-add_definitions(-D_UNICODE ) ++add_definitions(-D_UNICODE -DUNICODE) + + fix_default_compiler_settings_() + diff --git a/ports/crashrpt/portfile.cmake b/ports/crashrpt/portfile.cmake index a4265e0f8acb56..12212d84cf2276 100644 --- a/ports/crashrpt/portfile.cmake +++ b/ports/crashrpt/portfile.cmake @@ -12,13 +12,15 @@ vcpkg_from_git( REF 4616504670be5a425a525376648d912a72ce18f2 PATCHES 001-add-install-target-and-find-deps.patch + 002-fix-wtl-includepath.patch + 003-add-definition-UNICODE.patch ) # Remove vendored dependencies to ensure they are not picked up by the build # Vendored minizip is still used since it contains modifications needed for CrashRpt foreach(DEPENDENCY dbghelp jpeg libogg libpng libtheora tinyxml wtl zlib) - if(EXISTS ${SOURCE_PATH}/thirdparty/${DEPENDENCY}) - file(REMOVE_RECURSE ${SOURCE_PATH}/thirdparty/${DEPENDENCY}) + if(EXISTS "${SOURCE_PATH}/thirdparty/${DEPENDENCY}") + file(REMOVE_RECURSE "${SOURCE_PATH}/thirdparty/${DEPENDENCY}") endif() endforeach() @@ -32,21 +34,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS demos CRASHRPT_BUILD_DEMOS ) -# PREFER_NINJA is not used below since CrashSender fails to build with errors like this one: -# C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.23.28105\ATLMFC\include\atlconv.h(788): error C2440: 'return': cannot convert from 'LPCTSTR' to 'LPCOLESTR' -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCRASHRPT_BUILD_SHARED_LIBS=${CRASHRPT_BUILD_SHARED_LIBS} -DCRASHRPT_LINK_CRT_AS_DLL=${CRASHRPT_LINK_CRT_AS_DLL} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/crashrpt/vcpkg.json b/ports/crashrpt/vcpkg.json index 4b36fcda6b4ccb..774ff5c30f06f4 100644 --- a/ports/crashrpt/vcpkg.json +++ b/ports/crashrpt/vcpkg.json @@ -1,9 +1,10 @@ { "name": "crashrpt", "version": "1.4.3", - "port-version": 2, + "port-version": 3, "description": "A crash reporting system for Windows applications", "homepage": "http://crashrpt.sourceforge.net/", + "license": "BSD-3-Clause", "supports": "!osx & !linux & !uwp & (x86 | x64)", "dependencies": [ "dbghelp", @@ -12,6 +13,10 @@ "libpng", "libtheora", "tinyxml", + { + "name": "vcpkg-cmake", + "host": true + }, "wtl", "zlib" ], diff --git a/versions/baseline.json b/versions/baseline.json index ec6f8fc928649f..82e493622511ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1706,7 +1706,7 @@ }, "crashrpt": { "baseline": "1.4.3", - "port-version": 2 + "port-version": 3 }, "crc32c": { "baseline": "1.1.2", diff --git a/versions/c-/crashrpt.json b/versions/c-/crashrpt.json index 55c72bc511dea9..7b198b0bce0b02 100644 --- a/versions/c-/crashrpt.json +++ b/versions/c-/crashrpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb5e94d69da827d776c42545cdda4ca0e5565629", + "version": "1.4.3", + "port-version": 3 + }, { "git-tree": "896d96ee0613edabd92048142803845fa11baa68", "version": "1.4.3", From 030c53833b977f1580b2a4817bb22edbdde606d4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 9 Aug 2022 23:27:23 +0200 Subject: [PATCH 355/791] [cmake] update to 3.24 (#25365) * [cmake] update to 3.24-rc1 * update to rc2 * CI debugging * osx use correct cmake download * update to rc3 * revert --trace-expand * update to rc4. CI should give hashes * adjust hashes. * fix hashes again? * fixing the hashes * --trace-expand for qttools * update to rc5 * update to release version * revert qttools --- scripts/vcpkgTools.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 4f555dd817e4ab..b7c986b1f4dfd3 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -15,25 +15,25 @@ python-3.10.5.nupkg.zip - 3.22.2 - cmake-3.22.2-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-windows-i386.zip - 969d3d58d56d8fa3cc3acae2b949bf58abab945f70ae292ff20c9060d845dfc094c613c367a924abff47f307cc33af1467cdb9b75bb857868e38b2c7cdc72f79 - cmake-3.22.2-windows-i386.zip + 3.24.0 + cmake-3.24.0-windows-i386\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-windows-i386.zip + 0188bed2fea4b40b88c63cd4edbfa1e71f26518286c66ab8719435c6fc0a5d7582a94cdf348c4026bd619292c70247437ff84093abd396d749d438b732b4c6bb + cmake-3.24.0-windows-i386.zip - 3.22.2 - cmake-3.22.2-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-macos-universal.tar.gz - 08104f608ecb9a5cfef38e79f0957d21e425616c0677781445492f82cbfec805113e3b5eb4bc737b707bb26a00678e7bd55e17555a5611c08b0b9b44ac5136ac - cmake-3.22.2-macos-universal.tar.gz + 3.24.0 + cmake-3.24.0-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-macos-universal.tar.gz + c1480fdc1c28a61ea3979c0a5e58a7cf77ecb8f4797d8b2e605883612fb9681943e3490ebb38b0808e4480c33529e1d8628e7bf860e24874d4e41919cc078ad2 + cmake-3.24.0-macos-universal.tar.gz - 3.22.2 - cmake-3.22.2-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.22.2/cmake-3.22.2-linux-x86_64.tar.gz - 579e08b086f6903ef063697fca1dc2692f68a7341dd35998990b772b4221cdb5b1deecfa73bad9d46817ef09e58882b2adff9d64f959c01002c11448a878746b - cmake-3.22.2linux-x86_64.tar.gz + 3.24.0 + cmake-3.24.0-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-linux-x86_64.tar.gz + 8eb604b80ee6c771d43cc3e430b2a1065319167cb4913258147482d6ef8d6b83ff4451e3173b0ce6e0546a35d6731f334a72479855abe1958b25678cafda21d0 + cmake-3.24.0-linux-x86_64.tar.gz 3.20.4 From 1ed3a8935a48846f239a8af0f44bd17c9b16fdfb Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Wed, 10 Aug 2022 14:22:01 -0400 Subject: [PATCH 356/791] [vcpkg] Fix cross compiling macOS (#26240) This follows the pattern in the Windows toolchain with respect to setting VCPKG_CMAKE_SYSTEM_VERSION and also how arm64 macOS can execute x86_64 through Rosetta. --- scripts/toolchains/osx.cmake | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/toolchains/osx.cmake b/scripts/toolchains/osx.cmake index efad6c5fedaca8..56a32b669ca68e 100644 --- a/scripts/toolchains/osx.cmake +++ b/scripts/toolchains/osx.cmake @@ -1,11 +1,6 @@ if(NOT _VCPKG_OSX_TOOLCHAIN) set(_VCPKG_OSX_TOOLCHAIN 1) -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(CMAKE_CROSSCOMPILING OFF CACHE BOOL "") - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") -else() - set(CMAKE_SYSTEM_VERSION "17.0.0" CACHE STRING "") -endif() + set(CMAKE_SYSTEM_NAME Darwin CACHE STRING "") set(CMAKE_MACOSX_RPATH ON CACHE BOOL "") @@ -22,6 +17,23 @@ if(NOT DEFINED CMAKE_SYSTEM_PROCESSOR) endif() endif() +if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) +endif() + +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR) + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") + # arm64 macOS can run x64 binaries + set(CMAKE_CROSSCOMPILING OFF CACHE STRING "") + endif() + + if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") + endif() +endif() + get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) if(NOT _CMAKE_IN_TRY_COMPILE) string(APPEND CMAKE_C_FLAGS_INIT " -fPIC ${VCPKG_C_FLAGS} ") From afa74ae0f25ffbcfef1060a9ebd39d0ad2edf6ab Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:23:06 +0200 Subject: [PATCH 357/791] [buck-yeh-bux] fix clang-cl builds (#26248) * [buck-yeh-bux] fix clang-cl * v db --- ports/buck-yeh-bux/fix-clang-cl.patch | 33 +++++++++++++++++++++++++++ ports/buck-yeh-bux/portfile.cmake | 1 + ports/buck-yeh-bux/vcpkg.json | 1 + versions/b-/buck-yeh-bux.json | 5 ++++ versions/baseline.json | 2 +- 5 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 ports/buck-yeh-bux/fix-clang-cl.patch diff --git a/ports/buck-yeh-bux/fix-clang-cl.patch b/ports/buck-yeh-bux/fix-clang-cl.patch new file mode 100644 index 00000000000000..a9ec8a8ab12dc6 --- /dev/null +++ b/ports/buck-yeh-bux/fix-clang-cl.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 306074e50..a032ab09e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,13 +5,13 @@ project(bux) + set(GNU_LIKE_CXX_FLAGS " -Wall -Wextra -Wshadow -Wconversion -Wno-parentheses -g3 -Og -std=c++20") + #string(APPEND CMAKE_CXX_FLAGS " -g3") + +-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MSVC) + message("Clang") + string(APPEND CMAKE_CXX_FLAGS "${GNU_LIKE_CXX_FLAGS} -Wno-potentially-evaluated-expression") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + message("GNU") + string(APPEND CMAKE_CXX_FLAGS "${GNU_LIKE_CXX_FLAGS}") +-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++elseif(MSVC) + message("MSVC") + string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus /std:c++latest /MP") + else() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 093a1da8d..8de40efa4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,7 +8,7 @@ add_library(bux STATIC + XConsole.cpp XException.cpp + ) + target_include_directories(bux PRIVATE ../include/bux) +-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++if(MSVC) + target_link_libraries(bux PRIVATE fmt::fmt) + endif() + diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index dc1b9367b9b1e1..b6a7d30476f597 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF b046518dcffcdef9b8dbccd0accc2636df301766 # v1.6.6 SHA512 af1ca5c37623a09c64e1a84a630a26911be8c87eb007b112665b7c6080dfac67bd89eb36367202c5d29af97f4e549d6f27e41410220a57bd7756bdb1ecf8ddf0 HEAD_REF main + PATCHES fix-clang-cl.patch ) vcpkg_cmake_configure( diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index 90210c0b8c826b..0eb48677210eb4 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,6 +1,7 @@ { "name": "buck-yeh-bux", "version": "1.6.6", + "port-version": 1, "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "license": "MIT", diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index 0860bb3c05d3a4..7c998bf16678a6 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7bc53828c4e0a83a3242bb28682011495747ad2", + "version": "1.6.6", + "port-version": 1 + }, { "git-tree": "3d58f00b46ad32a1bfba6e5ee139aa47047e2bb6", "version": "1.6.6", diff --git a/versions/baseline.json b/versions/baseline.json index 82e493622511ef..7ecf1759af539a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1190,7 +1190,7 @@ }, "buck-yeh-bux": { "baseline": "1.6.6", - "port-version": 0 + "port-version": 1 }, "buck-yeh-bux-mariadb-client": { "baseline": "1.0.3", From 8056e214c55653488507d753e7ca1b5a7613dda1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:23:31 +0200 Subject: [PATCH 358/791] [cppcms] Fix narrowing for clang-cl builds (#26251) * [cppcms] fix narrowing error with clang-cl * v db --- ports/cppcms/fix_narrowing_error.patch | 13 +++++++++++++ ports/cppcms/portfile.cmake | 1 + ports/cppcms/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppcms.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/cppcms/fix_narrowing_error.patch diff --git a/ports/cppcms/fix_narrowing_error.patch b/ports/cppcms/fix_narrowing_error.patch new file mode 100644 index 00000000000000..12c7b038ddb530 --- /dev/null +++ b/ports/cppcms/fix_narrowing_error.patch @@ -0,0 +1,13 @@ +diff --git a/src/session_win32_file_storage.cpp b/src/session_win32_file_storage.cpp +index ce3fba330..a5e54be84 100644 +--- a/src/session_win32_file_storage.cpp ++++ b/src/session_win32_file_storage.cpp +@@ -186,7 +186,7 @@ void session_file_storage::save_to_file(HANDLE h,time_t timeout,std::string cons + int64_t timeout; + uint32_t crc; + uint32_t size; +- } tmp = { timeout, 0, in.size() }; ++ } tmp = { timeout, 0, static_cast(in.size()) }; + impl::crc32_calc crc_calc; + crc_calc.process_bytes(in.data(),in.size()); + tmp.crc=crc_calc.checksum(); diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index df656168dc926f..b876f77d99fa9c 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( SHA512 e99d34d14fbde22be725ac2c0bec069fb584e45c66767af75efaf454ca61a7a5e57434bf86109f910884c72202b8cf98fe16505e7d3d30d9218abd4d8b27d5df PATCHES no-tests-and-examples.patch + fix_narrowing_error.patch ) vcpkg_find_acquire_program(PYTHON2) diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json index 8340ea8746e466..54dbb33fefa5e3 100644 --- a/ports/cppcms/vcpkg.json +++ b/ports/cppcms/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppcms", "version": "1.2.1", - "port-version": 5, + "port-version": 6, "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", "homepage": "https://github.com/artyom-beilis/cppcms", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7ecf1759af539a..ff399cc39c4d91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1622,7 +1622,7 @@ }, "cppcms": { "baseline": "1.2.1", - "port-version": 5 + "port-version": 6 }, "cppcodec": { "baseline": "0.2", diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index 8086bb93bdbfd8..ca34ce0253a2e4 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2fff22eecee1fc50eee291ea49bed2717704031", + "version": "1.2.1", + "port-version": 6 + }, { "git-tree": "33ff6dbb307c2baceec0a21f05e098c0d15a8f88", "version": "1.2.1", From 63449f5c8dd9d4152ffc3a50303ae0e3de22bea3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:24:20 +0200 Subject: [PATCH 359/791] [crc32c] Clang-cl fix (#26253) * [crc32c] fix clang-cl builds. * v db --- ports/crc32c/fix_clang-cl.patch | 13 +++++++++++++ ports/crc32c/portfile.cmake | 2 ++ ports/crc32c/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/crc32c.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/crc32c/fix_clang-cl.patch diff --git a/ports/crc32c/fix_clang-cl.patch b/ports/crc32c/fix_clang-cl.patch new file mode 100644 index 00000000000000..d120243209c177 --- /dev/null +++ b/ports/crc32c/fix_clang-cl.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 84907285c..8c446b0c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ if(NOT CMAKE_CXX_STANDARD) + endif(NOT CMAKE_CXX_STANDARD) + + # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake +-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") ++if(MSVC) + # Use the highest warning level for Visual Studio. + set(CMAKE_CXX_WARNING_LEVEL 4) + if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake index 63a61302858da7..0280002fd2a580 100644 --- a/ports/crc32c/portfile.cmake +++ b/ports/crc32c/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 1.1.2 SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196 HEAD_REF master + PATCHES + fix_clang-cl.patch ) vcpkg_cmake_configure( diff --git a/ports/crc32c/vcpkg.json b/ports/crc32c/vcpkg.json index ac03f93e31b5a2..3acb74812e56b7 100644 --- a/ports/crc32c/vcpkg.json +++ b/ports/crc32c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "crc32c", "version": "1.1.2", + "port-version": 1, "description": "CRC32C implementation with support for CPU-specific acceleration instructions.", "homepage": "https://github.com/google/crc32c", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ff399cc39c4d91..a33ffc0492284f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1710,7 +1710,7 @@ }, "crc32c": { "baseline": "1.1.2", - "port-version": 0 + "port-version": 1 }, "crfsuite": { "baseline": "2020-08-27", diff --git a/versions/c-/crc32c.json b/versions/c-/crc32c.json index 3b1f56ad4586f4..1b603575edc7ba 100644 --- a/versions/c-/crc32c.json +++ b/versions/c-/crc32c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9704ed68003973bdffcd5224f720b97c424d1fa5", + "version": "1.1.2", + "port-version": 1 + }, { "git-tree": "dcfaa85ef9b67b94cf51378922832fff7cf43333", "version": "1.1.2", From c9bbaff1577315d735418cbe2d4e8cf669fc485b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:25:10 +0200 Subject: [PATCH 360/791] [json-c] clang-cl fix. (#26254) * [json-c] fix clang-cl builds * v db --- ports/json-c/fix-clang-cl.patch | 22 ++++++++++++++++++++++ ports/json-c/portfile.cmake | 1 + ports/json-c/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/j-/json-c.json | 5 +++++ 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 ports/json-c/fix-clang-cl.patch diff --git a/ports/json-c/fix-clang-cl.patch b/ports/json-c/fix-clang-cl.patch new file mode 100644 index 00000000000000..85641a7d54e298 --- /dev/null +++ b/ports/json-c/fix-clang-cl.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9741b45f9..11b397024 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -281,7 +281,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h") + configure_file(${PROJECT_SOURCE_DIR}/cmake/json_config.h.in ${PROJECT_BINARY_DIR}/json_config.h) + message(STATUS "Wrote ${PROJECT_BINARY_DIR}/json_config.h") + +-if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") ++if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" AND NOT MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections") + if ("${DISABLE_WERROR}" STREQUAL "OFF") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") +@@ -297,7 +297,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL + endif() + + add_definitions(-D_GNU_SOURCE) +-elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") ++elseif (MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DEBUG") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4100") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996") diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake index 85367d692eb63b..917d457a4f9300 100644 --- a/ports/json-c/portfile.cmake +++ b/ports/json-c/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 30063c8e32eb82e170647363055119f2f7eab19e1c3152673b966f41ed07e0349c3d6141b215b9912f9e84c2e06677b3d7ac949f720c7ebc2c95d692dc3881fe HEAD_REF master PATCHES pkgconfig.patch + fix-clang-cl.patch ) vcpkg_cmake_configure( diff --git a/ports/json-c/vcpkg.json b/ports/json-c/vcpkg.json index e4b60295abd6e2..2ef772d401be07 100644 --- a/ports/json-c/vcpkg.json +++ b/ports/json-c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "json-c", "version-date": "2022-06-26", + "port-version": 1, "description": "A JSON implementation in C", "homepage": "https://github.com/json-c/json-c", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a33ffc0492284f..27d5adbdccf302 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3118,7 +3118,7 @@ }, "json-c": { "baseline": "2022-06-26", - "port-version": 0 + "port-version": 1 }, "json-dto": { "baseline": "0.3.1", diff --git a/versions/j-/json-c.json b/versions/j-/json-c.json index 4dfac56a305ec9..799614a437f2f9 100644 --- a/versions/j-/json-c.json +++ b/versions/j-/json-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c24e9a9cbc53b10a7235087cc58e89924415b281", + "version-date": "2022-06-26", + "port-version": 1 + }, { "git-tree": "84aaadc268ad278e102cdd7e9526e5c5929c1cd6", "version-date": "2022-06-26", From 13e9aea04ac42524990621209563f330ee0b5671 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 10 Aug 2022 20:28:51 +0200 Subject: [PATCH 361/791] [cpr] disable werror (#26252) * [cpr] disable werror * v db --- ports/cpr/disable_werror.patch | 13 +++++++++++++ ports/cpr/portfile.cmake | 1 + ports/cpr/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/cpr/disable_werror.patch diff --git a/ports/cpr/disable_werror.patch b/ports/cpr/disable_werror.patch new file mode 100644 index 00000000000000..48803b8e34507f --- /dev/null +++ b/ports/cpr/disable_werror.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb7c5f042..a5bc0b942 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -71,7 +71,7 @@ if(CPR_ENABLE_CPPCHECK) + include(cmake/cppcheck.cmake) + endif() + +-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") ++if (1) + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Werror") + endif() diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 2fea1d0329fac1..83247bc491c520 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 001-cpr-config.patch + disable_werror.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index e835e7bf99c515..3f292c49e50c03 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpr", "version-semver": "1.9.0", + "port-version": 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", diff --git a/versions/baseline.json b/versions/baseline.json index 27d5adbdccf302..d6d3c7cda47d38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1682,7 +1682,7 @@ }, "cpr": { "baseline": "1.9.0", - "port-version": 0 + "port-version": 1 }, "cpu-features": { "baseline": "0.6.0", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 8a70186ffe71c7..465eafdddef812 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85bce5170656abc1bf594034c85f406d996776b1", + "version-semver": "1.9.0", + "port-version": 1 + }, { "git-tree": "8ad107acca744655eb0b5aa05c5e6fc1c5516347", "version-semver": "1.9.0", From e96c95783f7df21c24fc867735e7fbcf86d24ea4 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Wed, 10 Aug 2022 13:34:50 -0500 Subject: [PATCH 362/791] [sqlcipher] update to 4.5.2 (#26262) * [sqlcipher] update to 4.5.2 * requested changes * portfile.cmake - quote paths --- ports/sqlcipher/portfile.cmake | 31 +++++++++++++++---------------- ports/sqlcipher/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/s-/sqlcipher.json | 5 +++++ 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/ports/sqlcipher/portfile.cmake b/ports/sqlcipher/portfile.cmake index 55d0b01e4460e1..b7564ab93affa6 100644 --- a/ports/sqlcipher/portfile.cmake +++ b/ports/sqlcipher/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sqlcipher/sqlcipher - REF v4.5.1 - SHA512 157ab90e1b80ae9ae85c68c6b77008fe8ab5b526cbb2604297a5ba54279286b4cac1fecd0db552e0113a75ff61a198f649611b8bde4dec5156c443e7b7fbe0c3 + REF v4.5.2 + SHA512 1de5b219392bb976631857e32b4523258fd660fedb558d478e536b7e10c711c72c7e7c9062e45bd8a5ceaecbc1fee717935d2357f6811c3ddf76702167f4601b HEAD_REF master ) @@ -38,14 +38,14 @@ message(STATUS "Pre-building ${TARGET_TRIPLET}") vcpkg_execute_required_process( COMMAND ${NMAKE} -f Makefile.msc /A /NOLOGO clean tcl ${NMAKE_OPTIONS} - WORKING_DIRECTORY ${SOURCE_PATH} + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME pre-build-${TARGET_TRIPLET} ) message(STATUS "Pre-building ${TARGET_TRIPLET} done") # The rest of the build process with the CMakeLists.txt is merely a copy of sqlite3 -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -55,30 +55,29 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tool SQLITE3_SKIP_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSQLITE3_SKIP_TOOLS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT} TARGET_PATH share/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME ${PORT} CONFIG_PATH share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT SQLITE3_SKIP_TOOLS AND EXISTS ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher${VCPKG_HOST_EXECUTABLE_SUFFIX}) +if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/sqlcipher${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() configure_file( - ${CMAKE_CURRENT_LIST_DIR}/sqlcipher-config.in.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/sqlcipher-config.cmake + "${CMAKE_CURRENT_LIST_DIR}/sqlcipher-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/sqlcipher-config.cmake" @ONLY ) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") diff --git a/ports/sqlcipher/vcpkg.json b/ports/sqlcipher/vcpkg.json index 2d67e51759d6ee..4641301c7046cf 100644 --- a/ports/sqlcipher/vcpkg.json +++ b/ports/sqlcipher/vcpkg.json @@ -1,12 +1,21 @@ { "name": "sqlcipher", - "version": "4.5.1", + "version": "4.5.2", "description": "SQLCipher extends the SQLite database library to add security enhancements that make it more suitable for encrypted local data storage.", "homepage": "https://www.zetetic.net/sqlcipher", + "license": null, "supports": "windows & !uwp & !static", "dependencies": [ "openssl", - "tcl" + "tcl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "geopoly": { diff --git a/versions/baseline.json b/versions/baseline.json index d6d3c7cda47d38..73527d400352fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6837,7 +6837,7 @@ "port-version": 1 }, "sqlcipher": { - "baseline": "4.5.1", + "baseline": "4.5.2", "port-version": 0 }, "sqlite-modern-cpp": { diff --git a/versions/s-/sqlcipher.json b/versions/s-/sqlcipher.json index 391a0ed1d56b68..44b5caf0e094eb 100644 --- a/versions/s-/sqlcipher.json +++ b/versions/s-/sqlcipher.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56c606b11bcc5de6e0a93cde32b9c876539d6df4", + "version": "4.5.2", + "port-version": 0 + }, { "git-tree": "3803a9648861130c25517c8b330c17d054fe6cd7", "version": "4.5.1", From 5d6bbf3da3f6c67408f3fcf5e07df9a3e185adb0 Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Wed, 10 Aug 2022 14:36:23 -0400 Subject: [PATCH 363/791] [osgearth] Fix naming of target and exported variables (#26258) * [osgearth] Fix target name and match exported variables * Fix version SHA --- ports/osgearth/fix-osgearth-config.patch | 80 ++++++++++++++++++++---- ports/osgearth/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/osgearth.json | 5 ++ 4 files changed, 76 insertions(+), 13 deletions(-) diff --git a/ports/osgearth/fix-osgearth-config.patch b/ports/osgearth/fix-osgearth-config.patch index 31efaac737f3d7..04a061e93baded 100644 --- a/ports/osgearth/fix-osgearth-config.patch +++ b/ports/osgearth/fix-osgearth-config.patch @@ -1,27 +1,85 @@ diff --git a/osgEarthConfig.cmake.in b/osgEarthConfig.cmake.in -index 3f27dffe9..354e0f7dc 100644 +index 3f27dffe9..4141ff939 100644 --- a/osgEarthConfig.cmake.in +++ b/osgEarthConfig.cmake.in -@@ -13,11 +13,11 @@ endif() - set(osgearth_DEFINITIONS ${${XPREFIX}_CFLAGS}) +@@ -6,52 +6,54 @@ set(XPREFIX OSGEARTH) - find_path(osgearth_INCLUDE_DIR -- NAMES OSGEARTH/RTREE.H -+ NAMES osgEarth/rtree.h + + +-if (osgearth_USE_STATIC_LIBS) ++if (osgEarth_USE_STATIC_LIBS) + set(XPREFIX ${XPREFIX}_STATIC) + endif() + +-set(osgearth_DEFINITIONS ${${XPREFIX}_CFLAGS}) ++set(osgEarth_DEFINITIONS ${${XPREFIX}_CFLAGS}) + +-find_path(osgearth_INCLUDE_DIR ++find_path(osgEarth_INCLUDE_DIR + NAMES OSGEARTH/RTREE.H HINTS ${${XPREFIX}_INCLUDE_DIRS} ) -set(OSGEARTH_NAMES osgearth) +set(OSGEARTH_NAMES osgEarth) - find_library(osgearth_LIBRARY +-find_library(osgearth_LIBRARY ++find_library(osgEarth_LIBRARY NAMES ${OSGEARTH_NAMES} -@@ -38,6 +38,8 @@ find_package_handle_standard_args(osgearth DEFAULT_MSG + HINTS ${${XPREFIX}_LIBRARY_DIRS} + ) + +-set(osgearth_LIBRARIES ${osgearth_LIBRARY}) +-set(osgearth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) +-set(osgearth_LIBRARY_DIR ${osgearth_LIBRARY_DIRS}) +-set(osgearth_INCLUDE_DIRS ${osgearth_INCLUDE_DIR}) +-set(osgearth_LDFLAGS ${${XPREFIX}_LDFLAGS}) ++set(osgEarth_LIBRARIES ${osgEarth_LIBRARY}) ++set(osgEarth_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) ++set(osgEarth_LIBRARY_DIR ${osgEarth_LIBRARY_DIRS}) ++set(osgEarth_INCLUDE_DIRS ${osgEarth_INCLUDE_DIR}) ++set(osgEarth_LDFLAGS ${${XPREFIX}_LDFLAGS}) - string (REPLACE ";" " " osgearth_LDFLAGS "${osgearth_LDFLAGS}") + include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(osgearth DEFAULT_MSG +- osgearth_LIBRARY +- osgearth_INCLUDE_DIR ++find_package_handle_standard_args(osgEarth DEFAULT_MSG ++ osgEarth_LIBRARY ++ osgEarth_INCLUDE_DIR + ) +-string (REPLACE ";" " " osgearth_LDFLAGS "${osgearth_LDFLAGS}") ++string (REPLACE ";" " " osgEarth_LDFLAGS "${osgEarth_LDFLAGS}") + +-set_target_properties(osgearth +add_library(osgEarth UNKNOWN IMPORTED) + - set_target_properties(osgearth ++set_target_properties(osgEarth PROPERTIES - IMPORTED_LOCATION "${osgearth_LIBRARIES}" +- IMPORTED_LOCATION "${osgearth_LIBRARIES}" +- INTERFACE_INCLUDE_DIRECTORIES "${osgearth_INCLUDE_DIRS}" +- INTERFACE_LINK_LIBRARIES "${osgearth_LDFLAGS}" +- INTERFACE_COMPILE_OPTIONS "${osgearth_DEFINITIONS}" ++ IMPORTED_LOCATION "${osgEarth_LIBRARIES}" ++ INTERFACE_INCLUDE_DIRECTORIES "${osgEarth_INCLUDE_DIRS}" ++ INTERFACE_LINK_LIBRARIES "${osgEarth_LDFLAGS}" ++ INTERFACE_COMPILE_OPTIONS "${osgEarth_DEFINITIONS}" + ) + +- message(STATUS "osgearth_FOUND: ${osgearth_FOUND}") +- message(STATUS "osgearth_INCLUDE_DIRS: ${osgearth_INCLUDE_DIRS}") +- message(STATUS "osgearth_LIBRARIES: ${osgearth_LIBRARIES}") +- message(STATUS "osgearth_LDFLAGS: ${osgearth_LDFLAGS}") +- message(STATUS "osgearth_DEFINITIONS: ${osgearth_DEFINITIONS}") ++ message(STATUS "osgEarth_FOUND: ${osgEarth_FOUND}") ++ message(STATUS "osgEarth_INCLUDE_DIRS: ${osgEarth_INCLUDE_DIRS}") ++ message(STATUS "osgEarth_LIBRARIES: ${osgEarth_LIBRARIES}") ++ message(STATUS "osgEarth_LDFLAGS: ${osgEarth_LDFLAGS}") ++ message(STATUS "osgEarth_DEFINITIONS: ${osgEarth_DEFINITIONS}") + + + +-check_required_components(osgearth) +\ No newline at end of file ++check_required_components(osgEarth) diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index bb99a1eca06eb3..364478fc0e46d9 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osgearth", "version": "3.3", - "port-version": 1, + "port-version": 2, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 73527d400352fa..87bdfe4b9c913c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5346,7 +5346,7 @@ }, "osgearth": { "baseline": "3.3", - "port-version": 1 + "port-version": 2 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index c647b8382540ef..b530496b7cd290 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a9e3fa28dc78e768ff9ef2ca4ff09b51b774cbb", + "version": "3.3", + "port-version": 2 + }, { "git-tree": "1091743df235c6472d30b157723f82e6d3473cc9", "version": "3.3", From d97c3ab76cc949241880badd7992ca9295faee6d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 10 Aug 2022 13:14:52 -0700 Subject: [PATCH 364/791] [vcpkg-msbuild-integration] Set the default value of `VcpkgConfiguration` according to `$(UseDebugLibraries)` rather than `$(Configuration)` for better support of custom configuration names. (#26177) Competing resolution of https://github.com/microsoft/vcpkg/pull/9496 and https://github.com/microsoft/vcpkg/pull/22086 --- scripts/buildsystems/msbuild/vcpkg.props | 24 +++++++++++++++++++++- scripts/buildsystems/msbuild/vcpkg.targets | 2 ++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/msbuild/vcpkg.props b/scripts/buildsystems/msbuild/vcpkg.props index 9a01beb5ade60f..f728dc737f400a 100644 --- a/scripts/buildsystems/msbuild/vcpkg.props +++ b/scripts/buildsystems/msbuild/vcpkg.props @@ -3,7 +3,29 @@ true true - $(Configuration) + + + + + + + + $(Configuration) + + + + + Debug + + + + + Release + + + + + false $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..')) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 3e26f67f947a3c..9719f388ee19eb 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -109,6 +109,8 @@ + Date: Wed, 10 Aug 2022 22:22:26 +0200 Subject: [PATCH 365/791] [gobject-introspection] no absolute paths (#24845) --- .../0003-fix-paths.patch | 22 +++++++++++++++++++ ports/gobject-introspection/portfile.cmake | 4 +++- ports/gobject-introspection/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gobject-introspection.json | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ports/gobject-introspection/0003-fix-paths.patch diff --git a/ports/gobject-introspection/0003-fix-paths.patch b/ports/gobject-introspection/0003-fix-paths.patch new file mode 100644 index 00000000000000..b305da4472f365 --- /dev/null +++ b/ports/gobject-introspection/0003-fix-paths.patch @@ -0,0 +1,22 @@ +diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in +index 75c35a7..499ed01 100644 +--- a/tools/g-ir-tool-template.in ++++ b/tools/g-ir-tool-template.in +@@ -46,7 +46,7 @@ if debug: + filedir = os.path.dirname(__file__) + + # Try using relative paths first so that the installation prefix is relocatable +-datadir = os.path.abspath(os.path.join(filedir, '..', 'share')) ++datadir = os.path.abspath(os.path.join(filedir, '..', '..', 'share')) + # Fallback to hard-coded paths if the relocatable paths are wrong + if not os.path.isdir(os.path.join(datadir, 'gir-1.0')): + datadir = "@datarootdir@" +@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir + + # Respect gir_dir_prefix + girdir = '' +-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@')) ++girdir = datadir + builtins.__dict__['GIRDIR'] = [girdir] + + # Again, relative paths first so that the installation prefix is relocatable diff --git a/ports/gobject-introspection/portfile.cmake b/ports/gobject-introspection/portfile.cmake index b5ae3bc053499c..24458ac628b16f 100644 --- a/ports/gobject-introspection/portfile.cmake +++ b/ports/gobject-introspection/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( PATCHES 0001-g-ir-tool-template.in.patch 0002-cross-build.patch + 0003-fix-paths.patch python.patch ) @@ -68,7 +69,8 @@ vcpkg_copy_tools(TOOL_NAMES ${GI_TOOLS} AUTO_CLEAN) foreach(script IN LISTS GI_SCRIPTS) file(READ "${CURRENT_PACKAGES_DIR}/bin/${script}" _contents) string(REPLACE "#!/usr/bin/env ${PYTHON3}" "#!/usr/bin/env python3" _contents "${_contents}") - string(REPLACE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_INSTALLED_DIR}/lib" _contents "${_contents}") + string(REPLACE "datadir = \"${CURRENT_PACKAGES_DIR}/share\"" "raise Exception('could not find right path') " _contents "${_contents}") + string(REPLACE "pylibdir = os.path.join('${CURRENT_PACKAGES_DIR}/lib', 'gobject-introspection')" "raise Exception('could not find right path') " _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${script}" "${_contents}") file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${script}") diff --git a/ports/gobject-introspection/vcpkg.json b/ports/gobject-introspection/vcpkg.json index 1da115b5f238e4..ed8a0fa75f17b3 100644 --- a/ports/gobject-introspection/vcpkg.json +++ b/ports/gobject-introspection/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gobject-introspection", "version": "1.72.0", + "port-version": 1, "description": "A middleware layer between C libraries (using GObject) and language bindings.", "homepage": "https://gi.readthedocs.io/en/latest/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 87bdfe4b9c913c..d1b8de05477e73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2642,7 +2642,7 @@ }, "gobject-introspection": { "baseline": "1.72.0", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp": { "baseline": "2.1.0", diff --git a/versions/g-/gobject-introspection.json b/versions/g-/gobject-introspection.json index 5594257788dd5c..e9f5654798e570 100644 --- a/versions/g-/gobject-introspection.json +++ b/versions/g-/gobject-introspection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a74d57d679dac22f5b60c5b7da97cad7ecb3d0fb", + "version": "1.72.0", + "port-version": 1 + }, { "git-tree": "7af27cca9283357e5b7447e5a1c6583afc50c793", "version": "1.72.0", From ba4aea932f843ae0c37f571dcb86e91871cee103 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 10 Aug 2022 22:23:49 +0200 Subject: [PATCH 366/791] [mathgl] no absolute paths (#22363) --- ports/mathgl/portfile.cmake | 3 ++- ports/mathgl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mathgl.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index 65c1abe18f368f..9ff548ae2f39a9 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -80,6 +80,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_INSTALL_DIR \"${CURRENT_PACKAGES_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH \"${CURRENT_PACKAGES_DIR}/fonts\"" "") # there is no fonts folder +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH \"${CURRENT_PACKAGES_DIR}/fonts\"" "") # there is no fonts folder +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH\t\"${CURRENT_PACKAGES_DIR}/share/mathgl/fonts\"" "") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mathgl" RENAME copyright) diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index 54661f76b29fa8..0ba2be4c6000fa 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mathgl", "version": "2.5", + "port-version": 1, "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index d1b8de05477e73..b12b73db3c1b16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4506,7 +4506,7 @@ }, "mathgl": { "baseline": "2.5", - "port-version": 0 + "port-version": 1 }, "matio": { "baseline": "1.5.23", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index f1cb188ae8f7b5..ae0be23d253dd2 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2601a536d9214365148c954f41a6597939a89d7d", + "version": "2.5", + "port-version": 1 + }, { "git-tree": "d75f46bbb8d518f326f688d355d5e9d241f44dc6", "version": "2.5", From 1370b2c88f1e683c5c6a2465133eaa9a9b3ee679 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 11 Aug 2022 01:08:17 +0200 Subject: [PATCH 367/791] [sdl2] add 'wayland' feature (#26261) --- ports/sdl2/portfile.cmake | 8 ++++++-- ports/sdl2/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index decda844699ed5..b53309d73fbcb0 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -19,13 +19,17 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - vulkan SDL_VULKAN - x11 SDL_X11_SHARED + vulkan SDL_VULKAN + x11 SDL_X11_SHARED + wayland SDL_WAYLAND_SHARED ) if ("x11" IN_LIST FEATURES) message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") endif() +if ("wayland" IN_LIST FEATURES) + message(WARNING "You will need to install Wayland dependencies to use feature wayland:\nsudo apt install libwayland-dev libxkbcommon-dev libegl1-mesa-dev\n") +endif() if(VCPKG_TARGET_IS_UWP) set(configure_opts WINDOWS_USE_MSBUILD) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 60d84570be32a8..fa8ec39c64fa71 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2", "version": "2.0.22", - "port-version": 2, + "port-version": 3, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", @@ -19,6 +19,10 @@ "vulkan": { "description": "Vulkan functionality for SDL" }, + "wayland": { + "description": "Dynamically load Wayland support", + "supports": "linux" + }, "x11": { "description": "Dynamically load X11 support", "supports": "!windows" diff --git a/versions/baseline.json b/versions/baseline.json index b12b73db3c1b16..670df3b63656ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6498,7 +6498,7 @@ }, "sdl2": { "baseline": "2.0.22", - "port-version": 2 + "port-version": 3 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index f9218721df854d..a6b9279a342e14 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69c64474577715f87366d9374b0483256f305f1e", + "version": "2.0.22", + "port-version": 3 + }, { "git-tree": "c14a0021322c01cb256a4a54ea48a9ddf8023622", "version": "2.0.22", From 79211d3e4a8c79bc81858f1622b81d6ca6fed72e Mon Sep 17 00:00:00 2001 From: Li Xiaobin Date: Fri, 12 Aug 2022 04:09:00 +0800 Subject: [PATCH 368/791] [mysql-connector-cpp] Add new port (#25652) * [mysql-connector-cpp] Add new port * [mysql-connector-cpp] add version * [mysql-connector-cpp] Fix code review suggestion * [mysql-connector-cpp] Run x-add-version * [mysql-connector-cpp] Quote cmake expressions; Add CMake targets * unofficial targets Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * unofficial targets Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * unofficial targets Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * unofficial targets Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * unofficial targets Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * unofficial targets Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * unofficial targets Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [mysql-connector-cpp] Add unofficial targets and usage * [mysql-connector-cpp] Run x-add-version * [mysql-connector-cpp] Fix code review suggestion * [mysql-connector-cpp] Run x-add-version * Fix license and supports nitpick. * Version DB * Remove vcpkg-cmake-wrapper * Version DB Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy O'Neal --- ports/mysql-connector-cpp/FindMySQL.cmake | 42 ++++ .../fix-static-build.patch | 182 ++++++++++++++++++ .../mysql-connector-cpp-config.cmake.in | 9 + ports/mysql-connector-cpp/portfile.cmake | 54 ++++++ ports/mysql-connector-cpp/usage | 9 + ports/mysql-connector-cpp/vcpkg.json | 21 ++ versions/baseline.json | 4 + versions/m-/mysql-connector-cpp.json | 9 + 8 files changed, 330 insertions(+) create mode 100644 ports/mysql-connector-cpp/FindMySQL.cmake create mode 100644 ports/mysql-connector-cpp/fix-static-build.patch create mode 100644 ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in create mode 100644 ports/mysql-connector-cpp/portfile.cmake create mode 100644 ports/mysql-connector-cpp/usage create mode 100644 ports/mysql-connector-cpp/vcpkg.json create mode 100644 versions/m-/mysql-connector-cpp.json diff --git a/ports/mysql-connector-cpp/FindMySQL.cmake b/ports/mysql-connector-cpp/FindMySQL.cmake new file mode 100644 index 00000000000000..f19f9b28534155 --- /dev/null +++ b/ports/mysql-connector-cpp/FindMySQL.cmake @@ -0,0 +1,42 @@ +find_package(libmysql REQUIRED) + +set(MYSQL_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/mysql") + +if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h") + message(FATAL_ERROR "MYSQL_INCLUDE_DIR given, but no \"mysql.h\" in \"${MYSQL_INCLUDE_DIR}\"") +endif() + +# Write the C source file that will include the MySQL headers +set(GETMYSQLVERSION_SOURCEFILE "${CMAKE_CURRENT_BINARY_DIR}/getmysqlversion.c") +file(WRITE "${GETMYSQLVERSION_SOURCEFILE}" + "#include \n" + "#include \n" + "int main() {\n" + " printf(\"%s\", MYSQL_SERVER_VERSION);\n" + "}\n" +) + +# Compile and run the created executable, store output in MYSQL_VERSION +try_run(_run_result _compile_result + "${CMAKE_BINARY_DIR}" + "${GETMYSQLVERSION_SOURCEFILE}" + CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${MYSQL_INCLUDE_DIR}" + RUN_OUTPUT_VARIABLE MYSQL_VERSION +) + +if(NOT MYSQL_VERSION) + message(FATAL_ERROR "Could not determine the MySQL Server version") +endif() + +# Clean up so only numeric, in case of "-alpha" or similar +string(REGEX MATCHALL "([0-9]+.[0-9]+.[0-9]+)" MYSQL_VERSION "${MYSQL_VERSION}") + +# To create a fully numeric version, first normalize so N.NN.NN +string(REGEX REPLACE "[.]([0-9])[.]" ".0\\1." MYSQL_VERSION_ID "${MYSQL_VERSION}") +string(REGEX REPLACE "[.]([0-9])$" ".0\\1" MYSQL_VERSION_ID "${MYSQL_VERSION_ID}") + +# Finally remove the dot +string(REGEX REPLACE "[.]" "" MYSQL_VERSION_ID "${MYSQL_VERSION_ID}") +set(MYSQL_NUM_VERSION ${MYSQL_VERSION_ID}) + +include_directories("${MYSQL_INCLUDE_DIR}") diff --git a/ports/mysql-connector-cpp/fix-static-build.patch b/ports/mysql-connector-cpp/fix-static-build.patch new file mode 100644 index 00000000000000..554ee5fe76a89f --- /dev/null +++ b/ports/mysql-connector-cpp/fix-static-build.patch @@ -0,0 +1,182 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4cb920..eeb17ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -126,8 +126,8 @@ ENDIF() + # CPPFLAGS, CXXFLAGS and LDFLAGS from the environment + + SET(FreeBSD11Up False) +-if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" AND +- ${CMAKE_SYSTEM_VERSION} GREATER "10") ++if ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD" AND ++ "${CMAKE_SYSTEM_VERSION}" GREATER "10") + SET(FreeBSD11Up True) + endif() + +@@ -490,10 +490,12 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/driver/nativeapi) + ADD_SUBDIRECTORY(cppconn) + ADD_SUBDIRECTORY(driver) + ADD_SUBDIRECTORY(examples) ++IF(MYSQLCPPCONN_BUILD_TESTS) + ADD_SUBDIRECTORY(test) + ADD_SUBDIRECTORY(test/framework) + ADD_SUBDIRECTORY(test/CJUnitTestsPort) + ADD_SUBDIRECTORY(test/unit) ++ENDIF(MYSQLCPPCONN_BUILD_TESTS) + + IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") + # see also README +diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt +index e7136aa..740defa 100644 +--- a/driver/CMakeLists.txt ++++ b/driver/CMakeLists.txt +@@ -181,9 +181,13 @@ IF(WIN32) + ENDIF(WIN32) + + ++IF(ENABLE_BUILD_DYNAMIC) + ADD_LIBRARY(mysqlcppconn SHARED ${MYSQLCPPCONN_SOURCES}) ++ENDIF(ENABLE_BUILD_DYNAMIC) ++IF(ENABLE_BUILD_STATIC) + ADD_LIBRARY(mysqlcppconn-static STATIC ${MYSQLCPPCONN_SOURCES}) +-SET(MYSQL_LIB_OBJECTS "${MYSQL_LIBRARIES}") ++ENDIF(ENABLE_BUILD_STATIC) ++SET(MYSQL_LIB_OBJECTS "") + + IF(WIN32) + INCLUDE_DIRECTORIES(${MYSQL_DIR}/include) +@@ -200,8 +204,10 @@ IF(WIN32) + #Disables bunch of pretty useless warnings on win + ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS") + ++ IF(ENABLE_BUILD_DYNAMIC) + ADD_LIBRARY(mysqlclient STATIC IMPORTED) + SET_TARGET_PROPERTIES(mysqlclient PROPERTIES IMPORTED_LOCATION "${MYSQL_LIB}" ) ++ ENDIF(ENABLE_BUILD_DYNAMIC) + + IF(MYSQLCLIENT_STATIC_BINDING) + SET(MY_TARGET_LINK_LIBRARIES_DYNAMIC mysqlclient ws2_32) +@@ -240,6 +246,7 @@ ELSEIF(NOT WIN32) + FILE(TO_NATIVE_PATH ${OBJ} OBJ) + SET(MYSQL_STATIC_LIB_OBJECTS "${MYSQL_STATIC_LIB_OBJECTS} ${OBJ}") + ENDFOREACH(OBJ ${MYSQL_STATIC_OBJECTS}) ++ FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/.MYSQL_ARCHIVES ${CMAKE_CURRENT_BINARY_DIR}/../.MYSQL_ARCHIVES) + ENDIF(MYSQLCLIENT_STATIC_LINKING) + SET(MYSQL_LIB_OBJECTS "${MYSQL_STATIC_LIB_OBJECTS}") + ENDIF(WIN32) +@@ -250,24 +257,28 @@ IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE) + ENDIF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE) + + +-TARGET_LINK_LIBRARIES(mysqlcppconn ${MY_TARGET_LINK_LIBRARIES_DYNAMIC} ++IF(ENABLE_BUILD_DYNAMIC) ++TARGET_LINK_LIBRARIES(mysqlcppconn PRIVATE ${MYSQL_LIBRARIES} + ${MY_GCOV_LINK_LIBRARIES} + ${MYSQLCPPCONN_BOOST_SYSTEM_LIBS} + ${MYSQLCPPCONN_BOOST_THREAD_LIBS} + ${MYSQLCPPCONN_EXTRA_LIBRARIES} + ${MYSQLCPPCONN_ICU_LIBRARY}) ++ENDIF(ENABLE_BUILD_DYNAMIC) + + # Need to find way it's defined for mysqlcppconn-static only + #IF(WIN32) + # ADD_DEFINITIONS("-DCPPCONN_PUBLIC_FUNC=\"\"") + #ENDIF(WIN32) + +-TARGET_LINK_LIBRARIES(mysqlcppconn-static ${MY_TARGET_LINK_LIBRARIES_STATIC} ++IF(ENABLE_BUILD_STATIC) ++TARGET_LINK_LIBRARIES(mysqlcppconn-static PRIVATE ${MYSQL_LIBRARIES} + ${MY_GCOV_LINK_LIBRARIES} + ${MYSQLCPPCONN_BOOST_SYSTEM_LIBS} + ${MYSQLCPPCONN_BOOST_THREAD_LIBS} + ${MYSQLCPPCONN_EXTRA_LIBRARIES} + ${MYSQLCPPCONN_ICU_LIBRARY}) ++ENDIF(ENABLE_BUILD_STATIC) + + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + # We pass objects from our C client library in the +@@ -284,12 +295,15 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + SET(CMAKE_CXX_CREATE_STATIC_LIBRARY " cr ") + ENDIF() + ++IF(ENABLE_BUILD_STATIC) + SET_TARGET_PROPERTIES(mysqlcppconn-static PROPERTIES + LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}" + COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}" + COMPILE_DEFINITIONS CPPCONN_LIB_BUILD="" + STATIC_LIBRARY_FLAGS "${MYSQL_LIB_OBJECTS}") ++ENDIF(ENABLE_BUILD_STATIC) + ++IF(ENABLE_BUILD_DYNAMIC) + SET_TARGET_PROPERTIES(mysqlcppconn + PROPERTIES + SOVERSION "${MYSQLCPPCONN_SOVERSION}" +@@ -298,6 +312,7 @@ SET_TARGET_PROPERTIES(mysqlcppconn + COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}" + COMPILE_DEFINITIONS CPPCONN_SO_BUILD="" + LINK_INTERFACE_LIBRARIES "") ++ENDIF(ENABLE_BUILD_DYNAMIC) + + IF(WIN32) + # SET_TARGET_PROPERTIES(mysqlcppconn PROPERTIES +@@ -316,14 +331,29 @@ IF(WIN32) + # CHANGE_CRT("/MD") + # ENDIF() + +- INSTALL(TARGETS mysqlcppconn mysqlcppconn-static +- RUNTIME DESTINATION lib ++ IF(ENABLE_BUILD_STATIC) ++ IF(STATIC_CRT) ++ INCLUDE(${CMAKE_SOURCE_DIR}/changeCrt.cmake) ++ CHANGE_CRT("T") ++ ENDIF(STATIC_CRT) ++ INSTALL(TARGETS mysqlcppconn-static ++ EXPORT unofficial-mysql-connector-cpp-targets ++ RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + ) ++ ENDIF(ENABLE_BUILD_STATIC) ++ IF(ENABLE_BUILD_DYNAMIC) ++ INSTALL(TARGETS mysqlcppconn ++ EXPORT unofficial-mysql-connector-cpp-targets ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ ) ++ ENDIF(ENABLE_BUILD_DYNAMIC) + ELSE(WIN32) + IF(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_STATIC) + IF(ENABLE_BUILD_DYNAMIC) + INSTALL(TARGETS mysqlcppconn ++ EXPORT unofficial-mysql-connector-cpp-targets + LIBRARY DESTINATION ${INSTALL_LIBDIR} + ARCHIVE DESTINATION ${INSTALL_LIBDIR} + ) +@@ -331,6 +361,7 @@ ELSE(WIN32) + + IF(ENABLE_BUILD_STATIC) + INSTALL(TARGETS mysqlcppconn-static ++ EXPORT unofficial-mysql-connector-cpp-targets + LIBRARY DESTINATION ${INSTALL_LIBDIR} + ARCHIVE DESTINATION ${INSTALL_LIBDIR} + ) +@@ -343,6 +374,12 @@ ELSE(WIN32) + ENDIF(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_STATIC) + ENDIF(WIN32) + ++include(CMakePackageConfigHelpers) ++configure_package_config_file( ++ "${CMAKE_SOURCE_DIR}/mysql-connector-cpp-config.cmake.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" ++ INSTALL_DESTINATION "share/unofficial-mysql-connector-cpp" ++) + + # Install some MySQL specific headers + SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS +@@ -352,5 +389,7 @@ SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS + + INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include) + ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" DESTINATION "share/unofficial-mysql-connector-cpp") ++install(EXPORT unofficial-mysql-connector-cpp-targets DESTINATION share/unofficial-mysql-connector-cpp) + + MESSAGE(STATUS "Configuring driver") diff --git a/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in b/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in new file mode 100644 index 00000000000000..9f4910b6c0009a --- /dev/null +++ b/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +find_dependency(libmysql) +find_dependency(Boost) + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-mysql-connector-cpp-targets.cmake") +check_required_components(mysql-connector-cpp) diff --git a/ports/mysql-connector-cpp/portfile.cmake b/ports/mysql-connector-cpp/portfile.cmake new file mode 100644 index 00000000000000..5193d53422b164 --- /dev/null +++ b/ports/mysql-connector-cpp/portfile.cmake @@ -0,0 +1,54 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mysql/mysql-connector-cpp + REF 1.1.13 + SHA512 76cf3d8c9dbaa006ccbb3c672538c540167c7a9cf3406a371313dc346598b119515f25fea2a786bb8cab12d96fd607b69f320a6d897aaeeb668eff831920fb5f + HEAD_REF master + PATCHES + fix-static-build.patch +) + +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/mysql-connector-cpp-config.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/FindMySQL.cmake" + DESTINATION "${SOURCE_PATH}" +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_BUILD_DYNAMIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +# Use mysql-connector-cpp's own build process, skipping examples and tests. +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + WINDOWS_USE_MSBUILD + OPTIONS + -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=OFF + -DMYSQLCPPCONN_BUILD_TESTS:BOOL=OFF + -DENABLE_BUILD_DYNAMIC=${ENABLE_BUILD_DYNAMIC} + -DENABLE_BUILD_STATIC=${ENABLE_BUILD_STATIC} + -DMYSQLCLIENT_STATIC_LINKING=${ENABLE_BUILD_STATIC} + -DSTATIC_CRT=${STATIC_CRT} + MAYBE_UNUSED_VARIABLES + STATIC_CRT + MYSQLCLIENT_STATIC_LINKING +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-mysql-connector-cpp) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/BUILDINFO" + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/debug/BUILDINFO" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README" +) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mysql-connector-cpp/usage b/ports/mysql-connector-cpp/usage new file mode 100644 index 00000000000000..99e1efcfe724ec --- /dev/null +++ b/ports/mysql-connector-cpp/usage @@ -0,0 +1,9 @@ +The package mysql-connector-cpp provides CMake targets: + + find_package(unofficial-mysql-connector-cpp CONFIG REQUIRED) + target_link_libraries(main PRIVATE mysqlcppconn) + + or + + find_package(unofficial-mysql-connector-cpp CONFIG REQUIRED) + target_link_libraries(main PRIVATE mysqlcppconn-static) diff --git a/ports/mysql-connector-cpp/vcpkg.json b/ports/mysql-connector-cpp/vcpkg.json new file mode 100644 index 00000000000000..ac86759c3b0670 --- /dev/null +++ b/ports/mysql-connector-cpp/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "mysql-connector-cpp", + "version": "1.1.13", + "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.", + "homepage": "https://github.com/mysql/mysql-connector-cpp", + "license": null, + "supports": "!uwp", + "dependencies": [ + "boost-date-time", + "boost-thread", + "libmysql", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 670df3b63656ea..703bed4e3c1b58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4820,6 +4820,10 @@ "baseline": "3.4.1", "port-version": 3 }, + "mysql-connector-cpp": { + "baseline": "1.1.13", + "port-version": 0 + }, "nameof": { "baseline": "0.10.2", "port-version": 0 diff --git a/versions/m-/mysql-connector-cpp.json b/versions/m-/mysql-connector-cpp.json new file mode 100644 index 00000000000000..aa88ca9ccf2ada --- /dev/null +++ b/versions/m-/mysql-connector-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9189c43b6dc73ec3c3765d025e12297fd5a79d37", + "version": "1.1.13", + "port-version": 0 + } + ] +} From 2c7862c4aa1ba2c2b912f0aa036cff8a21e0bed1 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 12 Aug 2022 09:17:20 +0800 Subject: [PATCH 369/791] [luajit] update to the latest commit (#25856) * update version * update version * [luajit] update to latest commit * update version * add patch * update version --- ports/luajit/001-fix-build-path.patch | 36 +++++++++---------- ports/luajit/002-fix-crt-linkage.patch | 14 ++++---- ...-do-not-set-macosx-deployment-target.patch | 28 +++++++-------- ports/luajit/portfile.cmake | 20 ++++------- ports/luajit/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/l-/luajit.json | 5 +++ 7 files changed, 54 insertions(+), 56 deletions(-) diff --git a/ports/luajit/001-fix-build-path.patch b/ports/luajit/001-fix-build-path.patch index bd14d708947a57..db76d4d0046e5f 100644 --- a/ports/luajit/001-fix-build-path.patch +++ b/ports/luajit/001-fix-build-path.patch @@ -1,11 +1,11 @@ diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index 42e3652..6a889e1 100644 +index aab4ef1..ff9df57 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat -@@ -14,17 +14,18 @@ - @if not defined INCLUDE goto :FAIL - +@@ -15,19 +15,20 @@ @setlocal + @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK + @set DEBUGCFLAGS= -@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline +@set SOURCEDIR=%1 +@set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline /I%SOURCEDIR% @@ -15,9 +15,11 @@ index 42e3652..6a889e1 100644 -@set DASMDIR=..\dynasm +@set DASMDIR=%SOURCEDIR%\..\dynasm @set DASM=%DASMDIR%\dynasm.lua + @set DASC=vm_x64.dasc @set LJDLLNAME=lua51.dll @set LJLIBNAME=lua51.lib --@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c + @set BUILDTYPE=release +-@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c +@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c -%LJCOMPILE% host\minilua.c @@ -25,12 +27,8 @@ index 42e3652..6a889e1 100644 @if errorlevel 1 goto :BAD %LJLINK% /out:minilua.exe minilua.obj @if errorlevel 1 goto :BAD -@@ -38,10 +39,10 @@ if exist minilua.exe.manifest^ - @set DASMFLAGS=-D WIN -D JIT -D FFI - @set LJARCH=x86 - :X64 --minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h vm_x86.dasc -+minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %SOURCEDIR%\vm_x86.dasc +@@ -51,7 +52,7 @@ if exist minilua.exe.manifest^ + minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% @if errorlevel 1 goto :BAD -%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c @@ -38,7 +36,7 @@ index 42e3652..6a889e1 100644 @if errorlevel 1 goto :BAD %LJLINK% /out:buildvm.exe buildvm*.obj @if errorlevel 1 goto :BAD -@@ -50,39 +51,39 @@ if exist buildvm.exe.manifest^ +@@ -60,41 +61,41 @@ if exist buildvm.exe.manifest^ buildvm -m peobj -o lj_vm.obj @if errorlevel 1 goto :BAD @@ -65,9 +63,11 @@ index 42e3652..6a889e1 100644 +@set LJLINK=%LJLINK% /debug +@if "%2" neq "debug" goto :NODEBUG @shift - @set LJCOMPILE=%LJCOMPILE% /Zi --@set LJLINK=%LJLINK% /debug + @set BUILDTYPE=debug + @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% +-@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no :NODEBUG + @set LJLINK=%LJLINK% /%BUILDTYPE% -@if "%1"=="amalg" goto :AMALGDLL -@if "%1"=="static" goto :STATIC -%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c @@ -91,7 +91,7 @@ index 42e3652..6a889e1 100644 @if errorlevel 1 goto :BAD %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj @if errorlevel 1 goto :BAD -@@ -90,7 +91,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c +@@ -102,7 +103,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c if exist %LJDLLNAME%.manifest^ %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 @@ -100,7 +100,7 @@ index 42e3652..6a889e1 100644 @if errorlevel 1 goto :BAD %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% @if errorlevel 1 goto :BAD -@@ -98,8 +99,8 @@ if exist luajit.exe.manifest^ +@@ -110,8 +111,8 @@ if exist luajit.exe.manifest^ %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe @del *.obj *.manifest minilua.exe buildvm.exe @@ -111,9 +111,9 @@ index 42e3652..6a889e1 100644 @echo. @echo === Successfully built LuaJIT for Windows/%LJARCH% === -@@ -112,4 +113,5 @@ if exist luajit.exe.manifest^ +@@ -124,4 +125,5 @@ if exist luajit.exe.manifest^ @goto :END :FAIL - @echo You must open a "Visual Studio .NET Command Prompt" to run this script + @echo You must open a "Visual Studio Command Prompt" to run this script +exit 1 :END diff --git a/ports/luajit/002-fix-crt-linkage.patch b/ports/luajit/002-fix-crt-linkage.patch index cbc273efcdfaec..6981b698a96455 100644 --- a/ports/luajit/002-fix-crt-linkage.patch +++ b/ports/luajit/002-fix-crt-linkage.patch @@ -1,8 +1,8 @@ diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index 6a889e1..08c4e3c 100644 +index ff9df57..912bdc9 100644 --- a/src/msvcbuild.bat +++ b/src/msvcbuild.bat -@@ -64,20 +64,23 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% +@@ -74,22 +74,25 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c @if errorlevel 1 goto :BAD @@ -12,14 +12,16 @@ index 6a889e1..08c4e3c 100644 -@if "%2" neq "debug" goto :NODEBUG +@if "%3" neq "debug" goto :NODEBUG @shift - @set LJCOMPILE=%LJCOMPILE% /Zi + @set BUILDTYPE=debug + @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% +@set CRT_LINKAGE=%CRT_LINKAGE%d :NODEBUG + @set LJLINK=%LJLINK% /%BUILDTYPE% -@if "%2"=="amalg" goto :AMALGDLL -+@if "%3"=="amalg" goto :AMALGDLL -@if "%2"=="static" goto :STATIC -+@if "%3"=="static" goto :STATIC -%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb ++@if "%3"=="amalg" goto :AMALGDLL ++@if "%3"=="static" goto :STATIC +%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb @if errorlevel 1 goto :BAD %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj @@ -31,7 +33,7 @@ index 6a889e1..08c4e3c 100644 @if errorlevel 1 goto :BAD %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj @if errorlevel 1 goto :BAD -@@ -94,7 +94,7 @@ +@@ -103,7 +106,7 @@ buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c if exist %LJDLLNAME%.manifest^ %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 diff --git a/ports/luajit/003-do-not-set-macosx-deployment-target.patch b/ports/luajit/003-do-not-set-macosx-deployment-target.patch index 0db44b4c30db9d..4f9f6324ed7127 100644 --- a/ports/luajit/003-do-not-set-macosx-deployment-target.patch +++ b/ports/luajit/003-do-not-set-macosx-deployment-target.patch @@ -1,14 +1,14 @@ -diff --git a/src/Makefile b/src/Makefile -index f7f81a4..e6140c4 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -297,9 +297,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector - TARGET_XCFLAGS+= -fno-stack-protector - endif - ifeq (Darwin,$(TARGET_SYS)) -- ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) -- export MACOSX_DEPLOYMENT_TARGET=10.4 -- endif - TARGET_STRIP+= -x - TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC - TARGET_DYNXLDOPTS= +diff --git a/src/Makefile b/src/Makefile +index 30d64be..b753ea1 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -316,9 +316,6 @@ ifeq (,$(shell $(TARGET_CC) -o /dev/null -c -x c /dev/null -fno-stack-protector + TARGET_XCFLAGS+= -fno-stack-protector + endif + ifeq (Darwin,$(TARGET_SYS)) +- ifeq (,$(MACOSX_DEPLOYMENT_TARGET)) +- $(error missing: export MACOSX_DEPLOYMENT_TARGET=XX.YY) +- endif + TARGET_STRIP+= -x + TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL + TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index c96c311fcbeff3..707e3d431fce13 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LuaJIT/LuaJIT - REF v2.0.5 - SHA512 65d982d7fe532a61335613f414f3b8fa5333747bdf7aefc2c2d52022d227594ade827639049b97e3c4ffae9f38f32cb15f1a17b1780fb0a943e1a3af05e2b576 + REF 633f265f67f322cbe2c5fd11d3e46d968ac220f7 #2022-08-11 + SHA512 0a1d79ab7d2de6894bcff33309e015fdba0ea67cf0425d75b9301a30006039e81b527178dbb3485e1adea177ffe062e6fcef74307f8e725678e70562d57d1a5b HEAD_REF master PATCHES 001-fix-build-path.patch @@ -29,13 +29,9 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) 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") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/minilua.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/minilua.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") - endif() vcpkg_copy_pdbs() else() vcpkg_execute_build_process( @@ -68,13 +64,9 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) 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") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/minilua.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/minilua.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) - endif() vcpkg_copy_pdbs() else() vcpkg_execute_build_process( diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 126729a0802ab6..242d42d1863313 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,7 +1,6 @@ { "name": "luajit", - "version": "2.0.5", - "port-version": 8, + "version-date": "2022-08-11", "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 703bed4e3c1b58..d50db78ca9d99f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4397,8 +4397,8 @@ "port-version": 2 }, "luajit": { - "baseline": "2.0.5", - "port-version": 8 + "baseline": "2022-08-11", + "port-version": 0 }, "luasec": { "baseline": "1.1.0", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index ee166d696b0d9c..c85757b0df537c 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c2d21d9bf0e5cedc0f7540a7e473c2e86f2c5ef", + "version-date": "2022-08-11", + "port-version": 0 + }, { "git-tree": "9b560fe2d3810733d0b0f69b2a91093b02ac49b6", "version": "2.0.5", From 83ef25133140062b2f699a8cac44f049482f9088 Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Fri, 12 Aug 2022 02:17:53 +0100 Subject: [PATCH 370/791] [openldap] Add new port (#26122) * [openlap] Add new port Merge pull request #1 from dg0yt/openldap Signed-off-by: Gordon Smith * [openlap] Add new port m4.patch is needed when libtool < 2.4.6 m4.patch will only work with autoconf < 2.70 Signed-off-by: Gordon Smith * wip: Make cyrus-sasl optional Signed-off-by: Gordon Smith --- ports/openldap/m4.patch | 12 +++++++ ports/openldap/openssl.patch | 35 +++++++++++++++++++ ports/openldap/portfile.cmake | 66 +++++++++++++++++++++++++++++++++++ ports/openldap/subdirs.patch | 34 ++++++++++++++++++ ports/openldap/usage | 6 ++++ ports/openldap/vcpkg.json | 19 ++++++++++ versions/baseline.json | 4 +++ versions/o-/openldap.json | 9 +++++ 8 files changed, 185 insertions(+) create mode 100644 ports/openldap/m4.patch create mode 100644 ports/openldap/openssl.patch create mode 100644 ports/openldap/portfile.cmake create mode 100644 ports/openldap/subdirs.patch create mode 100644 ports/openldap/usage create mode 100644 ports/openldap/vcpkg.json create mode 100644 versions/o-/openldap.json diff --git a/ports/openldap/m4.patch b/ports/openldap/m4.patch new file mode 100644 index 00000000000000..4df7e91a6d9623 --- /dev/null +++ b/ports/openldap/m4.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 71dd7a6..6741ec6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,6 +38,7 @@ m4_ifndef([PKG_PREREQ], + + AC_CONFIG_AUX_DIR(build)dnl + AC_CONFIG_MACRO_DIRS([build]) ++AC_CONFIG_MACRO_DIR([m4]) + + eval `$ac_aux_dir/version.sh` + if test -z "$OL_STRING"; then diff --git a/ports/openldap/openssl.patch b/ports/openldap/openssl.patch new file mode 100644 index 00000000000000..d04dfe8e80b40a --- /dev/null +++ b/ports/openldap/openssl.patch @@ -0,0 +1,35 @@ +diff --git a/configure.ac b/configure.ac +index 626d024..e97f548 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1223,6 +1223,9 @@ fi + + ol_link_tls=no + if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then ++ PKG_CHECK_MODULES(OPENSSL, openssl >= 1.1.1, [have_openssl=yes], [AC_MSG_FAILURE([OpenSSL is required])]) ++ CFLAGS="${OPENSSL_CFLAGS} ${CFLAGS}" ++ ac_cv_lib_ssl_SSL_export_keying_material_early=yes + AC_CHECK_HEADERS(openssl/ssl.h) + + if test $ac_cv_header_openssl_ssl_h = yes ; then +@@ -1245,7 +1248,8 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then + AC_DEFINE(HAVE_OPENSSL, 1, + [define if you have OpenSSL]) + +- TLS_LIBS="-lssl -lcrypto" ++ TLS_LIBS="${OPENSSL_LIBS}" ++ AC_SUBST(TLS_MODULE, openssl, [TLS pkg-config module]) + fi + fi + fi +diff --git a/libraries/libldap/ldap.pc.in b/libraries/libldap/ldap.pc.in +index 3f7dd46..43b2e52 100644 +--- a/libraries/libldap/ldap.pc.in ++++ b/libraries/libldap/ldap.pc.in +@@ -10,4 +10,5 @@ Version: @VERSION@ + Requires: lber + Cflags: -I${includedir} + Libs: -L${libdir} -lldap +-Libs.private: @LIBS@ @SASL_LIBS@ @TLS_LIBS@ @AUTH_LIBS@ ++Libs.private: @LIBS@ @SASL_LIBS@ @AUTH_LIBS@ ++Requires.private: @TLS_MODULE@ diff --git a/ports/openldap/portfile.cmake b/ports/openldap/portfile.cmake new file mode 100644 index 00000000000000..dd617ce45edeba --- /dev/null +++ b/ports/openldap/portfile.cmake @@ -0,0 +1,66 @@ +vcpkg_download_distfile(ARCHIVE + URLS "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.13.tgz" + FILENAME "openldap-2.5.13.tgz" + SHA512 30fdc884b513c53169910eec377c2ad05013b9f06bab3123d50d028108b24548791f7f47f18bcb3a2b4868edeab02c10d81ffa320c02d7b562f2e8f2fa25d6c9 +) + +vcpkg_list(SET EXTRA_PATCHES) + +# Check autoconf version < 2.70 +execute_process(COMMAND autoconf --version OUTPUT_VARIABLE AUTOCONF_VERSION_STR) +if(NOT "${AUTOCONF_VERSION_STR}" STREQUAL "" AND "${AUTOCONF_VERSION_STR}" MATCHES ".*2\\.[0-6].*") + vcpkg_list(APPEND EXTRA_PATCHES m4.patch) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + PATCHES + openssl.patch + subdirs.patch + ${EXTRA_PATCHES} +) + +vcpkg_list(SET FEATURE_OPTIONS) +if("tools" IN_LIST FEATURES) + vcpkg_list(APPEND FEATURE_OPTIONS --enable-tools) +endif() + +if("cyrus-sasl" IN_LIST FEATURES) + vcpkg_list(APPEND FEATURE_OPTIONS --with-cyrus-sasl) +else() + vcpkg_list(APPEND FEATURE_OPTIONS --without-cyrus-sasl) +endif() + +# Disable build environment details in binaries +set(ENV{SOURCE_DATE_EPOCH} "1659614616") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_VERBOSE_FLAGS + AUTOCONFIG + OPTIONS + ${FEATURE_OPTIONS} + --disable-cleartext + --disable-mdb + --disable-relay + --disable-slapd + --disable-syncprov + --with-tls=openssl + --without-systemd + --without-fetch + --without-argon2 + ac_cv_lib_iodbc_SQLDriverConnect=no + ac_cv_lib_odbc_SQLDriverConnect=no + ac_cv_lib_odbc32_SQLDriverConnect=no +) + +vcpkg_build_make(BUILD_TARGET depend LOGFILE_ROOT depend) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openldap/subdirs.patch b/ports/openldap/subdirs.patch new file mode 100644 index 00000000000000..633a2542cb9571 --- /dev/null +++ b/ports/openldap/subdirs.patch @@ -0,0 +1,34 @@ +diff --git a/Makefile.in b/Makefile.in +index 5c6bec0..c654210 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -13,7 +13,11 @@ + ## top-level directory of the distribution or, alternatively, at + ## . + +-SUBDIRS= include libraries clients servers tests doc ++ifeq ($(patsubst %/debug,DEBUG,$(prefix)),DEBUG) ++SUBDIRS= include libraries ++else ++SUBDIRS= include libraries @TOOLS_SUBDIRS@ ++endif + CLEANDIRS= + INSTALLDIRS= + +diff --git a/configure.ac b/configure.ac +index e97f548..71dd7a6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -235,6 +235,12 @@ dnl OL_ARG_ENABLE(referrals,[AS_HELP_STRING([--enable-referrals], [enable LDAPv2 + ol_enable_referrals=${ol_enable_referrals-no} + OL_ARG_ENABLE(ipv6, [AS_HELP_STRING([--enable-ipv6], [enable IPv6 support])], auto)dnl + OL_ARG_ENABLE(local, [AS_HELP_STRING([--enable-local], [enable AF_LOCAL (AF_UNIX) socket support])], auto)dnl ++OL_ARG_ENABLE(tools, [AS_HELP_STRING([--enable-tools], [Build client tools])],no,[no yes]) ++TOOLS_SUBDIRS="" ++if test "$ol_enable_tools" = "yes" ; then ++ TOOLS_SUBDIRS="clients" ++fi ++AC_SUBST(TOOLS_SUBDIRS) + + dnl ---------------------------------------------------------------- + dnl General "with" options diff --git a/ports/openldap/usage b/ports/openldap/usage new file mode 100644 index 00000000000000..6777fcdda3f919 --- /dev/null +++ b/ports/openldap/usage @@ -0,0 +1,6 @@ +The package openldapp can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(OPENLDAP REQUIRED IMPORTED_TARGET ldap) + + target_link_libraries(main PRIVATE PkgConfig::OPENLDAP) diff --git a/ports/openldap/vcpkg.json b/ports/openldap/vcpkg.json new file mode 100644 index 00000000000000..ef517374780882 --- /dev/null +++ b/ports/openldap/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "openldap", + "version": "2.5.13", + "description": "OpenLDAP Software is an open source implementation of the Lightweight Directory Access Protocol.", + "homepage": "https://www.openldap.org/software/", + "license": "OLDAP-2.8", + "supports": "!windows, (mingw & !x86)", + "dependencies": [ + "openssl" + ], + "features": { + "cyrus-sasl": { + "description": "with Cyrus SASL support" + }, + "tools": { + "description": "Enable client tools" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index d50db78ca9d99f..b232e506f19572 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5240,6 +5240,10 @@ "baseline": "2.5.0", "port-version": 0 }, + "openldap": { + "baseline": "2.5.13", + "port-version": 0 + }, "openmama": { "baseline": "6.3.1", "port-version": 1 diff --git a/versions/o-/openldap.json b/versions/o-/openldap.json new file mode 100644 index 00000000000000..293f8b15af4de4 --- /dev/null +++ b/versions/o-/openldap.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "63f4c67d336142daba83711983e54a8954794331", + "version": "2.5.13", + "port-version": 0 + } + ] +} From 99f75d8195ef3e1fa87252a4138d75910dcc46d6 Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Fri, 12 Aug 2022 03:24:42 +0200 Subject: [PATCH 371/791] [rioki-glow] Adds new port glow 0.2.0 (#26236) * [rioki-glow] Add version 0.2.0 * [rioki-glow] Update baseline --- ports/rioki-glow/portfile.cmake | 16 ++++++++++++++++ ports/rioki-glow/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/r-/rioki-glow.json | 9 +++++++++ 4 files changed, 48 insertions(+) create mode 100644 ports/rioki-glow/portfile.cmake create mode 100644 ports/rioki-glow/vcpkg.json create mode 100644 versions/r-/rioki-glow.json diff --git a/ports/rioki-glow/portfile.cmake b/ports/rioki-glow/portfile.cmake new file mode 100644 index 00000000000000..c7332260d81798 --- /dev/null +++ b/ports/rioki-glow/portfile.cmake @@ -0,0 +1,16 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rioki/glow + REF v0.2.0 + SHA512 ff81b56ce8bbceb5119c5cf48764cc1978bb0d3c4cddccc85ef0d3f7c85188c1dab53e083e09509d6ca96e4ac30ba277fc6915ba9ae388422c35cc8cd08c3978 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "rioki_glow") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rioki-glow/vcpkg.json b/ports/rioki-glow/vcpkg.json new file mode 100644 index 00000000000000..d72dc4351d4874 --- /dev/null +++ b/ports/rioki-glow/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rioki-glow", + "version-semver": "0.2.0", + "description": "OpenGL Object Wrapper", + "homepage": "https://github.com/rioki/glow", + "license": "MIT", + "dependencies": [ + "glew", + "glm", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b232e506f19572..ba00a47bcf9777 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6328,6 +6328,10 @@ "baseline": "0.6.0", "port-version": 0 }, + "rioki-glow": { + "baseline": "0.2.0", + "port-version": 0 + }, "rmlui": { "baseline": "4.4", "port-version": 0 diff --git a/versions/r-/rioki-glow.json b/versions/r-/rioki-glow.json new file mode 100644 index 00000000000000..1b46f5b295c43d --- /dev/null +++ b/versions/r-/rioki-glow.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c7d83181fde1e5535022c2dc3fccfaa38c37c3ab", + "version-semver": "0.2.0", + "port-version": 0 + } + ] +} From a2177d3cfffffedbcfdcea4b38a64114904b3dce Mon Sep 17 00:00:00 2001 From: Stan Wijckmans Date: Fri, 12 Aug 2022 03:25:00 +0200 Subject: [PATCH 372/791] [fakeit] update to 2.3.0 (#26244) * [fakeit] update to 2.3.0 * Update fakeit.json. Co-authored-by: Stan Wijckmans --- ports/fakeit/portfile.cmake | 4 ++-- ports/fakeit/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fakeit.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake index c17a6431181e0a..cf6b5765559d51 100644 --- a/ports/fakeit/portfile.cmake +++ b/ports/fakeit/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eranpeer/FakeIt - REF 38c118c2be2fe33148545b1c32dc568eeabe1f23 #v2.1.1 - SHA512 32b91a1d2fc156cd2293774fea0196492356411ad2437acde1488e087a62f921e13dd75d850be3d50c380e3d525759273eba5b40771fe140581d5ffaefe16842 + REF 78ca536e6b32f11e2883d474719a447915e40005 #v2.3.0 + SHA512 b3a76d278217d177e2222d6e4c782c8ee08a7b6244e5f89fd25b22faffc8f0cf402c1d04763fb6f6ef37272738adf5dd7ff7a0437c1bc9a5043765058fa2a648 HEAD_REF master ) diff --git a/ports/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json index 837586d55a9fd0..6650ba76012b17 100644 --- a/ports/fakeit/vcpkg.json +++ b/ports/fakeit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fakeit", - "version": "2.1.1", + "version": "2.3.0", "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", "homepage": "https://github.com/eranpeer/FakeIt", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index ba00a47bcf9777..f2160be45bd7aa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2181,7 +2181,7 @@ "port-version": 0 }, "fakeit": { - "baseline": "2.1.1", + "baseline": "2.3.0", "port-version": 0 }, "fann": { diff --git a/versions/f-/fakeit.json b/versions/f-/fakeit.json index 768775ed5468f1..473350b6275c2f 100644 --- a/versions/f-/fakeit.json +++ b/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a167ae0c79d73a0c9802b41992c668a41209a390", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "2af5c0e3dc6e0f5d2ae288b50f6f8167e830ff69", "version": "2.1.1", From 368c1a5953849d0107321ee07f9bea9cf586a94e Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Thu, 11 Aug 2022 18:26:47 -0700 Subject: [PATCH 373/791] [minio-cpp] chore(version): updated to v0.1.1 (#26257) --- ports/minio-cpp/portfile.cmake | 13 +++++++------ ports/minio-cpp/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/m-/minio-cpp.json | 5 +++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ports/minio-cpp/portfile.cmake b/ports/minio-cpp/portfile.cmake index 31c508bb42d74f..7712247569bdad 100644 --- a/ports/minio-cpp/portfile.cmake +++ b/ports/minio-cpp/portfile.cmake @@ -1,16 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO minio/minio-cpp - REF v0.1.0 - SHA512 40442ff91e2894945425cbfc21bbd7448201a454c36bea84ffcfee70ab5a71c18e0948f7a1c5453205b7199914fa8fa820f53961c8262cd4fdf646470846f65e + REF v0.1.1 + SHA512 88bd07688f27ca1b1cd7cba592ffe13e08619f0a1f8aa11a37276e455e1dcf025c347452819980452d67e6e4899af11e8f7b1662dc05a87db03000e876d1155b HEAD_REF main ) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_DOC=OFF - -DBUILD_EXAMPLES=OFF + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_DOC=OFF + -DBUILD_EXAMPLES=OFF ) vcpkg_cmake_install() diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json index d68ad770eb5918..22e330ca6567f9 100644 --- a/ports/minio-cpp/vcpkg.json +++ b/ports/minio-cpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "minio-cpp", - "version": "0.1.0", + "version": "0.1.1", "description": "The MinIO C++ Client SDK provides simple APIs to access any Amazon S3 compatible object storage", "homepage": "https://github.com/minio/minio-cpp", "license": "Apache-2.0", - "supports": "!windows & !osx & !uwp", + "supports": "!windows & !uwp", "dependencies": [ "curlpp", "inih", diff --git a/versions/baseline.json b/versions/baseline.json index f2160be45bd7aa..1d16b335c95b53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4617,7 +4617,7 @@ "port-version": 0 }, "minio-cpp": { - "baseline": "0.1.0", + "baseline": "0.1.1", "port-version": 0 }, "minisat-master-keying": { diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index 52fe9c55d5bc4a..50ef5890e0c09f 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8442cf19a35307cd48476abbf05e85194509c7a2", + "version": "0.1.1", + "port-version": 0 + }, { "git-tree": "e406e5f0c1d14b66ad6e58c91d122ca0d01df04c", "version": "0.1.0", From 75e08dc570c20f33f0344129bb7d19190fd5064a Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 12 Aug 2022 03:27:22 +0200 Subject: [PATCH 374/791] [openal-soft] add 'pipewire' feature and PulseAudio backend (#26263) --- ports/openal-soft/portfile.cmake | 10 ++++++++-- ports/openal-soft/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 1a34d31ab70593..aa6c7b01b3af14 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -6,6 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pipewire ALSOFT_BACKEND_PIPEWIRE +) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPENAL_LIBTYPE "SHARED") else() @@ -28,7 +33,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS ${FEATURE_OPTIONS} -DLIBTYPE=${OPENAL_LIBTYPE} -DALSOFT_UTILS=OFF -DALSOFT_NO_CONFIG_UTIL=ON @@ -41,7 +46,7 @@ vcpkg_cmake_configure( -DALSOFT_BACKEND_SOLARIS=OFF -DALSOFT_BACKEND_SNDIO=OFF -DALSOFT_BACKEND_PORTAUDIO=OFF - -DALSOFT_BACKEND_PULSEAUDIO=OFF + -DALSOFT_BACKEND_PULSEAUDIO=${ALSOFT_REQUIRE_LINUX} -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_APPLE} -DALSOFT_BACKEND_JACK=OFF -DALSOFT_BACKEND_OPENSL=${VCPKG_TARGET_IS_ANDROID} @@ -59,6 +64,7 @@ vcpkg_cmake_configure( ALSOFT_BACKEND_OPENSL ALSOFT_BACKEND_OSS ALSOFT_BACKEND_PORTAUDIO + ALSOFT_BACKEND_PIPEWIRE ALSOFT_BACKEND_PULSEAUDIO ALSOFT_BACKEND_SNDIO ALSOFT_BACKEND_SOLARIS diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index a1b8adc56723e9..38555819cea44c 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.22.2", - "port-version": 1, + "port-version": 2, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "license": "GPL-2.0-or-later", @@ -19,5 +19,14 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "pipewire": { + "description": "Native support for Pipewire", + "supports": "linux", + "dependencies": [ + "pipewire" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 1d16b335c95b53..6821c1af858243 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5154,7 +5154,7 @@ }, "openal-soft": { "baseline": "1.22.2", - "port-version": 1 + "port-version": 2 }, "openblas": { "baseline": "0.3.20", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 9a03c3b9290e6e..819a183d4e8bbb 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a964545a6c1ea12eb653de3d4739431ddf1cce85", + "version-semver": "1.22.2", + "port-version": 2 + }, { "git-tree": "2a5b37e3c3d9cd16ebbcdaddcce6cb7249aa21ec", "version-semver": "1.22.2", From 73ec57098601b9d065917da50d69bed6b09e62f5 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Fri, 12 Aug 2022 09:34:25 +0800 Subject: [PATCH 375/791] [pixman] add mips64 support (#26269) * [pixman]add mips64 support * [pixman]update port version * [pixman]update version database * format code style. * update version database Co-authored-by: Jamlys Lee --- ports/pixman/portfile.cmake | 16 ++++++++++------ ports/pixman/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pixman.json | 5 +++++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index fa6c8687a4e8c3..ed0ceef4fbd931 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -21,12 +21,16 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") -Dsse2=enabled -Dssse3=enabled) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") - list(APPEND OPTIONS - #-Darm-simd=enabled does not work with arm64-windows - -Dmmx=disabled - -Dsse2=disabled - -Dssse3=disabled - ) + list(APPEND OPTIONS + #-Darm-simd=enabled does not work with arm64-windows + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips") + list(APPEND OPTIONS + -Dmmx=disabled + -Dsse2=disabled + -Dssse3=disabled) endif() set(PIXMAN_VERSION 0.40.0) diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json index b475c2fb78bcf4..1098ef64b1b153 100644 --- a/ports/pixman/vcpkg.json +++ b/ports/pixman/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pixman", "version": "0.40.0", - "port-version": 2, + "port-version": 3, "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", "homepage": "https://www.cairographics.org/releases", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 6821c1af858243..c9aaaecae7c8ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5530,7 +5530,7 @@ }, "pixman": { "baseline": "0.40.0", - "port-version": 2 + "port-version": 3 }, "pkgconf": { "baseline": "1.8.0", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 0faacd4b5a750a..0dec4d74100a75 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6930f7300af86c20679b38f53bbdbc1a1310eed", + "version": "0.40.0", + "port-version": 3 + }, { "git-tree": "85d5aa0bbd91cff8853d0767bc9dc73e97156291", "version": "0.40.0", From 293f090a9be5a88a2a77838c6346d5ef9d3df81b Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Fri, 12 Aug 2022 03:34:47 +0200 Subject: [PATCH 376/791] [libuv] update to 1.44.2 (#26273) --- ports/libuv/portfile.cmake | 4 ++-- ports/libuv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 5cc5a247b0c6cd..036bb2676b32f3 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF e8b7eb6908a847ffbe6ab2eec7428e43a0aa53a2 #v1.44.1 - SHA512 c8918fe3cdfcfec7c7da4af8286b5fd28805f41a40a283a22ff578631835539d9f52b46310f1ac0a464a570f9664d6793bb6c63541f01a4f379b3ad2f7c56aea + REF 0c1fa696aa502eb749c2c4735005f41ba00a27b8 #v1.44.2 + SHA512 4b63745d48c5318d75ef3580fc6d6288b1ca26a25f69fbef2af4b6fe1d1fe1255986cbb1fb5124e1ba6cd324868ebccdc6f6965e08e3e0fbde29f22e7e20ce89 HEAD_REF v1.x PATCHES fix-build-type.patch ) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 2d863086d1ba0a..1393311a9aee1b 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libuv", - "version-semver": "1.44.1", + "version-semver": "1.44.2", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index c9aaaecae7c8ed..327456624910fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4225,7 +4225,7 @@ "port-version": 11 }, "libuv": { - "baseline": "1.44.1", + "baseline": "1.44.2", "port-version": 0 }, "libuvc": { diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 4fe57a4798e76d..0b2382838eecbf 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dad61360b9c0fb825e23a4ccc01dcd9658e2f253", + "version-semver": "1.44.2", + "port-version": 0 + }, { "git-tree": "4560e3046488c518b6573a14d7ad063a02f52db9", "version-semver": "1.44.1", From 1fb95117ea0084677d2de1a8ee398f46aa05f042 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Fri, 12 Aug 2022 09:38:50 +0800 Subject: [PATCH 377/791] [boost-modular-build-helper] add mips64 support (#26267) * [boost-modular-build-helper]add mips64 support * [boost-modular-build-helper]update port version * [boost-modular-build-helper]update version database Co-authored-by: Jamlys Lee --- ports/boost-modular-build-helper/CMakeLists.txt | 2 ++ ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 280ec08e3f1f13..6549f43cd639b6 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -40,6 +40,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") list(APPEND B2_OPTIONS architecture=power) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch") list(APPEND B2_OPTIONS architecture=loongarch) +elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "mips64") + list(APPEND B2_OPTIONS architecture=mips64) elseif("arm64" IN_LIST VCPKG_TARGET_ARCHITECTURE AND "x86_64" IN_LIST VCPKG_TARGET_ARCHITECTURE) list(APPEND B2_OPTIONS architecture=arm+x86) else() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 526b1bd9ccc7bb..81623bf1faccd3 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.79.0", - "port-version": 7, + "port-version": 8, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 3a0566c2f7199a..02f4b4e9045fc5 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e22ad8dde44513f2fa1a9b38c71818aaaee52120", + "version": "1.79.0", + "port-version": 8 + }, { "git-tree": "cca1e2f883cfd638a53964027473a00e6b571e49", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 327456624910fe..01feeeb9684c26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -842,7 +842,7 @@ }, "boost-modular-build-helper": { "baseline": "1.79.0", - "port-version": 7 + "port-version": 8 }, "boost-move": { "baseline": "1.79.0", From 8e1226e40c9a7624547762ec5b5e01838801f041 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Fri, 12 Aug 2022 09:41:00 +0800 Subject: [PATCH 378/791] [libffi] add misp64 support (#26266) * [libffi]add mips64 support * [libffi]update port version * [libffi]update version database Co-authored-by: Jamlys Lee --- ports/libffi/CMakeLists.txt | 14 ++++++++++++-- ports/libffi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libffi.json | 5 +++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt index f69edfc899a361..ca4fe163197433 100644 --- a/ports/libffi/CMakeLists.txt +++ b/ports/libffi/CMakeLists.txt @@ -11,7 +11,7 @@ endif() # config variables for ffi.h.in set(VERSION 3.4.2) -set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64) +set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64 mips64el) string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor) @@ -29,6 +29,8 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Windows" AND VCPKG_TARGET_ARCHITECTURE STREQUA set(TARGET X86_WIN64) elseif(lower_system_processor MATCHES "arm64|aarch64") set(TARGET ARM64) +elseif(lower_system_processor MATCHES "mips64") + set(TARGET MIPS64) elseif(lower_system_processor MATCHES "arm") set(TARGET ARM) elseif(CMAKE_SYSTEM_NAME MATCHES "BSD" AND CMAKE_SIZEOF_VOID_P EQUAL 4) @@ -43,7 +45,7 @@ else() message(FATAL_ERROR "Cannot determine target. Please consult ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac and add your platform to this CMake file.") endif() -if("${TARGET}" STREQUAL "X86_64") +if("${TARGET}" STREQUAL "X86_64" OR "${TARGET}" STREQUAL "MIPS64") set(HAVE_LONG_DOUBLE 1) else() set(HAVE_LONG_DOUBLE 0) @@ -58,6 +60,8 @@ if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64") file(COPY src/aarch64/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) elseif ("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") file(COPY src/arm/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) +elseif ("${TARGET}" MATCHES "MIPS") + file(COPY src/mips/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) else() file(COPY src/x86/ffitarget.h DESTINATION ${CMAKE_BINARY_DIR}/include) endif() @@ -85,6 +89,10 @@ elseif("${TARGET}" STREQUAL "ARM_WIN32" OR "${TARGET}" STREQUAL "ARM") set(FFI_SOURCES ${FFI_SOURCES} src/arm/ffi.c) +elseif("${TARGET}" MATCHES "MIPS") + set(FFI_SOURCES + ${FFI_SOURCES} + src/mips/ffi.c) else() set(FFI_SOURCES ${FFI_SOURCES} @@ -189,6 +197,8 @@ elseif("${TARGET}" STREQUAL "ARM_WIN64") endif() elseif("${TARGET}" STREQUAL "ARM64") add_assembly(src/aarch64/sysv.S) +elseif("${TARGET}" MATCHES "MIPS") + add_assembly(src/mips/n32.S) else() message(FATAL_ERROR "Target not implemented") endif() diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index bebdbc62ea9b4c..aeaad6d6320d86 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libffi", "version": "3.4.2", - "port-version": 5, + "port-version": 6, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 01feeeb9684c26..46b306c3124a0b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3622,7 +3622,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 5 + "port-version": 6 }, "libfido2": { "baseline": "1.10.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index ba4f4807ce0638..cf6dec52674fa0 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d484f79a6c1e9cd25a8a4791af0c9a40fc26b51", + "version": "3.4.2", + "port-version": 6 + }, { "git-tree": "14f8b4d7dc645ea8f2ddfe77eeaaeef55f123cb5", "version": "3.4.2", From 581099d541ec960db5c2a8efe4639f1e2e25de60 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 12 Aug 2022 09:51:38 +0800 Subject: [PATCH 379/791] [libmariadb] update to v3.3.1 (#26268) * [libmariadb] update to v3.3.1 * update version * revert patch formating * update version --- ports/libmariadb/arm64.patch | 15 --------------- ports/libmariadb/export-cmake-targets.patch | 18 ++++++++++-------- ports/libmariadb/fix-InstallPath.patch | 20 +++++++++++++------- ports/libmariadb/no-extra-static-lib.patch | 9 +++++---- ports/libmariadb/pkgconfig.patch | 8 ++++---- ports/libmariadb/portfile.cmake | 7 +++---- ports/libmariadb/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libmariadb.json | 5 +++++ 9 files changed, 43 insertions(+), 46 deletions(-) delete mode 100644 ports/libmariadb/arm64.patch diff --git a/ports/libmariadb/arm64.patch b/ports/libmariadb/arm64.patch deleted file mode 100644 index 4d8e9ac8d0c89e..00000000000000 --- a/ports/libmariadb/arm64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 640a35bea..6c8d93250 100755 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -410,10 +410,6 @@ TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) - - SIGN_TARGET(libmariadb) - --IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC) -- SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64") --ENDIF() -- - IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR - CMAKE_SYSTEM_NAME MATCHES "kFreeBSD" OR - CMAKE_SYSTEM_NAME MATCHES "GNU") diff --git a/ports/libmariadb/export-cmake-targets.patch b/ports/libmariadb/export-cmake-targets.patch index 13c6c1a61bc29c..df2ed81e20f6c3 100644 --- a/ports/libmariadb/export-cmake-targets.patch +++ b/ports/libmariadb/export-cmake-targets.patch @@ -1,8 +1,8 @@ diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index c109a20..e1fa3f1 100644 +index d4e07f7..4823858 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt -@@ -405,6 +405,7 @@ ELSE() +@@ -423,6 +423,7 @@ ELSE() ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) ENDIF() @@ -10,19 +10,20 @@ index c109a20..e1fa3f1 100644 TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) -@@ -453,13 +454,30 @@ ENDIF() +@@ -472,13 +473,32 @@ ENDIF() INSTALL(TARGETS mariadbclient COMPONENT Development + EXPORT unofficial-libmariadb-targets LIBRARY DESTINATION lib) + IF(WIN32) INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries + COMPONENT SharedLibraries + EXPORT unofficial-libmariadb-targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) - ++ +install(EXPORT unofficial-libmariadb-targets + NAMESPACE unofficial:: + DESTINATION share/unofficial-libmariadb @@ -38,6 +39,7 @@ index c109a20..e1fa3f1 100644 +]]) +configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) - - IF(0) - # On Windows, install PDB ++ + ELSE() + # in cmake 3.12+ we can use + #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} diff --git a/ports/libmariadb/fix-InstallPath.patch b/ports/libmariadb/fix-InstallPath.patch index c9794fc58fa4e3..44a27c04a39aba 100644 --- a/ports/libmariadb/fix-InstallPath.patch +++ b/ports/libmariadb/fix-InstallPath.patch @@ -12,10 +12,10 @@ index a82dbb7..e9005fa 100644 /* mysqld compile time options */ #ifndef MYSQL_CHARSET diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index bcfd4de..c109a20 100644 +index 7faf827..d4e07f7 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt -@@ -398,10 +398,10 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) +@@ -417,10 +417,10 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) IF(UNIX) @@ -28,19 +28,25 @@ index bcfd4de..c109a20 100644 SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) ENDIF() -@@ -453,13 +453,15 @@ ENDIF() +@@ -472,11 +472,13 @@ ENDIF() INSTALL(TARGETS mariadbclient COMPONENT Development - DESTINATION ${INSTALL_LIBDIR}) + LIBRARY DESTINATION lib) + IF(WIN32) INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries + COMPONENT SharedLibraries - DESTINATION ${INSTALL_LIBDIR}) + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) - + ELSE() + # in cmake 3.12+ we can use + #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} +@@ -488,7 +490,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} + COMPONENT Development NAMELINK_ONLY) + ENDIF() -IF(MSVC) +IF(0) @@ -48,10 +54,10 @@ index bcfd4de..c109a20 100644 INSTALL(FILES $ DESTINATION "${INSTALL_LIBDIR}" CONFIGURATIONS Debug RelWithDebInfo diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in -index 5574943..fc1ca7c 100644 +index 36c0117..4184e4b 100644 --- a/mariadb_config/mariadb_config.c.in +++ b/mariadb_config/mariadb_config.c.in -@@ -210,7 +210,7 @@ end: +@@ -225,7 +225,7 @@ end: } if (!p || !p[0]) { diff --git a/ports/libmariadb/no-extra-static-lib.patch b/ports/libmariadb/no-extra-static-lib.patch index 333be12495de45..41463c29e4ddf2 100644 --- a/ports/libmariadb/no-extra-static-lib.patch +++ b/ports/libmariadb/no-extra-static-lib.patch @@ -1,8 +1,8 @@ diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 39fa709..a726a6d 100644 +index 4823858..018101f 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt -@@ -455,10 +455,14 @@ IF(NOT WIN32) +@@ -471,10 +471,15 @@ IF(NOT WIN32) SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") ENDIF() @@ -14,6 +14,7 @@ index 39fa709..a726a6d 100644 +else() + set_target_properties(mariadbclient PROPERTIES EXCLUDE_FROM_ALL 1) +endif() ++ + IF(WIN32) INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries - EXPORT unofficial-libmariadb-targets + COMPONENT SharedLibraries diff --git a/ports/libmariadb/pkgconfig.patch b/ports/libmariadb/pkgconfig.patch index a0cc1c18d48d2e..2851a835782619 100644 --- a/ports/libmariadb/pkgconfig.patch +++ b/ports/libmariadb/pkgconfig.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0be0fb1..33565f5 100644 +index a109325..b56403c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -393,7 +393,7 @@ ENDIF() +@@ -420,7 +420,7 @@ ENDIF() INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(libmariadb) @@ -12,7 +12,7 @@ index 0be0fb1..33565f5 100644 ENDIF() diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt -index 70e619b..7a22fa1 100644 +index 743ae52..482a4cf 100644 --- a/mariadb_config/CMakeLists.txt +++ b/mariadb_config/CMakeLists.txt @@ -30,6 +30,15 @@ IF(${rllength} GREATER 0) @@ -41,7 +41,7 @@ index 70e619b..7a22fa1 100644 IF(CMAKE_SYSTEM_NAME MATCHES AIX) @@ -61,6 +71,7 @@ ENDIF() INSTALL(TARGETS mariadb_config - DESTINATION "bin" + DESTINATION "${INSTALL_BINDIR}" COMPONENT Development) +endif() diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index de0692c18490a5..d43acc4358fca6 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -9,11 +9,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariadb-corporation/mariadb-connector-c - REF b2bb1b213c79169b7c994a99f21f47f11be465d4 # v3.1.15 - SHA512 51ebd2e9fd505eebc7691c60fe0b86cfc5368f8b370fba6c3ec8f5514319ef1e0de4910ad5e093cd7d5e5c7782120e22e8c85c94af9389fa4e240cedf012d755 - HEAD_REF 3.1 + REF 5e94e7c27ffad7e76665b1333a67975316b9c3c2 # v3.3.1 + SHA512 0f740f88f64037990bf9d4593574b147ee02adb1fbbeb03c0dec745f0ee27d7cf03417dd09546ab70e16b4465622b8567864dbb243de0a3a7ffaebe313f7c231 + HEAD_REF 3.3 PATCHES - arm64.patch md.patch disable-test-build.patch fix-InstallPath.patch diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json index f7e0a754eb4f01..002c4e1116b8f4 100644 --- a/ports/libmariadb/vcpkg.json +++ b/ports/libmariadb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libmariadb", - "version-semver": "3.1.15", - "port-version": 1, + "version-semver": "3.3.1", "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 46b306c3124a0b..91194805fdff0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3821,8 +3821,8 @@ "port-version": 1 }, "libmariadb": { - "baseline": "3.1.15", - "port-version": 1 + "baseline": "3.3.1", + "port-version": 0 }, "libmaxminddb": { "baseline": "1.4.3", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index ffe7b80bf4569b..972d74f8e56941 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab286c57741848d9bb9a806ad29f5366283af520", + "version-semver": "3.3.1", + "port-version": 0 + }, { "git-tree": "06122c8b00cc582d3ee36072fcbd03fa9385f238", "version-semver": "3.1.15", From 9a0bbbcb42d70ad5dec6dc04386032395ffaec75 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 12 Aug 2022 22:55:29 +0200 Subject: [PATCH 380/791] [mathgl] no absolute paths (#26320) --- ports/mathgl/portfile.cmake | 2 +- ports/mathgl/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/mathgl.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/mathgl/portfile.cmake b/ports/mathgl/portfile.cmake index 9ff548ae2f39a9..8361bb8ec642a8 100644 --- a/ports/mathgl/portfile.cmake +++ b/ports/mathgl/portfile.cmake @@ -80,7 +80,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_INSTALL_DIR \"${CURRENT_PACKAGES_DIR}\"" "") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH \"${CURRENT_PACKAGES_DIR}/fonts\"" "") # there is no fonts folder +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH\t\"${CURRENT_PACKAGES_DIR}/fonts\"" "") # there is no fonts folder vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mgl2/config.h" "#define MGL_FONT_PATH\t\"${CURRENT_PACKAGES_DIR}/share/mathgl/fonts\"" "") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mathgl" RENAME copyright) diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json index 0ba2be4c6000fa..30a0c0e73fc829 100644 --- a/ports/mathgl/vcpkg.json +++ b/ports/mathgl/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mathgl", "version": "2.5", - "port-version": 1, + "port-version": 2, "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", + "license": "GPL-3.0-only", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 91194805fdff0f..a44272b2f1f862 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4506,7 +4506,7 @@ }, "mathgl": { "baseline": "2.5", - "port-version": 1 + "port-version": 2 }, "matio": { "baseline": "1.5.23", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index ae0be23d253dd2..34ddc706630138 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e86f7ba9325f53bd43f5713e38d78fba18e7bc1d", + "version": "2.5", + "port-version": 2 + }, { "git-tree": "2601a536d9214365148c954f41a6597939a89d7d", "version": "2.5", From ae76307e4b5ccd3737397b1c6a4cac3bbcfa5ee8 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 12 Aug 2022 15:21:20 -0700 Subject: [PATCH 381/791] Audit use of TO_NATIVE_PATH. (#26201) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Audit use of TO_NATIVE_PATH. TO_NATIVE_PATH should only be used when (1) pasting a path into a command line, or (2) displaying a path to a user. It must not be used before calling other CMake operations like file(WRITE. Fixes https://github.com/microsoft/vcpkg/issues/26178 ports/ffmpeg/portfile.cmake: Both uses are being embedded into a command line ✅ ports/gdal/dependency_win.cmake 117: This used TO_NATIVE_PATH but didn't actually connect the result. It's going on a command line so TO_NATIVE_PATH is appropriate. Drive by: Added quotes around other uses (all of which seem to be going to command lines). 202: ${EXPAT_LIBRARY_REL} ${ZLIB_LIBRARY_REL} don't seem to be set even though they are used; I think this is wrong but I don't know for sure that it is so I'm leaving it alone for now. ports/msmpi/portfile.cmake All 3 uses are being embedded into a command line ✅ ports/jemalloc/fix-utilities.patch ports/libproxy/fix-dependency-libmodman.patch ports/qtbase/env.patch These are in upstream content / context so it is not edited. ports/opengl/portfile.cmake Broken! Drive by fixes: * Modernized checking VCPKG_BUILD_TYPE * Ordered things consistently to be release then debug. * Removed funny newlines. ports/openni2/portfile.cmake Borderline OK; it goes into an MSBuild / vcxproj. I'm leaving it alone. Drive by fixes: * Guarded debug-only copies for VCPKG_BUILD_TYPE * Fixed supports expression ports/openssl/unix/CMakeLists.txt: Unused! ports/pthreads/portfile.cmake: Both uses are being embedded into a command line ✅ ports/qt5-base/cmake/qt_fix_makefile_install.cmake I'm not sure if this one is OK but it's being embedded into a file so it's probably fine. ports/qtapplicationmanager/portfile.cmake: I'm pretty sure this one is wrong, but it's guarded by VCPKG_TARGET_IS_WINDOWS so the ability to create damage is limited. ports/readosm/portfile.cmake: The use is being embedded into a command line ✅ ports/spatialite-tools/portfile.cmake: The use is being embedded into a command line ✅ ports/sqlcipher/portfile.cmake: Both uses are being embedded into a command line ✅ scripts/ports.cmake: Some uses were unused, others are immediately used and printed to the console. ✅ scripts/buildsystems/vcpkg.cmake: Fixed :) scripts/cmake/vcpkg_build_qmake: Looks unused. scripts/cmake/vcpkg_build_process.cmake: Added to console message only. ✅ scripts/cmake/vcpkg_execute_required_process_repeat.cmake: Added to console message only. ✅ Drive by: Fixed typo in variable name in the message. scripts/cmake/vcpkg_execute_required_process.cmake: Added to console message only. ✅ * Fix missing license. --- ports/gdal/dependency_win.cmake | 24 +++--- ports/gdal/vcpkg.json | 2 +- ports/opengl/portfile.cmake | 81 ++++++++----------- ports/opengl/vcpkg.json | 4 +- ports/openni2/portfile.cmake | 59 +++++++------- ports/openni2/vcpkg.json | 7 +- ports/openssl/unix/CMakeLists.txt | 5 -- ports/openssl/vcpkg.json | 2 +- scripts/buildsystems/vcpkg.cmake | 10 ++- scripts/ci.baseline.txt | 2 - scripts/cmake/vcpkg_build_qmake.cmake | 2 - ...cpkg_execute_required_process_repeat.cmake | 2 +- scripts/ports.cmake | 2 - versions/baseline.json | 8 +- versions/g-/gdal.json | 5 ++ versions/o-/opengl.json | 5 ++ versions/o-/openni2.json | 5 ++ versions/o-/openssl.json | 5 ++ 18 files changed, 114 insertions(+), 116 deletions(-) diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index c3be0f56267f30..be060ce8b0018b 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -114,7 +114,7 @@ macro(find_dependency_win) 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 "HDF5_DIR=${HDF5_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") @@ -160,9 +160,9 @@ macro(find_dependency_win) 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}) + 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 @@ -170,17 +170,17 @@ macro(find_dependency_win) 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}) + 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}) + 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}) + 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) @@ -210,10 +210,10 @@ macro(find_dependency_win) 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_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}) + 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/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index f32f73cbe4ab91..e50ff156635913 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.5.1", - "port-version": 4, + "port-version": 5, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/ports/opengl/portfile.cmake b/ports/opengl/portfile.cmake index 5a20f8ea09affc..cd209dbb28b279 100644 --- a/ports/opengl/portfile.cmake +++ b/ports/opengl/portfile.cmake @@ -2,78 +2,63 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore vcpkg_get_windows_sdk(WINDOWS_SDK) if (WINDOWS_SDK MATCHES "10.") - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um" HEADERSPATH) + set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib") + set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib/${WINDOWS_SDK}/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include/${WINDOWS_SDK}/um") elseif(WINDOWS_SDK MATCHES "8.") - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib" LIBGLFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib" LIBGLUFILEPATH) - file(TO_NATIVE_PATH "$ENV{WindowsSdkDir}Include/um" HEADERSPATH) + set(LIBGLFILEPATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/OpenGL32.Lib") + set(LIBGLUFILEPATH "$ENV{WindowsSdkDir}Lib/winv6.3/um/${TRIPLET_SYSTEM_ARCH}/GlU32.Lib") + set(HEADERSPATH "$ENV{WindowsSdkDir}Include/um") else() message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}") endif() if (NOT EXISTS "${LIBGLFILEPATH}") - message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLFILEPATH}") + file(TO_NATIVE_PATH "${LIBGLFILEPATH}" DISPLAY) + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${DISPLAY}") endif() if (NOT EXISTS "${LIBGLUFILEPATH}") - message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBGLUFILEPATH}") + file(TO_NATIVE_PATH "${LIBGLUFILEPATH}" DISPLAY) + message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${DISPLAY}") endif() - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/include/gl" INCLUDEGLPATH) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/share/opengl" SHAREOPENGLPATH) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/lib" RELEASELIBPATH) - file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}/debug/lib" DEBUGLIBPATH) - file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GL.h" GLGLHPATH) - file(TO_NATIVE_PATH "${HEADERSPATH}/gl/GLU.h" GLGLUHPATH) + set(INCLUDEGLPATH "${CURRENT_PACKAGES_DIR}/include/gl") + set(SHAREOPENGLPATH "${CURRENT_PACKAGES_DIR}/share/opengl") + set(RELEASELIBPATH "${CURRENT_PACKAGES_DIR}/lib") + set(DEBUGLIBPATH "${CURRENT_PACKAGES_DIR}/debug/lib") + set(GLGLHPATH "${HEADERSPATH}/gl/GL.h") + set(GLGLUHPATH "${HEADERSPATH}/gl/GLU.h") - file(MAKE_DIRECTORY - "${INCLUDEGLPATH}" - "${SHAREOPENGLPATH}" - ) - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY - "${RELEASELIBPATH}" - ) - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY - "${DEBUGLIBPATH}" - ) + file(MAKE_DIRECTORY "${INCLUDEGLPATH}" "${SHAREOPENGLPATH}" "${RELEASELIBPATH}") + if (NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${DEBUGLIBPATH}") endif() - file(COPY - "${GLGLHPATH}" - "${GLGLUHPATH}" - DESTINATION "${INCLUDEGLPATH}" - ) - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY ${LIBGLFILEPATH} DESTINATION "${RELEASELIBPATH}") - file(COPY ${LIBGLUFILEPATH} DESTINATION "${RELEASELIBPATH}") - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${LIBGLFILEPATH} DESTINATION "${DEBUGLIBPATH}") - file(COPY ${LIBGLUFILEPATH} DESTINATION "${DEBUGLIBPATH}") + file(COPY "${GLGLHPATH}" "${GLGLUHPATH}" DESTINATION "${INCLUDEGLPATH}") + + if (NOT VCPKG_BUILD_TYPE) + file(COPY "${LIBGLFILEPATH}" DESTINATION "${DEBUGLIBPATH}") + file(COPY "${LIBGLUFILEPATH}" DESTINATION "${DEBUGLIBPATH}") endif() + file(COPY "${LIBGLFILEPATH}" DESTINATION "${RELEASELIBPATH}") + file(COPY "${LIBGLUFILEPATH}" DESTINATION "${RELEASELIBPATH}") if (WINDOWS_SDK MATCHES "10.") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See https://developer.microsoft.com/windows/downloads/windows-10-sdk for the Windows 10 SDK license") elseif(WINDOWS_SDK MATCHES "8.") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/opengl/copyright "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "See https://developer.microsoft.com/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license") endif() - + string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" WINDOWS_SDK_SEMVER "${WINDOWS_SDK}") - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY) - configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY) - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opengl.pc" @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glu.pc" @ONLY) + if (NOT VCPKG_BUILD_TYPE) configure_file("${CMAKE_CURRENT_LIST_DIR}/opengl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/opengl.pc" @ONLY) configure_file("${CMAKE_CURRENT_LIST_DIR}/glu.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glu.pc" @ONLY) endif() - vcpkg_fixup_pkgconfig() + vcpkg_fixup_pkgconfig() else() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) endif() diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index e921d648fb659e..ea5e3d1c856d4d 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -1,5 +1,7 @@ { "name": "opengl", "version-date": "2022-03-14", - "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics." + "port-version": 1, + "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.", + "license": null } diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake index 0864fda611b2ff..e06d555e83ad96 100644 --- a/ports/openni2/portfile.cmake +++ b/ports/openni2/portfile.cmake @@ -1,7 +1,3 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "Error: UWP builds are currently not supported.") -endif() - find_path(COR_H_PATH cor.h) if(COR_H_PATH MATCHES "NOTFOUND") message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") @@ -21,10 +17,6 @@ vcpkg_from_github( replace_environment_variable.patch ) -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) - file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR) configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY) @@ -44,14 +36,14 @@ endif() set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include") set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release") set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug") -set(SOURCE_CONFIG_PATH ${SOURCE_PATH}/Config) +set(SOURCE_CONFIG_PATH "${SOURCE_PATH}/Config") set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty") file( INSTALL "${SOURCE_INCLUDE_PATH}/Android-Arm/OniPlatformAndroid-Arm.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm + "${CURRENT_PACKAGES_DIR}/include/openni2/Android-Arm" ) file( @@ -59,35 +51,35 @@ file( "${SOURCE_INCLUDE_PATH}/Driver/OniDriverAPI.h" "${SOURCE_INCLUDE_PATH}/Driver/OniDriverTypes.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Driver + "${CURRENT_PACKAGES_DIR}/include/openni2/Driver" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/Linux-Arm/OniPlatformLinux-Arm.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm + "${CURRENT_PACKAGES_DIR}/include/openni2/Linux-Arm" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/Linux-x86/OniPlatformLinux-x86.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86 + "${CURRENT_PACKAGES_DIR}/include/openni2/Linux-x86" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/MacOSX/OniPlatformMacOSX.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX + "${CURRENT_PACKAGES_DIR}/include/openni2/MacOSX" ) file( INSTALL "${SOURCE_INCLUDE_PATH}/Win32/OniPlatformWin32.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2/Win32 + "${CURRENT_PACKAGES_DIR}/include/openni2/Win32" ) file( @@ -105,22 +97,24 @@ file( "${SOURCE_INCLUDE_PATH}/PS1080.h" "${SOURCE_INCLUDE_PATH}/PSLink.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include/openni2 + "${CURRENT_PACKAGES_DIR}/include/openni2" ) file( INSTALL "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/lib" ) +if(NOT VCPKG_BUILD_TYPE) file( INSTALL "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.lib" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib + "${CURRENT_PACKAGES_DIR}/debug/lib" ) +endif() file( INSTALL @@ -131,23 +125,24 @@ file( "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers + "${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers" ) file( INSTALL "${SOURCE_CONFIG_PATH}/OpenNI.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/bin/OpenNI2 + "${CURRENT_PACKAGES_DIR}/bin/OpenNI2" ) file( INSTALL "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll" DESTINATION - ${CURRENT_PACKAGES_DIR}/bin + "${CURRENT_PACKAGES_DIR}/bin" ) +if(NOT VCPKG_BUILD_TYPE) file( INSTALL "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll" @@ -157,22 +152,25 @@ file( "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PSLink.dll" "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers + "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers" ) +endif() file( INSTALL "${SOURCE_CONFIG_PATH}/OpenNI.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2 + "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2" ) +if(NOT VCPKG_BUILD_TYPE) file( INSTALL "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.dll" DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/debug/bin" ) +endif() file( INSTALL @@ -183,7 +181,7 @@ file( "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" DESTINATION - ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers + "${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers" ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") @@ -201,13 +199,14 @@ file( "${SOURCE_BIN_PATH_RELEASE}/PS1080Console.exe" "${SOURCE_BIN_PATH_RELEASE}/PSLinkConsole.exe" DESTINATION - ${CURRENT_PACKAGES_DIR}/tools/openni2 + "${CURRENT_PACKAGES_DIR}/tools/openni2" ) # Deploy Script -file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/bin/OpenNI2) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1 DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/OpenNI2") +if(NOT VCPKG_BUILD_TYPE) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/openni2deploy.ps1" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2") +endif() # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openni2/vcpkg.json b/ports/openni2/vcpkg.json index 5110fbc072c16c..c0aa598769e0be 100644 --- a/ports/openni2/vcpkg.json +++ b/ports/openni2/vcpkg.json @@ -1,10 +1,11 @@ { "name": "openni2", - "version-string": "2.2.0.33", - "port-version": 13, + "version": "2.2.0.33", + "port-version": 14, "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.", "homepage": "https://github.com/OpenNI/OpenNI2", - "supports": "!uwp", + "license": "Apache-2.0", + "supports": "!uwp & !staticcrt", "dependencies": [ "kinectsdk1" ] diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index 79e9f923f3c57c..75c21805ace93e 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -84,11 +84,6 @@ endif() string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") -if(CMAKE_HOST_WIN32) - file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT};$ENV{PATH}") -else() - file(TO_NATIVE_PATH ENV_PATH "${COMPILER_ROOT}:$ENV{PATH}") -endif() set(ENV{ANDROID_DEV} "${CMAKE_SYSROOT}/usr") if(NOT IOS) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 2fd99fedfacb18..b40155bdecc640 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.5", - "port-version": 3, + "port-version": 4, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org", "license": "Apache-2.0", diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 31cee14eb703bd..f7823e72b57408 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -441,7 +441,8 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C if(NOT EXISTS "${Z_VCPKG_EXECUTABLE}" AND NOT Z_VCPKG_HAS_FATAL_ERROR) message(STATUS "Bootstrapping vcpkg before install") - file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-bootstrap.log" Z_VCPKG_BOOTSTRAP_LOG) + set(Z_VCPKG_BOOTSTRAP_LOG "${CMAKE_BINARY_DIR}/vcpkg-bootstrap.log") + file(TO_NATIVE_PATH "${Z_VCPKG_BOOTSTRAP_LOG}" Z_NATIVE_VCPKG_BOOTSTRAP_LOG) execute_process( COMMAND "${Z_VCPKG_BOOTSTRAP_SCRIPT}" ${VCPKG_BOOTSTRAP_OPTIONS} OUTPUT_FILE "${Z_VCPKG_BOOTSTRAP_LOG}" @@ -452,7 +453,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C message(STATUS "Bootstrapping vcpkg before install - done") else() message(STATUS "Bootstrapping vcpkg before install - failed") - z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_VCPKG_BOOTSTRAP_LOG}") + z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_NATIVE_VCPKG_BOOTSTRAP_LOG}") endif() endif() @@ -511,7 +512,8 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C ${Z_VCPKG_MANIFEST_INSTALL_ECHO_PARAMS} ) - file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log" Z_VCPKG_MANIFEST_INSTALL_LOGFILE) + set(Z_VCPKG_MANIFEST_INSTALL_LOGFILE "${CMAKE_BINARY_DIR}/vcpkg-manifest-install.log") + file(TO_NATIVE_PATH "${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}" Z_NATIVE_VCPKG_MANIFEST_INSTALL_LOGFILE) file(WRITE "${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}" "${Z_VCPKG_MANIFEST_INSTALL_LOGTEXT}") if(Z_VCPKG_MANIFEST_INSTALL_RESULT EQUAL 0) @@ -524,7 +526,7 @@ if(VCPKG_MANIFEST_MODE AND VCPKG_MANIFEST_INSTALL AND NOT Z_VCPKG_CMAKE_IN_TRY_C endif() else() message(STATUS "Running vcpkg install - failed") - z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_VCPKG_MANIFEST_INSTALL_LOGFILE}") + z_vcpkg_add_fatal_error("vcpkg install failed. See logs for more information: ${Z_NATIVE_VCPKG_MANIFEST_INSTALL_LOGFILE}") endif() endif() endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a2b72a3f7be51f..5746427ef6c0c4 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -794,8 +794,6 @@ openmama:x64-windows-static-md=fail openmesh:arm64-windows=fail openmesh:arm-uwp=fail openmesh:x64-uwp=fail -openni2:x64-uwp=fail -openni2:x64-windows-static=fail openscap:x64-windows-static=fail openscap:x64-osx=fail openvpn3:x64-osx=fail diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index c64a9f274259d1..39aca262905ca7 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -38,8 +38,6 @@ function(vcpkg_build_qmake) set(invoke_command "${MAKE}") endif() - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) - if(NOT DEFINED arg_BUILD_LOGNAME) set(arg_BUILD_LOGNAME build) endif() diff --git a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake index b7dc3ddda7f2c7..a13f8fa6e09599 100644 --- a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake +++ b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake @@ -66,6 +66,6 @@ Halting portfile execution. " Command failed: ${pretty_command}\n" " Working Directory: ${arg_WORKING_DIRECTORY}\n" " See logs for more information:\n" - "${stringifed_logs}" + "${stringified_logs}" ) endfunction() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 9f7b9d01f95c27..4c3b9304b3d493 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -152,8 +152,6 @@ if(CMD STREQUAL "BUILD") include("${SCRIPTS}/build_info.cmake") endif() elseif(CMD STREQUAL "CREATE") - file(TO_NATIVE_PATH "${VCPKG_ROOT_DIR}" NATIVE_VCPKG_ROOT_DIR) - file(TO_NATIVE_PATH "${DOWNLOADS}" NATIVE_DOWNLOADS) if(NOT DEFINED PORT_PATH) set(PORT_PATH "${VCPKG_ROOT_DIR}/ports/${PORT}") endif() diff --git a/versions/baseline.json b/versions/baseline.json index a44272b2f1f862..d27315d778e230 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2482,7 +2482,7 @@ }, "gdal": { "baseline": "3.5.1", - "port-version": 4 + "port-version": 5 }, "gdcm": { "baseline": "3.0.12", @@ -5218,7 +5218,7 @@ }, "opengl": { "baseline": "2022-03-14", - "port-version": 0 + "port-version": 1 }, "opengl-registry": { "baseline": "2021-11-17", @@ -5266,7 +5266,7 @@ }, "openni2": { "baseline": "2.2.0.33", - "port-version": 13 + "port-version": 14 }, "openscap": { "baseline": "1.3.1", @@ -5274,7 +5274,7 @@ }, "openssl": { "baseline": "3.0.5", - "port-version": 3 + "port-version": 4 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 5e23d15edd4f15..c2888c04850143 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e875fbb6dc288ea2719e00a6b71b4834b8814640", + "version-semver": "3.5.1", + "port-version": 5 + }, { "git-tree": "419767a67a207c3b5401b817d8537acafe257e1b", "version-semver": "3.5.1", diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json index f2e28fba53280a..2459fe648aacde 100644 --- a/versions/o-/opengl.json +++ b/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c402a05f67513fe35a8991b8865db4db6181ec7", + "version-date": "2022-03-14", + "port-version": 1 + }, { "git-tree": "6778094e7a9e5027545a46af473d27ce28890c53", "version-date": "2022-03-14", diff --git a/versions/o-/openni2.json b/versions/o-/openni2.json index 45f539ce40cf66..36caa8dde40d70 100644 --- a/versions/o-/openni2.json +++ b/versions/o-/openni2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31c61be8515cff93cca9a905969a8292023f0b4e", + "version": "2.2.0.33", + "port-version": 14 + }, { "git-tree": "b99fb68dafe4b930248e5ba4d39a7a2c4a4fc9ea", "version-string": "2.2.0.33", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 162f779d2389b0..bbcf02ac3f3926 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "557ff31f9a64f01cd0d98dd44793ce3c7fd32893", + "version": "3.0.5", + "port-version": 4 + }, { "git-tree": "d4fd408544a2a6635ce994badc226aa945c8f78a", "version": "3.0.5", From 9b618499f684f935a96fecb85d69cf137c17e504 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sat, 13 Aug 2022 00:32:07 +0200 Subject: [PATCH 382/791] [vcpkg_from_gitlab] improvements (#23568) * [vcpkg_download_distfile] Don't check downloaded file when ALWAYS_REDOWNLOAD is passed * [vcpkg_from_github] fix error message and correctly set VCPKG_HEAD_VERSION * [vcpkg_from_gitlab] Use gitlab api instead of git ls-remote * no change * Apply suggestions from code review Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> --- scripts/cmake/vcpkg_download_distfile.cmake | 2 +- scripts/cmake/vcpkg_from_gitlab.cmake | 47 +++++++++++++-------- 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 2092d3f2a0fb32..08ca55debad23e 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -184,7 +184,7 @@ If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") file(MAKE_DIRECTORY "${DOWNLOADS}/temp") # check if file with same name already exists in downloads - if(EXISTS "${downloaded_file_path}") + if(EXISTS "${downloaded_file_path}" AND NOT arg_ALWAYS_REDOWNLOAD) set(advice_message "The cached file SHA512 doesn't match. The file may have been corrupted.") if(_VCPKG_NO_DOWNLOADS) string(APPEND advice_message " Downloads are disabled please provide a valid file at path ${downloaded_file_path} and retry.") diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index 23f36fab7c4477..6a0e29c1842de7 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -1,5 +1,20 @@ include(vcpkg_execute_in_download_mode) +function(z_uri_encode input output_variable) + string(HEX "${input}" hex) + string(LENGTH "${hex}" length) + math(EXPR last "${length} - 1") + set(result "") + foreach(i RANGE ${last}) + math(EXPR even "${i} % 2") + if("${even}" STREQUAL "0") + string(SUBSTRING "${hex}" "${i}" 2 char) + string(APPEND result "%${char}") + endif() + endforeach() + set("${output_variable}" ${result} PARENT_SCOPE) +endfunction() + function(vcpkg_from_gitlab) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" @@ -80,25 +95,23 @@ function(vcpkg_from_gitlab) # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. - if(VCPKG_USE_HEAD_VERSION) - # There are issues with the Gitlab API project paths being URL-escaped, so we use git here to get the head revision - vcpkg_execute_in_download_mode(COMMAND ${GIT} ls-remote - "${gitlab_link}.git" "${arg_HEAD_REF}" - RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_output + # When multiple vcpkg_from_gitlab's are used after each other, only use the version from the first (hopefully the primary one). + if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED VCPKG_HEAD_VERSION) + z_uri_encode("${arg_REPO}" encoded_repo_path) + set(version_url "${arg_GITLAB_URL}/api/v4/projects/${encoded_repo_path}/repository/branches/${arg_HEAD_REF}") + vcpkg_download_distfile(archive_version + URLS "${version_url}" + FILENAME "${downloaded_file_name}.version" + ${headers_param} + SKIP_SHA512 + ALWAYS_REDOWNLOAD ) - if(NOT git_result EQUAL 0) - message(FATAL_ERROR "git ls-remote failed to read ref data of repository: '${gitlab_link}'") - endif() - if(NOT git_output MATCHES "^([a-f0-9]*)\t") - message(FATAL_ERROR "git ls-remote returned unexpected result: -${git_output} -") - endif() - # When multiple vcpkg_from_gitlab's are used after each other, only use the version from the first (hopefully the primary one). - if(NOT DEFINED VCPKG_HEAD_VERSION) - set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) + # Parse the gitlab response with regex. + file(READ "${archive_version}" version_contents) + if(NOT version_contents MATCHES [["id":(\ *)"([a-f0-9]+)"]]) + message(FATAL_ERROR "Failed to parse API response from '${version_url}':\n${version_contents}\n") endif() + set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_2}" PARENT_SCOPE) endif() # download the file information from gitlab From cf221d35ebf9c77f018ffc09aa5cc223f8015c3e Mon Sep 17 00:00:00 2001 From: Woefie Date: Sat, 13 Aug 2022 00:41:10 +0200 Subject: [PATCH 383/791] [libgpiod] Arm support cxx bindings (#25845) * [libgpiod] change arm64 to arm and add cxx bindings * [libgpiod] formatting * Chages as suggested in pr * Chages as suggested in pr * fix versions * using simpler way of setting feature * added arm64 back * Add parens and quotes. Co-authored-by: Billy O'Neal --- ports/libgpiod/portfile.cmake | 18 ++++++++++++------ ports/libgpiod/vcpkg.json | 11 ++++++++--- versions/baseline.json | 2 +- versions/l-/libgpiod.json | 5 +++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/ports/libgpiod/portfile.cmake b/ports/libgpiod/portfile.cmake index 68ee7eff023d0f..bffa9e8b6a5308 100644 --- a/ports/libgpiod/portfile.cmake +++ b/ports/libgpiod/portfile.cmake @@ -17,26 +17,32 @@ vcpkg_cmake_get_vars(cmake_vars_file) include("${cmake_vars_file}") if (VCPKG_DETECTED_CMAKE_CROSSCOMPILING STREQUAL "TRUE") - list(APPEND OPTIONS CC=${VCPKG_DETECTED_CMAKE_C_COMPILER}) - if (VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS "CC=${VCPKG_DETECTED_CMAKE_C_COMPILER}") + if (VCPKG_TARGET_IS_LINUX AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) list(APPEND OPTIONS ac_cv_func_malloc_0_nonnull=yes) list(APPEND OPTIONS ac_cv_func_realloc_0_nonnull=yes) endif() endif() +if ("cxx-bindings" IN_LIST FEATURES) + set(USE_CXX_BINDINGS yes) +else() + set(USE_CXX_BINDINGS no) +endif() + vcpkg_configure_make( AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} --enable-tools=no --enable-tests=no - --enable-bindings-cxx=no + --enable-bindings-cxx=${USE_CXX_BINDINGS} --enable-bindings-python=no ) vcpkg_install_make() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libgpiod/vcpkg.json b/ports/libgpiod/vcpkg.json index cf31258e3245fc..11d6da3782242f 100644 --- a/ports/libgpiod/vcpkg.json +++ b/ports/libgpiod/vcpkg.json @@ -1,15 +1,20 @@ { "name": "libgpiod", "version": "1.6.3", - "port-version": 1, + "port-version": 2, "description": "C library and tools for interacting with the linux GPIO character device", "homepage": "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git", "license": "LGPL-2.1-or-later", - "supports": "linux & (x64 | arm64)", + "supports": "linux & (x64 | arm)", "dependencies": [ { "name": "vcpkg-cmake-get-vars", "host": true } - ] + ], + "features": { + "cxx-bindings": { + "description": "Make available cxx bindings" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index d27315d778e230..9b4adaecc5a26d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3678,7 +3678,7 @@ }, "libgpiod": { "baseline": "1.6.3", - "port-version": 1 + "port-version": 2 }, "libgpod": { "baseline": "2019-08-29", diff --git a/versions/l-/libgpiod.json b/versions/l-/libgpiod.json index f63117753037ad..4e8ba921ec9082 100644 --- a/versions/l-/libgpiod.json +++ b/versions/l-/libgpiod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "effc79de6dafb6ef6762bd2863a222c6090881e8", + "version": "1.6.3", + "port-version": 2 + }, { "git-tree": "014bb3350492c4259151f00b3419e2054f707401", "version": "1.6.3", From f2b8c684a0227c65e79e12969c5e0900aa903fbc Mon Sep 17 00:00:00 2001 From: Nursultan Zarlyk Date: Sat, 13 Aug 2022 00:41:46 +0200 Subject: [PATCH 384/791] [Tesseract] Add arm64-windows (#26242) * Add arm-windows * Add version * Add version Co-authored-by: Nursultan Zarlyk --- ports/tesseract/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/t-/tesseract.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 6b2477d6b462eb..fae6a4f4c8ccd8 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,10 +1,10 @@ { "name": "tesseract", "version": "4.1.1", - "port-version": 10, + "port-version": 11, "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", - "supports": "!arm", + "supports": "!(arm & (osx | linux))", "dependencies": [ "leptonica", "libarchive", diff --git a/versions/baseline.json b/versions/baseline.json index 9b4adaecc5a26d..07b86bf426db00 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7046,7 +7046,7 @@ }, "tesseract": { "baseline": "4.1.1", - "port-version": 10 + "port-version": 11 }, "tfhe": { "baseline": "1.0.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index e13ddd02565661..e6cb1bf9899c80 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24c99e73eaf335a9abedcfd42163c4968ca07ec3", + "version": "4.1.1", + "port-version": 11 + }, { "git-tree": "ac84bef93d2709f28bf4ab8341a80dab949a8cf1", "version": "4.1.1", From 433051734424c8d44e34fe191ffbad7f31e5b61c Mon Sep 17 00:00:00 2001 From: ALittleDruid <33475287+ALittleDruid@users.noreply.github.com> Date: Sat, 13 Aug 2022 06:42:05 +0800 Subject: [PATCH 385/791] [Dcmtk] enable dependencies (#26255) * dcmtk: Enable dependencies, shared libs, stl, c++17 ... * dcmtk: Update port version * modify portfile based on comments from the review * Update version database * Use vcpkg_check_features' FEATURE_OPTIONS and other nitipicks. Co-authored-by: ALittleDruid <297957399@qq.com> Co-authored-by: Billy O'Neal --- ports/dcmtk/portfile.cmake | 113 ++++++++++++++++++++++++++++---- ports/dcmtk/vcpkg.json | 51 +++++++++++++- ports/dcmtk/windows-patch.patch | 32 +++++++++ versions/baseline.json | 2 +- versions/d-/dcmtk.json | 5 ++ 5 files changed, 187 insertions(+), 16 deletions(-) create mode 100644 ports/dcmtk/windows-patch.patch diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index a7ba43bc16a332..0d84733cb7ab47 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -1,40 +1,127 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DCMTK/dcmtk REF a137f1aff4e1df3fbefe53ee8b160973c74c96dd # DCMTK-3.6.7 SHA512 dd41b38ef5d02ac2bf4071e1c27814e03357bc6a51eef59daf47a86d024d7fcbaaa1a71df8600fb8180f8b6537d45d6bf48a00730c1fa9d147778f36ff3e425a HEAD_REF master - PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch + PATCHES + dcmtk.patch + windows-patch.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "iconv" DCMTK_WITH_ICONV + "icu" DCMTK_WITH_ICU + "openssl" DCMTK_WITH_OPENSSL + "png" DCMTK_WITH_PNG + "tiff" DCMTK_WITH_TIFF + "xml2" DCMTK_WITH_XML + "zlib" DCMTK_WITH_ZLIB + "tools" BUILD_APPS ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + ${FEATURE_OPTIONS} -DDCMTK_WITH_DOXYGEN=OFF - -DDCMTK_WITH_ZLIB=OFF - -DDCMTK_WITH_OPENSSL=OFF - -DDCMTK_WITH_PNG=OFF - -DDCMTK_WITH_TIFF=OFF - -DDCMTK_WITH_XML=OFF - -DDCMTK_WITH_ICONV=OFF -DDCMTK_FORCE_FPIC_ON_UNIX=ON -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF -DDCMTK_ENABLE_PRIVATE_TAGS=ON - -DBUILD_APPS=OFF - -DDCMTK_ENABLE_CXX11=ON + -DCMAKE_CXX_STANDARD=17 -DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS=ON -DDCMTK_WIDE_CHAR_MAIN_FUNCTION=ON + -DDCMTK_ENABLE_STL=ON -DCMAKE_DEBUG_POSTFIX=d OPTIONS_DEBUG -DINSTALL_HEADERS=OFF -DINSTALL_OTHER=OFF + -DBUILD_APPS=OFF ) vcpkg_cmake_install() vcpkg_copy_pdbs() +if ("tools" IN_LIST FEATURES) + set(_tools + cda2dcm + dcm2json + dcm2pdf + dcm2pnm + dcm2xml + dcmcjpeg + dcmcjpls + dcmconv + dcmcrle + dcmdata_tests + dcmdjpeg + dcmdjpls + dcmdrle + dcmdspfn + dcmdump + dcmect_tests + dcmfg_tests + dcmftest + dcmgpdir + dcmicmp + dcmiod_tests + dcmj2pnm + dcml2pnm + dcmmkcrv + dcmmkdir + dcmmklut + dcmnet_tests + dcmodify + dcmp2pgm + dcmprscp + dcmprscu + dcmpschk + dcmpsmk + dcmpsprt + dcmpsrcv + dcmpssnd + dcmqridx + dcmqrscp + dcmqrti + dcmquant + dcmrecv + dcmrt_tests + dcmscale + dcmseg_tests + dcmsend + dcmsign + dcmsr_tests + dcmtls_tests + dcod2lum + dconvlum + drtdump + drttest + dsr2html + dsr2xml + dsrdump + dump2dcm + echoscu + findscu + getscu + img2dcm + mkreport + movescu + msgserv + ofstd_tests + pdf2dcm + stl2dcm + storescp + storescu + termscu + wlmscpfs + wltest + xml2dcm + xml2dsr + ) + vcpkg_copy_tools(TOOL_NAMES ${_tools} AUTO_CLEAN) +endif() + vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -46,5 +133,5 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" " vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "") vcpkg_fixup_pkgconfig() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dcmtk" RENAME copyright) + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 5358bba2809a2f..5c9cde994a383b 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dcmtk", "version": "3.6.7", - "port-version": 1, + "port-version": 2, "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.", "homepage": "https://github.com/DCMTK/dcmtk", "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng", @@ -15,5 +15,52 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "iconv": { + "description": "Enable Iconv support", + "dependencies": [ + "libiconv" + ] + }, + "icu": { + "description": "Enable ICU support", + "dependencies": [ + "icu" + ] + }, + "openssl": { + "description": "Enable OpenSSL", + "dependencies": [ + "openssl" + ] + }, + "png": { + "description": "Enable PNG support", + "dependencies": [ + "libpng" + ] + }, + "tiff": { + "description": "Enable TIFF support", + "dependencies": [ + "tiff" + ] + }, + "tools": { + "description": "Build apps" + }, + "xml2": { + "description": "Enable XML support", + "dependencies": [ + "libxml2" + ] + }, + "zlib": { + "description": "Enable zlib support", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/ports/dcmtk/windows-patch.patch b/ports/dcmtk/windows-patch.patch new file mode 100644 index 00000000000000..83322ea9220500 --- /dev/null +++ b/ports/dcmtk/windows-patch.patch @@ -0,0 +1,32 @@ +diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake +index 47e3476..2c974e8 100644 +--- a/CMake/3rdparty.cmake ++++ b/CMake/3rdparty.cmake +@@ -3,11 +3,7 @@ if(WIN32) + # For Windows, we don't used FIND_PACKAGE because DCMTK usually is used with its + # own set of 3rd-party support libraries that can be downloaded from DCMTK's + # website (pre-built). +- if(MINGW) +- set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}") +- else() +- set(DCMTK_USE_FIND_PACKAGE FALSE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}") +- endif() ++ set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}") + else() + # Only find_package is supported + set(DCMTK_USE_FIND_PACKAGE TRUE CACHE BOOL "${USE_FIND_PACKAGE_DOCS}") +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f8d268..28ddc3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,10 @@ cmake_minimum_required(VERSION 3.0.0...3.13.2 FATAL_ERROR) + # Declare project + project(DCMTK) + ++if(MSVC) ++ string(APPEND CMAKE_CXX_FLAGS " /Zc:__cplusplus") ++endif() ++ + #----------------------------------------------------------------------------- + # General project settings to configure DCMTK build process + #----------------------------------------------------------------------------- diff --git a/versions/baseline.json b/versions/baseline.json index 07b86bf426db00..e929177e2e0115 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1858,7 +1858,7 @@ }, "dcmtk": { "baseline": "3.6.7", - "port-version": 1 + "port-version": 2 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index b53193613a6d77..3a116fbdaa7003 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbfc85b6b840eb68b947c8b9bd69988c938198d3", + "version": "3.6.7", + "port-version": 2 + }, { "git-tree": "c08360f31aa07d9514b52b3c98ca6c5ae6e17bb2", "version": "3.6.7", From 72e0e47ae5e110957bc26bf79743f2a429f488f8 Mon Sep 17 00:00:00 2001 From: Pedro Callado Date: Fri, 12 Aug 2022 19:43:39 -0300 Subject: [PATCH 386/791] [xtensor-blas] Updates to 0.20.0 (#26275) * updates portfile, baseline and vcpkg.json files * adds port version to vcpkg.json * corrects git-tree value * runs x-add-version and format-manifest * updates version database * Update ports/xtensor-blas/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update version via x-add-version Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/xtensor-blas/portfile.cmake | 4 ++-- ports/xtensor-blas/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/x-/xtensor-blas.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake index 4de89d2754b51a..c49b540d5985e9 100644 --- a/ports/xtensor-blas/portfile.cmake +++ b/ports/xtensor-blas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor-blas - REF 2876b041a2759f10dfde13ab3a2fc09578ae4b40 # 0.17.2 - SHA512 64c78d093f24fc15715bc7dfa486cfb1342a6752ea497f43553d031fc8be30718d01157e5b6412c516e6ce2be9045a89963d912e60f4eb7431675331b8ed6f90 + REF 66ab0fa7cd53d0b914f89d4d451576a9240ea457 # 0.20.0 + SHA512 c95aa1388577ca74933c81e56322c9dae9c4d6b0493be60d5a3bfbaeaf769f6005542b5b0a24a6c6374007499113c2920870b01c4f5ea712ad78c2468964b6db HEAD_REF master ) diff --git a/ports/xtensor-blas/vcpkg.json b/ports/xtensor-blas/vcpkg.json index 70c3147273b515..0189ad0f5f669a 100644 --- a/ports/xtensor-blas/vcpkg.json +++ b/ports/xtensor-blas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "xtensor-blas", - "version-string": "0.17.2", - "port-version": 2, + "version": "0.20.0", "description": "BLAS extension to xtensor", "homepage": "https://github.com/xtensor-stack/xtensor-blas", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e929177e2e0115..91e53797db466f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7777,8 +7777,8 @@ "port-version": 0 }, "xtensor-blas": { - "baseline": "0.17.2", - "port-version": 2 + "baseline": "0.20.0", + "port-version": 0 }, "xtensor-fftw": { "baseline": "2019-11-30", diff --git a/versions/x-/xtensor-blas.json b/versions/x-/xtensor-blas.json index f377a2b39e3d6a..ea8748bd377753 100644 --- a/versions/x-/xtensor-blas.json +++ b/versions/x-/xtensor-blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dd896df9d5ded9e0980d91c3d1727c4105dd7c3", + "version": "0.20.0", + "port-version": 0 + }, { "git-tree": "6524a2462dd339878f2e32de8962576a15097a5e", "version-string": "0.17.2", From 7d21ec61e627690a1267f97efdb4c9ee31b529d9 Mon Sep 17 00:00:00 2001 From: MSP-Greg Date: Fri, 12 Aug 2022 17:45:09 -0500 Subject: [PATCH 387/791] sqlite3: update to 3.39.2 (#26280) --- ports/sqlite3/portfile.cmake | 8 ++++---- ports/sqlite3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index ce6004647e2a0d..32b423f4e39e07 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,7 +1,7 @@ # Be sure to update both of these versions together. -set(SQLITE_VERSION 3390100) -set(PKGCONFIG_VERSION 3.39.1) -set(SQLITE_HASH e36f30839e0884d021f05f1220a6cf8956156bb00f1f661dcdbe1771ddeb7836e8348034c5e993194a5f28167affda2add6922b6aff4921854bbe566b2254a84) +set(SQLITE_VERSION 3390200) +set(PKGCONFIG_VERSION 3.39.2) +set(SQLITE_HASH a8fb7903cdc985d17b421035d6affe16795382085d7eb70428bdbbb4abc7ea6674aa251d4e532b531733c195e8867bfbd3c5556824c76cf321f8bc617bad6a32) vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2022/sqlite-amalgamation-${SQLITE_VERSION}.zip" @@ -69,4 +69,4 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sqlite3.h" "# define SQLITE_API\n" "# define SQLITE_API __declspec(dllimport)\n") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "SQLite is in the Public Domain.\nhttp://www.sqlite.org/copyright.html\n") diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 521bb1d53c35a4..6ff4859a70f1bc 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sqlite3", - "version": "3.39.1", + "version": "3.39.2", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://github.com/sqlite/sqlite", "license": "blessing", diff --git a/versions/baseline.json b/versions/baseline.json index 91e53797db466f..c42b336027a86d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6861,7 +6861,7 @@ "port-version": 0 }, "sqlite3": { - "baseline": "3.39.1", + "baseline": "3.39.2", "port-version": 0 }, "sqlitecpp": { diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 0c3150d10766e8..342a37d26c6154 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b673cfda60055677c42fe66cdd0655ad4a1110dd", + "version": "3.39.2", + "port-version": 0 + }, { "git-tree": "ccab102efea1120dc2140b4c0519676a65c055b6", "version": "3.39.1", From 84cd59faafa852faad9a3041ed51be6b9910101f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 13 Aug 2022 06:45:23 +0800 Subject: [PATCH 388/791] [glfw3] update to 3.3.8 (#26289) * [glfw3] update to <3.3.8> * update version --- ports/glfw3/portfile.cmake | 4 ++-- ports/glfw3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glfw3.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index c95a6d6b326c88..ac85f54fb43f98 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 45ce5ddd197d5c58f50fdd3296a5131c894e5527 #v3.3.7 - SHA512 0802b499cb56f5c4f575304279aafe7d812443fcf3dbfa75178cfba7a3693fb88731ae5dd29c6937598ba977de156d92af1ea99929b70ff72ed8429693f301c7 + REF 7482de6071d21db77a7236155da44c172a7f6c9e #v3.3.8 + SHA512 ec45b620338cf36a8dbdf7aaf54d7c3a49a1be4ae1a1ef95f1531094fec670870713969bbc23476769d374c7a71d93f6540ab64c46fb5f66f4402bb2d15c7d87 HEAD_REF master ) diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index ef22ea54594236..b10ace797c5fad 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glfw3", - "version-semver": "3.3.7", + "version-semver": "3.3.8", "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.", "homepage": "https://github.com/glfw/glfw", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index c42b336027a86d..1fc0dee43a6c8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2585,7 +2585,7 @@ "port-version": 0 }, "glfw3": { - "baseline": "3.3.7", + "baseline": "3.3.8", "port-version": 0 }, "gli": { diff --git a/versions/g-/glfw3.json b/versions/g-/glfw3.json index bf6222fba6bf18..6c3ec39af21f9a 100644 --- a/versions/g-/glfw3.json +++ b/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2a1ebc7845c0e8e6c7d46c0b940f4457cf460d8", + "version-semver": "3.3.8", + "port-version": 0 + }, { "git-tree": "1da77592851c5a530a1c96c6d7d554c625b7f509", "version-semver": "3.3.7", From 4ea3456f214deb69d9070a7abec11040a7308b4a Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 13 Aug 2022 06:46:15 +0800 Subject: [PATCH 389/791] [opencc] De-vendor rapidjson (#26291) * update opencc to v1.1.4 and add feature rapidjson * update * convert feature to dependence * remove useless code --- ports/opencc/fix-dependencies.patch | 16 ++++++++++++++++ ports/opencc/portfile.cmake | 3 +++ ports/opencc/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/o-/opencc.json | 5 +++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 ports/opencc/fix-dependencies.patch diff --git a/ports/opencc/fix-dependencies.patch b/ports/opencc/fix-dependencies.patch new file mode 100644 index 00000000000000..401de5145718ba --- /dev/null +++ b/ports/opencc/fix-dependencies.patch @@ -0,0 +1,16 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 11d14e4..fde4b7b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -137,6 +137,11 @@ set_target_properties( + 1.1 + ) + ++if(USE_SYSTEM_RAPIDJSON) ++ find_package(RapidJSON CONFIG REQUIRED) ++ target_link_libraries(libopencc PRIVATE rapidjson) ++endif() ++ + # Installation + + install( diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index 49f53782bf4c94..7b34399f1ded0f 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF ver.1.1.4 SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46 HEAD_REF master + PATCHES + fix-dependencies.patch ) vcpkg_find_acquire_program(PYTHON3) @@ -15,6 +17,7 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_DOCUMENTATION=OFF -DENABLE_GTEST=OFF + -DUSE_SYSTEM_RAPIDJSON=ON ) vcpkg_cmake_install( diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index 2daaa6e6e9f134..e4a42458f148b4 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,11 +1,13 @@ { "name": "opencc", "version": "1.1.4", + "port-version": 1, "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "homepage": "https://github.com/BYVoid/OpenCC", "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ + "rapidjson", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 1fc0dee43a6c8e..86227160bb584d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5166,7 +5166,7 @@ }, "opencc": { "baseline": "1.1.4", - "port-version": 0 + "port-version": 1 }, "opencensus-cpp": { "baseline": "2021-08-26", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index 37d01d051cfb0f..b8627179336e28 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfa36e95a55659eb27edc3ba561b3c06b202ff76", + "version": "1.1.4", + "port-version": 1 + }, { "git-tree": "9c886059bbc8c7c14a7d7290b22e2036c3ff8fe6", "version": "1.1.4", From 2220e68e2b3312d5c8a5f2935cf04f2f2dbe1928 Mon Sep 17 00:00:00 2001 From: jureviciusr Date: Sat, 13 Aug 2022 01:46:29 +0300 Subject: [PATCH 390/791] [dv-processing] Update to hotfix release 1.5.1 (#26292) * dv-processing bump to 1.5.1 * Adding versions Co-authored-by: Rokas Jurevicius --- ports/dv-processing/portfile.cmake | 4 ++-- ports/dv-processing/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dv-processing.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake index bf1e82673ba456..1d6fe944184598 100644 --- a/ports/dv-processing/portfile.cmake +++ b/ports/dv-processing/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.com/inivation OUT_SOURCE_PATH SOURCE_PATH REPO dv/dv-processing - REF 96d082a862bb1e5bfdc79b39aa09e7a50c2dac49 - SHA512 cf74e8a6f94f690e159778b59eb2e4d9c8f51f09437e94a507a2ec8f42e167fe6d1413ba91ab608624a02b4b479b27f454e7b7792d125ce5a163f4aa98e774cc + REF 6029bb4ecc06566b5f68375c68f00dfe78587baa + SHA512 9d0928e6ded1dab147814f380c57fb5b2c467c213c1fd12dddad9982e7d6a94a7bef526fcd248dd672b4b84753a44599b10d7794640ec63027152cd33b675787 HEAD_REF rel_1.5 ) diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json index f5fee4d848c15f..e7c86827a97950 100644 --- a/ports/dv-processing/vcpkg.json +++ b/ports/dv-processing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dv-processing", - "version": "1.5.0", + "version": "1.5.1", "description": "Generic algorithms for event cameras.", "homepage": "https://gitlab.com/inivation/dv/dv-processing", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 86227160bb584d..053f5b2f92cbeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2009,7 +2009,7 @@ "port-version": 2 }, "dv-processing": { - "baseline": "1.5.0", + "baseline": "1.5.1", "port-version": 0 }, "dx": { diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json index 6cdb930816c49c..48beff248ba28e 100644 --- a/versions/d-/dv-processing.json +++ b/versions/d-/dv-processing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fb27b7a8c1ee9bd01035958e7b3b3a487a89dd8", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "e45cf567d2617df07999f47cff84636f513a0c1c", "version": "1.5.0", From f54f1c7235af47f5bdd86e1d105eb738f192a8f7 Mon Sep 17 00:00:00 2001 From: Tim Miller <86238857+verifiedtm@users.noreply.github.com> Date: Fri, 12 Aug 2022 18:46:47 -0400 Subject: [PATCH 391/791] [bdwgc] Installing pkg-config files for debug builds (#26302) --- ports/bdwgc/portfile.cmake | 3 +-- ports/bdwgc/vcpkg.json | 2 +- versions/b-/bdwgc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 9fe8ed0f873589..3ddcc7d403b339 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -12,8 +12,6 @@ vcpkg_cmake_configure( -Denable_cplusplus=ON -Denable_docs=OFF -DCFLAGS_EXTRA=-I${CURRENT_INSTALLED_DIR}/include # for libatomic_ops - OPTIONS_DEBUG - -Dinstall_headers=OFF ) vcpkg_cmake_install() @@ -21,6 +19,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/bdwgc) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_fixup_pkgconfig() diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index f9958115349fd9..3186075256e9b5 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bdwgc", "version": "8.2.0", - "port-version": 3, + "port-version": 4, "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", "homepage": "http://www.hboehm.info/gc/", "dependencies": [ diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 92dbb78c1e8e17..2ffa9205b22c32 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fe23b71dde5d4abc9a755c359a583b8d7ba3035", + "version": "8.2.0", + "port-version": 4 + }, { "git-tree": "1cf3b7a458af2eba78e5af9674e8f6d28b53e254", "version": "8.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 053f5b2f92cbeb..74963a4e96f540 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -422,7 +422,7 @@ }, "bdwgc": { "baseline": "8.2.0", - "port-version": 3 + "port-version": 4 }, "beast": { "baseline": "0", From d293ac220dd126165d24907b6f07e6b658b3329f Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Sat, 13 Aug 2022 00:47:03 +0200 Subject: [PATCH 392/791] [shaderwriter] Update to v2.4.0 (#26310) --- ports/shaderwriter/portfile.cmake | 8 ++++---- ports/shaderwriter/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/shaderwriter.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/shaderwriter/portfile.cmake b/ports/shaderwriter/portfile.cmake index 14276ee9828e20..b5116c7d28562b 100644 --- a/ports/shaderwriter/portfile.cmake +++ b/ports/shaderwriter/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/ShaderWriter - REF e962d383c9c418767b96d2c3e864b3800e98826f + REF ec31f19f88fe15af476b48da7499aac9d4089a8f HEAD_REF development - SHA512 7ef1d4622bb1a38f201e9325ffca0de675816e9dc6f644d2e4a900409a5045f603dda5c86a3099a99f3be70175ca7bf6aed1c4c1e25aa9b5172967e30498536d + SHA512 7c7979d24c5ab5b896c9f4a090b1014c924a5b10657eadf13a92bb6d212f6e9fa8ec7f992b637b890f89d36365526b1d5f6698c4fed209b3fd0c424b04ce99a6 ) vcpkg_from_github(OUT_SOURCE_PATH CMAKE_SOURCE_PATH REPO DragonJoker/CMakeUtils - REF 9fbaae40ccdc92f86989dc6875f362e7943b6a94 + REF 684ef1585180798879c3bf4cba45f9b19948e275 HEAD_REF master - SHA512 dada8ac1f9676c60f1ff5a09a9f788eb8d85eaca450407e4bf0100fbec87228f99cf66cb23de9c9358dda72c426655814cbd1ea90360ca0c63e7660c15aff22b + SHA512 d87f937d94d2db985322d557eb6e0af7b8f85f2a0b86cb1bddc2a0997237620d3dcb78066ee64280f7a905f64e003b219aac761f2ffd27f46d3c084a2bb490e3 ) file(REMOVE_RECURSE "${SOURCE_PATH}/CMake") diff --git a/ports/shaderwriter/vcpkg.json b/ports/shaderwriter/vcpkg.json index d9de58a849cedb..e1d3dc5d00b1b4 100644 --- a/ports/shaderwriter/vcpkg.json +++ b/ports/shaderwriter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shaderwriter", - "version": "2.3.0", + "version": "2.4.0", "description": "Library to write shaders directly from C++ code, supports GLSL, HLSL and SPIRV outputs.", "homepage": "https://github.com/DragonJoker/ShaderWriter", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 74963a4e96f540..6d7bffe87bd4d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6597,7 +6597,7 @@ "port-version": 2 }, "shaderwriter": { - "baseline": "2.3.0", + "baseline": "2.4.0", "port-version": 0 }, "shapelib": { diff --git a/versions/s-/shaderwriter.json b/versions/s-/shaderwriter.json index c0899c2814e739..8ad430dec61bf3 100644 --- a/versions/s-/shaderwriter.json +++ b/versions/s-/shaderwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d38b73de38449904ef8e9803b632e08bb86a6a88", + "version": "2.4.0", + "port-version": 0 + }, { "git-tree": "a5b9552631eef5dc2f4fc3bb2056730dc164981c", "version": "2.3.0", From cea98053b05d6b11ec9b800cd3979d581ea225a5 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Mon, 15 Aug 2022 09:21:37 -0700 Subject: [PATCH 393/791] [libwebp] Update to 1.2.4 (#26319) * update libwebp to 1.2.4 * update baseline --- ports/libwebp/portfile.cmake | 16 +++------------- ports/libwebp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libwebp.json | 5 +++++ 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 20159d4fc0f93f..b15557743b0f80 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libwebp - REF v1.2.3 - SHA512 27f86817350e6d0e215c449665046df8c63203344f9a2846770af292ce8fee486a72adfd5e1122aa67e7d2f3e3972cd8423da95fee7edf10c9848bcbda46264c + REF v1.2.4 + SHA512 85c7d2bd1697ed6f18d565056d0105edd63697f144d2c935e9c0563ff09f4acc56d4ac509668f920e8d5dc3c74b53a42f65265fc758fed173cb2168c4d6a551c HEAD_REF master PATCHES 0002-cmake-config.patch @@ -78,14 +78,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -# For compatibility -file(READ "${CURRENT_PACKAGES_DIR}/share/WebP/WebPTargets.cmake" contents) -string(APPEND contents " -if(NOT TARGET WebP::libwebpmux) - add_library(WebP::libwebpmux INTERFACE IMPORTED) - set_target_properties(WebP::libwebpmux PROPERTIES INTERFACE_LINK_LIBRARIES WebP::webpmux) -endif() -") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/WebP/WebPTargets.cmake" "${contents}") \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 6f0bcf2f0a47d4..dbd72cd2bf692f 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libwebp", - "version": "1.2.3", + "version": "1.2.4", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 6d7bffe87bd4d5..06a9df6353ff1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4253,7 +4253,7 @@ "port-version": 1 }, "libwebp": { - "baseline": "1.2.3", + "baseline": "1.2.4", "port-version": 0 }, "libwebsockets": { diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 9003761b96c447..b5379d625fe96b 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6bce9ad4c595a817fb1f227661c5bc955b177754", + "version": "1.2.4", + "port-version": 0 + }, { "git-tree": "e2b9421b3093512c54494cf01a3fd6edb7424e02", "version": "1.2.3", From 6943024ae1635647b925c62e01dff45e7e8ccebc Mon Sep 17 00:00:00 2001 From: Florian Albrechtskirchinger Date: Mon, 15 Aug 2022 18:42:24 +0200 Subject: [PATCH 394/791] [nlohmann-json] Update to 3.11.2 (#26124) * Update nlohmann-json to 3.11.2 * Update versions --- ports/nlohmann-json/portfile.cmake | 10 ++++------ ports/nlohmann-json/usage | 2 +- ports/nlohmann-json/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nlohmann-json.json | 5 +++++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 81e434b0d423d9..947cba357282f7 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nlohmann/json - REF v3.10.5 - SHA512 4a9d6416f383e76bf95425fc02a4e12c605fcbcae910b704e354396a493454cf8a1ffbecba11f231e020ffd2842908df7e67dbc09f62d1202d40b6815c24cfd2 + REF v3.11.2 + SHA512 70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 HEAD_REF master ) @@ -24,7 +24,7 @@ vcpkg_cmake_configure( -DJSON_ImplicitConversions=${nlohmann-json_IMPLICIT_CONVERSIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "lib/cmake/nlohmann_json") +vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "share/cmake/nlohmann_json") vcpkg_fixup_pkgconfig() vcpkg_replace_string( @@ -39,9 +39,7 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis") ) endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/nlohmann_json.natvis") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nlohmann-json/usage b/ports/nlohmann-json/usage index a078bbd38aed35..19c76d508d09dc 100644 --- a/ports/nlohmann-json/usage +++ b/ports/nlohmann-json/usage @@ -9,4 +9,4 @@ The package nlohmann-json can be configured to not provide implicit conversions For more information, see the docs here: - https://json.nlohmann.me/features/macros/#json_use_implicit_conversions + https://json.nlohmann.me/api/macros/json_use_implicit_conversions/ diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json index ac382db2fc2b6b..cc65b9d204d696 100644 --- a/ports/nlohmann-json/vcpkg.json +++ b/ports/nlohmann-json/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nlohmann-json", - "version-semver": "3.10.5", - "port-version": 3, + "version-semver": "3.11.2", "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 06a9df6353ff1d..554a6b29975d16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4949,8 +4949,8 @@ "port-version": 2 }, "nlohmann-json": { - "baseline": "3.10.5", - "port-version": 3 + "baseline": "3.11.2", + "port-version": 0 }, "nlopt": { "baseline": "2.7.1", diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index b476b41881b4f9..382f3b167b58cf 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caa64b8c731ac2457575ea3c5f1827bc82ecac84", + "version-semver": "3.11.2", + "port-version": 0 + }, { "git-tree": "91f188e19b106e7d316de593e98f3319f8f5ec25", "version-semver": "3.10.5", From e4f8bbe3cf5ae51001ec6c9f169ca843017d1098 Mon Sep 17 00:00:00 2001 From: Rasmus-123 <58940717+Rasmus-123@users.noreply.github.com> Date: Mon, 15 Aug 2022 19:48:44 +0200 Subject: [PATCH 395/791] [libosmium] Update to 2.18.0 (#26324) * [libosmium] Update to 2.18.0 * [libosmium] Updating the version files * [libosmium] Added lz4 dependency * [libosmium] Overwrote git-tree for fixed version --- ports/libosmium/portfile.cmake | 4 ++-- ports/libosmium/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libosmium.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/libosmium/portfile.cmake b/ports/libosmium/portfile.cmake index f764134df63a07..f0443e3d6c4ede 100644 --- a/ports/libosmium/portfile.cmake +++ b/ports/libosmium/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmcode/libosmium - REF v2.17.1 - SHA512 08d1eb272b82364118b97213310e5d62fdbb071cfad74989bdc5bb25f9e14b067d53016d19bfed3972d3385343fc74edf86407860be83c59e74902cd1f26bb33 + REF v2.18.0 + SHA512 bfe4d5b08e284abb21280205437c62d260948c8585cc8d10f0c3496fd29df1ff6c6bc436283207f292d6a8af911835ebef64403c3fde2a262b55fde5296c13ce ) set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json index ffd7c586163780..9f1a9dad5a8730 100644 --- a/ports/libosmium/vcpkg.json +++ b/ports/libosmium/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libosmium", - "version-semver": "2.17.1", - "port-version": 1, + "version-semver": "2.18.0", "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", "license": "BSL-1.0", @@ -9,6 +8,7 @@ "boost", "bzip2", "expat", + "lz4", "proj", "protozero", "utfcpp", diff --git a/versions/baseline.json b/versions/baseline.json index 554a6b29975d16..ac960f2965eda3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3941,8 +3941,8 @@ "port-version": 2 }, "libosmium": { - "baseline": "2.17.1", - "port-version": 1 + "baseline": "2.18.0", + "port-version": 0 }, "libosmscout": { "baseline": "1.1.1", diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index ff0000a08fa991..0bd25a29838fa8 100644 --- a/versions/l-/libosmium.json +++ b/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2336c0db38fce27c033ff77a649645a1eb508e33", + "version-semver": "2.18.0", + "port-version": 0 + }, { "git-tree": "9e9ae3d97e11dfebbba6d839add7886b4bede3b1", "version-semver": "2.17.1", From 28effe75c465548aac303e92cb438289e48133f5 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 15 Aug 2022 20:33:02 +0200 Subject: [PATCH 396/791] [c89stringutils] remove forced flags (#26249) * c89stringutils remove flags * v db * remove code * v db --- ports/c89stringutils/no_flags.patch | 20 ++++++++++++++++++++ ports/c89stringutils/portfile.cmake | 2 ++ ports/c89stringutils/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/c89stringutils.json | 5 +++++ 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ports/c89stringutils/no_flags.patch diff --git a/ports/c89stringutils/no_flags.patch b/ports/c89stringutils/no_flags.patch new file mode 100644 index 00000000000000..b2842c86f50318 --- /dev/null +++ b/ports/c89stringutils/no_flags.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0ce714554..f9f28b890 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,15 +18,7 @@ target_compile_features("${PROJECT_NAME}_compiler_flags" INTERFACE "c_std_${CMAK + set(gcc_like "$") + set(msvc "$") + # -g -fsanitize=address -fno-omit-frame-pointer +-target_compile_options( +- "${PROJECT_NAME}_compiler_flags" +- INTERFACE +- "$<${gcc_like}:$>" +- "$<${msvc}:$>" +-) + if (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") +- set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address") + endif (CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") + + # configure a header file to pass the version number only diff --git a/ports/c89stringutils/portfile.cmake b/ports/c89stringutils/portfile.cmake index ae15441cb25e53..06740ebcb2946a 100644 --- a/ports/c89stringutils/portfile.cmake +++ b/ports/c89stringutils/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 375c87aaf50a945b17a76727f3314eb217897caf SHA512 395d942a133209daf510094814830e35daf2047c35b0ff15b17051d7095e4598fd830e0e7f763cac6929b867ff3b0c03c5350c4c3cfc68ed98b69c9c68c04be0 HEAD_REF master + PATCHES + no_flags.patch ) vcpkg_cmake_configure( diff --git a/ports/c89stringutils/vcpkg.json b/ports/c89stringutils/vcpkg.json index 7a14d20460ba8e..4c2d06670c61ae 100644 --- a/ports/c89stringutils/vcpkg.json +++ b/ports/c89stringutils/vcpkg.json @@ -1,6 +1,7 @@ { "name": "c89stringutils", "version": "0.0.1", + "port-version": 1, "description": "string functions from newer standards / common non-standards for C89", "license": "Apache-2.0 OR MIT", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index ac960f2965eda3..55a69c202f8f13 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1234,7 +1234,7 @@ }, "c89stringutils": { "baseline": "0.0.1", - "port-version": 0 + "port-version": 1 }, "c9y": { "baseline": "0.4.0", diff --git a/versions/c-/c89stringutils.json b/versions/c-/c89stringutils.json index 7d7aa3a41460ed..826d84dec62603 100644 --- a/versions/c-/c89stringutils.json +++ b/versions/c-/c89stringutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4c282e10d69a020f581a2bd7b8d8ead1e29d9a2", + "version": "0.0.1", + "port-version": 1 + }, { "git-tree": "9c5dcb3c6cf4442e2fdcb4cdea39f512db0ead54", "version": "0.0.1", From 55bf0d8d41116790c885ef93f27f58c758367dcc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 15 Aug 2022 20:41:35 +0200 Subject: [PATCH 397/791] [ci.baseline.txt] add some entries for arm64-osx (#26341) --- scripts/ci.baseline.txt | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5746427ef6c0c4..d07d67957565e7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -74,6 +74,7 @@ c-dbg-macro:x64-uwp=skip c-dbg-macro:arm64-windows=skip c-dbg-macro:arm-uwp=skip c-dbg-macro:x64-osx=skip +c-dbg-macro:arm64-osx=skip c-dbg-macro:x64-linux=skip casclib:arm-uwp=fail @@ -82,6 +83,7 @@ catch-classic:arm64-windows = skip catch-classic:arm-uwp = skip catch-classic:x64-linux = skip catch-classic:x64-osx = skip +catch-classic:arm64-osx = skip catch-classic:x64-uwp = skip catch-classic:x64-windows = skip catch-classic:x64-windows-static = skip @@ -229,6 +231,7 @@ embree2:x64-windows-static-md=skip embree2:x64-linux=skip embree2:x64-osx=skip embree2:arm64-osx=skip +embree2:arm64-osx=skip epsilon:arm-uwp=fail epsilon:x64-uwp=fail fastrtps:arm-uwp=fail @@ -241,6 +244,7 @@ fluidlite:arm-uwp=skip fluidlite:arm64-windows=skip fluidlite:x64-linux=skip fluidlite:x64-osx=skip +fluidlite:arm64-osx=skip fluidlite:x64-uwp=skip fluidlite:x64-windows-static=skip fluidlite:x64-windows-static-md=skip @@ -354,6 +358,7 @@ ijg-libjpeg:arm64-windows = skip ijg-libjpeg:arm-uwp = skip ijg-libjpeg:x64-linux = skip ijg-libjpeg:x64-osx = skip +ijg-libjpeg:arm64-osx = skip ijg-libjpeg:x64-uwp = skip ijg-libjpeg:x64-windows = skip ijg-libjpeg:x64-windows-static = skip @@ -547,6 +552,7 @@ libvmdk:x64-windows-static-md=skip libvmdk:arm64=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip +libvmdk:arm64-osx=skip libwandio:x86-windows=fail libwandio:x64-windows=fail libwandio:x64-windows-static=fail @@ -560,6 +566,7 @@ linenoise-ng:arm-uwp=fail linenoise-ng:x64-uwp=fail live555:arm-uwp=fail live555:x64-osx=fail +live555:arm64-osx=fail live555:x64-uwp=fail # fails due to an upstream bug llfio:arm64-windows=fail @@ -586,6 +593,7 @@ marble:x64-osx=fail marble:x86-windows=fail mathgl:arm-uwp=fail mathgl:x64-osx=fail +mathgl:arm64-osx=fail mathgl:x64-uwp=fail mecab:arm64-windows = skip mecab:arm-uwp = skip @@ -618,6 +626,7 @@ microsoft-signalr:arm64-windows=skip microsoft-signalr:arm-uwp=skip microsoft-signalr:x64-linux=skip microsoft-signalr:x64-osx=skip +microsoft-signalr:arm64-osx=skip microsoft-signalr:x64-uwp=skip microsoft-signalr:x64-windows=skip microsoft-signalr:x64-windows-static=skip @@ -638,6 +647,7 @@ mmx:x64-windows-static-md=skip mmx:x86-windows=skip mmx:x64-linux=skip mmx:x64-osx=skip +mmx:arm64-osx=skip mmx:arm-uwp=skip mmx:x64-uwp=skip mmx:arm64-windows=skip @@ -725,6 +735,7 @@ offscale-libetcd-cpp:x64-uwp=fail ogdf:arm64-windows = skip ogdf:arm-uwp = skip ogdf:x64-osx=fail +ogdf:arm64-osx=fail ogdf:x64-uwp = skip ogdf:x64-windows = skip ogdf:x64-windows-static = skip @@ -733,6 +744,7 @@ ogdf:x86-windows = skip # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936 ogdf:x64-linux=fail ogre:x64-osx=fail +ogre:arm64-osx=fail # Conflicts with ogre ogre-next:arm64-windows = skip ogre-next:arm-uwp = skip @@ -754,6 +766,7 @@ ogre-next:x86-windows = skip # /mnt/vcpkg-ci/installed/x64-linux/debug/lib/libboost_system.a -lpthread && : # /usr/bin/ld: cannot find -lode ompl:x64-osx=fail +ompl:arm64-osx=fail ompl:x64-linux=fail openal-soft:arm-uwp=fail openal-soft:x64-uwp=fail @@ -796,7 +809,9 @@ openmesh:arm-uwp=fail openmesh:x64-uwp=fail openscap:x64-windows-static=fail openscap:x64-osx=fail +openscap:arm64-osx=fail openvpn3:x64-osx=fail +openvpn3:arm64-osx=fail openvr:arm64-windows=fail openvr:arm-uwp=fail openvr:x64-osx=fail @@ -818,6 +833,7 @@ paho-mqtt:x64-uwp=fail pango:x64-windows-static=fail pango:x64-windows-static-md=fail pfring:x64-osx=fail +pfring:arm64-osx=fail # pfring on Linux currently fails because its build scripts enable warnings as # errors, and warnings trigger with the Linux kernel headers in the Azure images. pfring:x64-linux=fail @@ -826,6 +842,7 @@ platform-folders:arm-uwp=fail platform-folders:x64-uwp=fail plib:arm-uwp=fail plib:x64-osx=fail +plib:arm64-osx=fail plib:x64-uwp=fail plibsys:arm-uwp=fail plibsys:x64-uwp=fail @@ -853,6 +870,7 @@ qt5-base:arm64-windows=fail # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) qt5-canvas3d:x64-linux=skip qt5-canvas3d:x64-osx=skip +qt5-canvas3d:arm64-osx=skip qt5-canvas3d:x64-windows=skip qt5-canvas3d:x64-windows-static=skip qt5-canvas3d:x64-windows-static-md=skip @@ -860,6 +878,7 @@ qt5-canvas3d:x86-windows=skip # Missing system libraries qt5-wayland:x64-osx=fail qtwayland:x64-osx=fail +qtwayland:arm64-osx=fail # Missing prerequisites for CI success qt5-webengine:x64-linux=fail qt5-webengine:x64-osx=fail @@ -873,6 +892,7 @@ qt5-webengine:x86-windows=skip qtwebengine:x64-windows=fail # Missing system libraries qt5-x11extras:x64-osx=fail +qt5-x11extras:arm64-osx=fail # Missing libraries qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail @@ -883,10 +903,12 @@ qwt:arm64-osx=fail qwt-qt6:x64-osx=fail qwtw:x64-windows=fail rabit:x64-osx=fail +rabit:arm64-osx=fail range-v3-vs2015:arm64-windows = skip range-v3-vs2015:arm-uwp = skip range-v3-vs2015:x64-linux = skip range-v3-vs2015:x64-osx = skip +range-v3-vs2015:arm64-osx = skip range-v3-vs2015:x64-uwp = skip range-v3-vs2015:x64-windows = skip range-v3-vs2015:x64-windows-static = skip @@ -932,6 +954,7 @@ rest-rpc:arm-uwp=skip rest-rpc:arm64-windows=skip rest-rpc:x64-linux=skip rest-rpc:x64-osx=skip +rest-rpc:arm64-osx=skip rhash:arm64-windows=fail rocksdb:arm-uwp=fail rocksdb:x64-uwp=fail @@ -974,6 +997,7 @@ sciter:arm64-windows=fail sciter:arm-uwp=fail sciter:x64-linux=fail sciter:x64-osx=fail +sciter:arm64-osx=fail sciter:x64-uwp=fail sciter:x64-windows=fail sciter:x64-windows-static=fail @@ -1000,6 +1024,7 @@ shiva:x64-windows-static=fail shiva:x64-windows-static-md=fail shiva-sfml:x64-linux=fail shiva-sfml:x64-osx=fail +shiva-sfml:arm64-osx=fail shiva-sfml:x86-windows=fail shiva-sfml:x64-windows=fail shogun:arm64-windows = skip @@ -1128,6 +1153,7 @@ vulkan:arm64-windows=fail vulkan:arm-uwp=fail vulkan:x64-linux=fail vulkan:x64-osx=fail +vulkan:arm64-osx=fail vulkan:x64-uwp=fail vulkan:x64-windows=fail vulkan:x64-windows-static=fail From 69296c17dfc95babe9785d436942c5ab8125cbfb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 15 Aug 2022 20:50:40 +0200 Subject: [PATCH 398/791] [geos] fix clang-cl builds (#26338) * [geos] fix clang-cl builds * v db --- ports/geos/fix_clang-cl.patch | 97 +++++++++++++++++++++++++++++++++++ ports/geos/portfile.cmake | 1 + ports/geos/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/geos.json | 5 ++ 5 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 ports/geos/fix_clang-cl.patch diff --git a/ports/geos/fix_clang-cl.patch b/ports/geos/fix_clang-cl.patch new file mode 100644 index 00000000000000..550f464cffb79b --- /dev/null +++ b/ports/geos/fix_clang-cl.patch @@ -0,0 +1,97 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 074986f38..bb092ed13 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,12 +184,16 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98207 + #----------------------------------------------------------------------------- + ++if(MSVC) ++target_compile_options(geos_cxx_flags INTERFACE ++ /fp:precise /wd4996 ++ ) ++else() + target_compile_options(geos_cxx_flags INTERFACE + "$<$,$>:-ffp-contract=off>" + "$<$:-ffp-contract=off>" +- $<$:/fp:precise /wd4996> + ) +- ++endif() + # Use -ffloat-store for 32-bit builds (needed to make some tests pass) + target_compile_options(geos_cxx_flags INTERFACE + $<$,$>:-ffloat-store> +@@ -225,13 +229,14 @@ target_compile_definitions(geos_cxx_flags + INTERFACE + USE_UNSTABLE_GEOS_CPP_API) + ++if(MSVC) + target_compile_definitions(geos_developer_cxx_flags + INTERFACE +- $<$:_CRT_NONSTDC_NO_DEPRECATE> +- $<$:_SCL_SECURE_NO_DEPRECATE> +- $<$:_CRT_SECURE_NO_WARNINGS> +- $<$:NOMINMAX>) +- ++ _CRT_NONSTDC_NO_DEPRECATE ++ _SCL_SECURE_NO_DEPRECATE ++ _CRT_SECURE_NO_WARNINGS ++ NOMINMAX) ++endif() + target_compile_options(geos_developer_cxx_flags + INTERFACE + $<$:-W4> +@@ -268,9 +273,10 @@ add_subdirectory(src) + option(VERSION_MINGW_SHARED_LIBS "Add version suffix to MinGW shared libraries" OFF) + + if(BUILD_SHARED_LIBS) +- target_compile_definitions(geos +- PRIVATE $,GEOS_DLL_EXPORT,DLL_EXPORT>) +- ++ if(MSVC) ++ target_compile_definitions(geos ++ PRIVATE GEOS_DLL_EXPORT DLL_EXPORT) ++ endif() + set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION_NOPATCH}) + set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH}) + if(MINGW AND VERSION_MINGW_SHARED_LIBS) +@@ -286,8 +292,10 @@ add_library(GEOS::geos_c ALIAS geos_c) + target_link_libraries(geos_c PRIVATE geos) + + if(BUILD_SHARED_LIBS) ++ if(MSVC) + target_compile_definitions(geos_c +- PRIVATE $,GEOS_DLL_EXPORT,DLL_EXPORT>) ++ PRIVATE GEOS_DLL_EXPORT DLL_EXPORT) ++ endif() + + set_target_properties(geos_c PROPERTIES VERSION ${CAPI_VERSION}) + if(NOT WIN32 OR MINGW) +diff --git a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h +index 7a647e461..73da77942 100644 +--- a/include/geos/algorithm/locate/IndexedPointInAreaLocator.h ++++ b/include/geos/algorithm/locate/IndexedPointInAreaLocator.h +@@ -119,7 +119,7 @@ public: + * @param p the point to test + * @return the location of the point in the geometry + */ +- geom::Location locate(const geom::Coordinate* /*const*/ p) override; ++ GEOS_DLL geom::Location locate(const geom::Coordinate* /*const*/ p) override; + + }; + +diff --git a/include/geos/export.h b/include/geos/export.h +index 1a26f8c7a..ba89e0f82 100644 +--- a/include/geos/export.h ++++ b/include/geos/export.h +@@ -19,9 +19,9 @@ + # if defined(GEOS_DLL_EXPORT) + # define GEOS_DLL __declspec(dllexport) + # elif defined(GEOS_DLL_IMPORT) +-# define GEOS_DLL __declspec(dllimport) ++# define GEOS_DLL extern __declspec(dllimport) + # else + # define GEOS_DLL + # endif + #else + # define GEOS_DLL diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 9a27eaa1498665..18b5ff23ea26a3 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_extract_source_archive_ex( PATCHES disable-warning-4996.patch fix-exported-config.patch + fix_clang-cl.patch ) vcpkg_list(SET EXTRA_OPTIONS) diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index f5978b301fc1e9..664133a3a7bb0f 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,6 +1,7 @@ { "name": "geos", "version": "3.11.0", + "port-version": 1, "description": "Geometry Engine Open Source", "homepage": "https://libgeos.org/", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 55a69c202f8f13..65501d919d8062 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2514,7 +2514,7 @@ }, "geos": { "baseline": "3.11.0", - "port-version": 0 + "port-version": 1 }, "geotrans": { "baseline": "3.8", diff --git a/versions/g-/geos.json b/versions/g-/geos.json index 879038adfa20e5..af658bf0898559 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bf5a546e53664298e8d1f843600013cd0d94ae5", + "version": "3.11.0", + "port-version": 1 + }, { "git-tree": "65d05922979febad3d20696832347333c24f1c16", "version": "3.11.0", From 69e4d02ce490741a0007375c26aefd6655c53baf Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 15 Aug 2022 11:57:44 -0700 Subject: [PATCH 399/791] [tesseract] update to 5.2.0 (#26114) * [tesseract] update to 5.2.0 * x-add-version * fix windows build error * version * fix opencv4 build error * version * conflict * version * fix opencv build error on uwp * version * fix linux build error * version * fix * version * version --- ports/opencv4/0018-fix-depend-tesseract.patch | 13 ++++++++ ports/opencv4/portfile.cmake | 7 +++++ ports/opencv4/vcpkg.json | 1 + ports/tesseract/fix-depend-libarchive.patch | 14 +++++++++ ports/tesseract/fix-tiff-linkage.patch | 13 -------- ports/tesseract/fix-timeval.patch | 14 --------- ports/tesseract/portfile.cmake | 30 ++++++++++++------- ports/tesseract/vcpkg.json | 4 +-- versions/baseline.json | 6 ++-- versions/o-/opencv4.json | 5 ++++ versions/t-/tesseract.json | 5 ++++ 11 files changed, 69 insertions(+), 43 deletions(-) create mode 100644 ports/opencv4/0018-fix-depend-tesseract.patch create mode 100644 ports/tesseract/fix-depend-libarchive.patch delete mode 100644 ports/tesseract/fix-tiff-linkage.patch delete mode 100644 ports/tesseract/fix-timeval.patch diff --git a/ports/opencv4/0018-fix-depend-tesseract.patch b/ports/opencv4/0018-fix-depend-tesseract.patch new file mode 100644 index 00000000000000..3f873bc59a64be --- /dev/null +++ b/ports/opencv4/0018-fix-depend-tesseract.patch @@ -0,0 +1,13 @@ +diff --git a/modules/text/cmake/init.cmake b/modules/text/cmake/init.cmake +index 254757e..73194ec 100644 +--- a/modules/text/cmake/init.cmake ++++ b/modules/text/cmake/init.cmake +@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO + if(NOT HAVE_TESSERACT + AND (WITH_TESSERACT OR OPENCV_FIND_TESSERACT) + ) ++ find_package(Tesseract CONFIG REQUIRED) ++ set(Tesseract_LIBRARIES Tesseract::libtesseract) + if(NOT Tesseract_FOUND) + find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR) + endif() diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 310f1aecd2cc45..67c440c4b2f59b 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -177,6 +177,7 @@ if("contrib" IN_LIST FEATURES) 0013-fix-ceres.patch 0014-fix-ogre.patch 0016-fix-freetype-contrib.patch + 0018-fix-depend-tesseract.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -352,6 +353,12 @@ if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") endif() +if("contrib" IN_LIST FEATURES) + if(VCPKG_TARGET_IS_UWP) + list(APPEND ADDITIONAL_BUILD_FLAGS "-DWITH_TESSERACT=OFF") + endif() +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index c40b7e4a57229a..d42295f1ebd071 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv4", "version": "4.6.0", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/tesseract/fix-depend-libarchive.patch b/ports/tesseract/fix-depend-libarchive.patch new file mode 100644 index 00000000000000..1b57247126c06c --- /dev/null +++ b/ports/tesseract/fix-depend-libarchive.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bd2649d..f932913 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -792,7 +792,8 @@ if(OpenCL_FOUND) + target_link_libraries(libtesseract PUBLIC OpenCL::OpenCL) + endif() + if(LibArchive_FOUND) +- target_link_libraries(libtesseract PUBLIC ${LibArchive_LIBRARIES}) ++ find_package(LibArchive REQUIRED) ++ target_link_libraries(libtesseract PRIVATE LibArchive::LibArchive) + endif(LibArchive_FOUND) + if(CURL_FOUND) + if(NOT CURL_LIBRARIES) diff --git a/ports/tesseract/fix-tiff-linkage.patch b/ports/tesseract/fix-tiff-linkage.patch deleted file mode 100644 index f4720c02270dbf..00000000000000 --- a/ports/tesseract/fix-tiff-linkage.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f154663..c07b827 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,7 +431,7 @@ endif() - add_executable (tesseract ${tesseractmain_src} ${tesseractmain_rsc}) - target_link_libraries (tesseract libtesseract) - if (HAVE_TIFFIO_H) -- target_link_libraries(tesseract tiff) -+ target_link_libraries(tesseract TIFF::TIFF) - endif() - - if (OPENMP_BUILD AND UNIX) diff --git a/ports/tesseract/fix-timeval.patch b/ports/tesseract/fix-timeval.patch deleted file mode 100644 index 5a3274830d1fa7..00000000000000 --- a/ports/tesseract/fix-timeval.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd..3755632 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,9 @@ - - #include - #include -+#ifndef _WIN32 -+#include -+#endif - #ifdef _WIN32 - #include // for timeval - #endif diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 6978f5625d0797..3764e47ef0233a 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -1,11 +1,13 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(tesseract_patch fix-depend-libarchive.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tesseract-ocr/tesseract - REF 4.1.1 - SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2 - PATCHES - fix-tiff-linkage.patch - fix-timeval.patch # Remove this patch in the next update + REF 5ad5325a0aa8effc47ca033625b6a51682f82767 #v5.2.0 + SHA512 c6ed442c9deb28772aeb918142dab08d5b55eeeeccb0c1d3f13cf51bb72af227afb7f14c19a5c8db40d6a7b8cfeccb3af08a78adfcd7431e4a06f65372709ceb + PATCHES ${tesseract_patch} ) # The built-in cmake FindICU is better @@ -30,29 +32,34 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DSTATIC=${BUILD_STATIC} -DUSE_SYSTEM_ICU=True - -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibArchive=OFF -DCMAKE_DISABLE_FIND_PACKAGE_OpenCL=ON -DLeptonica_DIR=YES -DTARGET_ARCHITECTURE=${TARGET_ARCHITECTURE} + -DSW_BUILD=OFF + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_OpenCL + STATIC + TARGET_ARCHITECTURE ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tesseract) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake" - "find_package(Leptonica REQUIRED)" + "find_dependency(Leptonica)" [[ -find_package(Leptonica REQUIRED) -find_package(LibArchive REQUIRED) +find_dependency(Leptonica) +find_dependency(LibArchive) ]] ) vcpkg_copy_tools(TOOL_NAMES tesseract AUTO_CLEAN) if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tesseract.pc" "-ltesseract41" "-ltesseract41d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/tesseract.pc" "-ltesseract52" "-ltesseract52d") endif() vcpkg_fixup_pkgconfig() @@ -68,6 +75,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index fae6a4f4c8ccd8..f62bc6cb20820f 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,9 +1,9 @@ { "name": "tesseract", - "version": "4.1.1", - "port-version": 11, + "version": "5.2.0", "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", + "license": "Apache-2.0", "supports": "!(arm & (osx | linux))", "dependencies": [ "leptonica", diff --git a/versions/baseline.json b/versions/baseline.json index 65501d919d8062..fa4ad6e78848a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5206,7 +5206,7 @@ }, "opencv4": { "baseline": "4.6.0", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.1", @@ -7045,8 +7045,8 @@ "port-version": 0 }, "tesseract": { - "baseline": "4.1.1", - "port-version": 11 + "baseline": "5.2.0", + "port-version": 0 }, "tfhe": { "baseline": "1.0.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index ee86692054df6a..a96d1fe034f440 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6c9bded8fc4ad22bea6869caecf2881c8da2d41", + "version": "4.6.0", + "port-version": 1 + }, { "git-tree": "1ff543272c91a32d242ad5320e9ca63b29b34ed2", "version": "4.6.0", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index e6cb1bf9899c80..1d7f6743abefcd 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ea8fcd243e8aa38e1a83eaa1c745fc53a3464cc", + "version": "5.2.0", + "port-version": 0 + }, { "git-tree": "24c99e73eaf335a9abedcfd42163c4968ca07ec3", "version": "4.1.1", From 5f83f03a1c7578e6ae04987916b34e018fb63964 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Mon, 15 Aug 2022 14:35:06 -0500 Subject: [PATCH 400/791] [szip] add definitions for the try_run call for iOS (#26329) --- ports/szip/portfile.cmake | 12 ++++++++++++ ports/szip/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/szip.json | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/szip/portfile.cmake b/ports/szip/portfile.cmake index 1f5a9fb2f6d45e..1072e9881280df 100644 --- a/ports/szip/portfile.cmake +++ b/ports/szip/portfile.cmake @@ -14,11 +14,23 @@ vcpkg_extract_source_archive_ex( mingw-lib-names.patch ) +if (VCPKG_TARGET_IS_IOS) + # when cross-compiling, try_run will not work. + # LFS "large file support" is keyed on + # 1) 64-bit off_t (https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/64bitPorting/transition/transition.html table 2-1) + # 2) stat works properly, which is true + set(extra_opts + -DTEST_LFS_WORKS_RUN=TRUE + -DTEST_LFS_WORKS_RUN__TRYRUN_OUTPUT="" + ) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSZIP_INSTALL_DATA_DIR=share/szip/data -DSZIP_INSTALL_CMAKE_DIR=share/szip + ${extra_opts} ) vcpkg_cmake_install() diff --git a/ports/szip/vcpkg.json b/ports/szip/vcpkg.json index a0e93f315505fd..3144709c2722a3 100644 --- a/ports/szip/vcpkg.json +++ b/ports/szip/vcpkg.json @@ -1,7 +1,7 @@ { "name": "szip", "version": "2.1.1", - "port-version": 8, + "port-version": 9, "description": "Szip compression software, providing lossless compression of scientific data", "homepage": "https://support.hdfgroup.org/ftp/lib-external/szip", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index fa4ad6e78848a5..116ed08db507b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6974,7 +6974,7 @@ }, "szip": { "baseline": "2.1.1", - "port-version": 8 + "port-version": 9 }, "tabulate": { "baseline": "2019-01-06", diff --git a/versions/s-/szip.json b/versions/s-/szip.json index de4087f88f0509..3cd779910ccc06 100644 --- a/versions/s-/szip.json +++ b/versions/s-/szip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f07c4350652c50e80bc78edb3db20a1c748d99ec", + "version": "2.1.1", + "port-version": 9 + }, { "git-tree": "0c8569ffc46401d06cff22755c0b95953ce5e828", "version": "2.1.1", From acc3bcf76b84ae5041c86ab55fe138ae7b8255c7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 15 Aug 2022 19:24:49 -0700 Subject: [PATCH 401/791] [luajit] Fix build failure that resulted in no output. (#26360) --- ports/luajit/002-fix-crt-linkage.patch | 44 -------------- ... 004-fix-build-path-and-crt-linkage.patch} | 58 +++++++++++++------ ports/luajit/portfile.cmake | 23 ++++++-- ports/luajit/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/luajit.json | 5 ++ 6 files changed, 63 insertions(+), 70 deletions(-) delete mode 100644 ports/luajit/002-fix-crt-linkage.patch rename ports/luajit/{001-fix-build-path.patch => 004-fix-build-path-and-crt-linkage.patch} (73%) diff --git a/ports/luajit/002-fix-crt-linkage.patch b/ports/luajit/002-fix-crt-linkage.patch deleted file mode 100644 index 6981b698a96455..00000000000000 --- a/ports/luajit/002-fix-crt-linkage.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index ff9df57..912bdc9 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -74,22 +74,25 @@ buildvm -m vmdef -o %SOURCEDIR%\jit\vmdef.lua %ALL_LIB% - buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c - @if errorlevel 1 goto :BAD - -+@if "%2"=="static" set CRT_LINKAGE=/MT -+@if "%2"=="dynamic" set CRT_LINKAGE=/MD - @set LJLINK=%LJLINK% /debug --@if "%2" neq "debug" goto :NODEBUG -+@if "%3" neq "debug" goto :NODEBUG - @shift - @set BUILDTYPE=debug - @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% -+@set CRT_LINKAGE=%CRT_LINKAGE%d - :NODEBUG - @set LJLINK=%LJLINK% /%BUILDTYPE% --@if "%2"=="amalg" goto :AMALGDLL --@if "%2"=="static" goto :STATIC --%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb -+@if "%3"=="amalg" goto :AMALGDLL -+@if "%3"=="static" goto :STATIC -+%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD - @goto :MTDLL - :STATIC --%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb -+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb - @if errorlevel 1 goto :BAD - %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj - @if errorlevel 1 goto :BAD -@@ -103,7 +106,7 @@ buildvm -m folddef -o %SOURCEDIR%\lj_folddef.h %SOURCEDIR%\lj_opt_fold.c - if exist %LJDLLNAME%.manifest^ - %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 - --%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb -+%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c /Fdluajit.pdb - @if errorlevel 1 goto :BAD - %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% - @if errorlevel 1 goto :BAD diff --git a/ports/luajit/001-fix-build-path.patch b/ports/luajit/004-fix-build-path-and-crt-linkage.patch similarity index 73% rename from ports/luajit/001-fix-build-path.patch rename to ports/luajit/004-fix-build-path-and-crt-linkage.patch index db76d4d0046e5f..5d3aaeaaeb4e3b 100644 --- a/ports/luajit/001-fix-build-path.patch +++ b/ports/luajit/004-fix-build-path-and-crt-linkage.patch @@ -1,8 +1,8 @@ -diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat -index aab4ef1..ff9df57 100644 ---- a/src/msvcbuild.bat -+++ b/src/msvcbuild.bat -@@ -15,19 +15,20 @@ +diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat +index d323d8d..6e61150 100644 +--- a/src/msvcbuild.bat ++++ b/src/msvcbuild.bat +@@ -15,19 +15,20 @@ @setlocal @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_APICHECK @set DEBUGCFLAGS= @@ -15,20 +15,37 @@ index aab4ef1..ff9df57 100644 -@set DASMDIR=..\dynasm +@set DASMDIR=%SOURCEDIR%\..\dynasm @set DASM=%DASMDIR%\dynasm.lua - @set DASC=vm_x64.dasc +-@set DASC=vm_x64.dasc ++@set DASC=%SOURCEDIR%\vm_x64.dasc @set LJDLLNAME=lua51.dll @set LJLIBNAME=lua51.lib @set BUILDTYPE=release -@set ALL_LIB=lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c lib_buffer.c -+@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c ++@set ALL_LIB=%SOURCEDIR%\lib_base.c %SOURCEDIR%\lib_math.c %SOURCEDIR%\lib_bit.c %SOURCEDIR%\lib_string.c %SOURCEDIR%\lib_table.c %SOURCEDIR%\lib_io.c %SOURCEDIR%\lib_os.c %SOURCEDIR%\lib_package.c %SOURCEDIR%\lib_debug.c %SOURCEDIR%\lib_jit.c %SOURCEDIR%\lib_ffi.c %SOURCEDIR%\lib_buffer.c -%LJCOMPILE% host\minilua.c +%LJCOMPILE% %SOURCEDIR%\host\minilua.c /Fdminilua.pdb @if errorlevel 1 goto :BAD %LJLINK% /out:minilua.exe minilua.obj @if errorlevel 1 goto :BAD -@@ -51,7 +52,7 @@ if exist minilua.exe.manifest^ - minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% +@@ -38,20 +39,20 @@ if exist minilua.exe.manifest^ + @set LJARCH=x64 + @minilua + @if errorlevel 8 goto :X64 +-@set DASC=vm_x86.dasc ++@set DASC=%SOURCEDIR%\vm_x86.dasc + @set DASMFLAGS=-D WIN -D JIT -D FFI + @set LJARCH=x86 + @set LJCOMPILE=%LJCOMPILE% /arch:SSE2 + :X64 + @if "%1" neq "nogc64" goto :GC64 + @shift +-@set DASC=vm_x86.dasc ++@set DASC=%SOURCEDIR%\vm_x86.dasc + @set LJCOMPILE=%LJCOMPILE% /DLUAJIT_DISABLE_GC64 + :GC64 +-minilua %DASM% -LN %DASMFLAGS% -o host\buildvm_arch.h %DASC% ++minilua %DASM% -LN %DASMFLAGS% -o %SOURCEDIR%\host\buildvm_arch.h %DASC% @if errorlevel 1 goto :BAD -%LJCOMPILE% /I "." /I %DASMDIR% host\buildvm*.c @@ -36,7 +53,7 @@ index aab4ef1..ff9df57 100644 @if errorlevel 1 goto :BAD %LJLINK% /out:buildvm.exe buildvm*.obj @if errorlevel 1 goto :BAD -@@ -60,41 +61,41 @@ if exist buildvm.exe.manifest^ +@@ -60,41 +61,44 @@ if exist buildvm.exe.manifest^ buildvm -m peobj -o lj_vm.obj @if errorlevel 1 goto :BAD @@ -60,27 +77,30 @@ index aab4ef1..ff9df57 100644 @if errorlevel 1 goto :BAD -@if "%1" neq "debug" goto :NODEBUG ++@if "%2"=="static" set CRT_LINKAGE=/MT ++@if "%2"=="dynamic" set CRT_LINKAGE=/MD +@set LJLINK=%LJLINK% /debug -+@if "%2" neq "debug" goto :NODEBUG ++@if "%3" neq "debug" goto :NODEBUG @shift @set BUILDTYPE=debug @set LJCOMPILE=%LJCOMPILE% /Zi %DEBUGCFLAGS% -@set LJLINK=%LJLINK% /opt:ref /opt:icf /incremental:no ++@set CRT_LINKAGE=%CRT_LINKAGE%d :NODEBUG @set LJLINK=%LJLINK% /%BUILDTYPE% -@if "%1"=="amalg" goto :AMALGDLL -@if "%1"=="static" goto :STATIC -%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL lj_*.c lib_*.c -+@if "%2"=="amalg" goto :AMALGDLL -+@if "%2"=="static" goto :STATIC -+%LJCOMPILE% /MD /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb ++@if "%3"=="amalg" goto :AMALGDLL ++@if "%3"=="static" goto :STATIC ++%LJCOMPILE% %CRT_LINKAGE% /DLUA_BUILD_AS_DLL %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb @if errorlevel 1 goto :BAD %LJLINK% /DLL /out:%LJDLLNAME% lj_*.obj lib_*.obj @if errorlevel 1 goto :BAD @goto :MTDLL :STATIC -%LJCOMPILE% lj_*.c lib_*.c -+%LJCOMPILE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb ++%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\lj_*.c %SOURCEDIR%\lib_*.c /Fdlua51.pdb @if errorlevel 1 goto :BAD %LJLIB% /OUT:%LJLIBNAME% lj_*.obj lib_*.obj @if errorlevel 1 goto :BAD @@ -91,16 +111,16 @@ index aab4ef1..ff9df57 100644 @if errorlevel 1 goto :BAD %LJLINK% /DLL /out:%LJDLLNAME% ljamalg.obj lj_vm.obj @if errorlevel 1 goto :BAD -@@ -102,7 +103,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c +@@ -102,7 +106,7 @@ buildvm -m folddef -o lj_folddef.h lj_opt_fold.c if exist %LJDLLNAME%.manifest^ %LJMT% -manifest %LJDLLNAME%.manifest -outputresource:%LJDLLNAME%;2 -%LJCOMPILE% luajit.c -+%LJCOMPILE% %SOURCEDIR%\luajit.c /Fdluajit.pdb ++%LJCOMPILE% %CRT_LINKAGE% %SOURCEDIR%\luajit.c /Fdluajit.pdb @if errorlevel 1 goto :BAD %LJLINK% /out:luajit.exe luajit.obj %LJLIBNAME% @if errorlevel 1 goto :BAD -@@ -110,8 +111,8 @@ if exist luajit.exe.manifest^ +@@ -110,8 +114,8 @@ if exist luajit.exe.manifest^ %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe @del *.obj *.manifest minilua.exe buildvm.exe @@ -111,7 +131,7 @@ index aab4ef1..ff9df57 100644 @echo. @echo === Successfully built LuaJIT for Windows/%LJARCH% === -@@ -124,4 +125,5 @@ if exist luajit.exe.manifest^ +@@ -124,4 +128,5 @@ if exist luajit.exe.manifest^ @goto :END :FAIL @echo You must open a "Visual Studio Command Prompt" to run this script diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index 707e3d431fce13..c38e18a0d3767e 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -5,9 +5,8 @@ vcpkg_from_github( SHA512 0a1d79ab7d2de6894bcff33309e015fdba0ea67cf0425d75b9301a30006039e81b527178dbb3485e1adea177ffe062e6fcef74307f8e725678e70562d57d1a5b HEAD_REF master PATCHES - 001-fix-build-path.patch - 002-fix-crt-linkage.patch 003-do-not-set-macosx-deployment-target.patch + 004-fix-build-path-and-crt-linkage.patch ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -29,9 +28,17 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) LOGNAME build-${TARGET_TRIPLET}-dbg ) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/minilua.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/minilua.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + # Note that luajit's build system responds to failure by producing no output; in particular a likely outcome is + # only 'minilua.exe' being produced. This reuslted in: + # https://github.com/microsoft/vcpkg/pull/25856#issuecomment-1214285736 + # Please ensure luajit.exe is actually produced when making future changes. + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/bin/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") + endif() vcpkg_copy_pdbs() else() vcpkg_execute_build_process( @@ -64,9 +71,13 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) LOGNAME build-${TARGET_TRIPLET}-rel ) - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/minilua.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/minilua.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools) + endif() vcpkg_copy_pdbs() else() vcpkg_execute_build_process( diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index 242d42d1863313..a1090cf0fcb2b7 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,6 +1,7 @@ { "name": "luajit", "version-date": "2022-08-11", + "port-version": 1, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 116ed08db507b1..da61913a3651ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4398,7 +4398,7 @@ }, "luajit": { "baseline": "2022-08-11", - "port-version": 0 + "port-version": 1 }, "luasec": { "baseline": "1.1.0", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index c85757b0df537c..7eeb517a5f3275 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bacc33ec723d7fc2b895a1351a2042c5c6fb6971", + "version-date": "2022-08-11", + "port-version": 1 + }, { "git-tree": "4c2d21d9bf0e5cedc0f7540a7e473c2e86f2c5ef", "version-date": "2022-08-11", From 1941bf87236c4b63bf89800239dec18aa14657a7 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 16 Aug 2022 23:59:55 +0800 Subject: [PATCH 402/791] update to 2.7.0 (#26350) --- ports/libmt32emu/portfile.cmake | 4 ++-- ports/libmt32emu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmt32emu.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libmt32emu/portfile.cmake b/ports/libmt32emu/portfile.cmake index 9eea719a55cb4f..a7fc0a2c6289e6 100644 --- a/ports/libmt32emu/portfile.cmake +++ b/ports/libmt32emu/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO munt/munt - REF 004800c20b1edaab921e08f69133fc2a4bd3b8e8 #vlibmt32emu_2_6_2 - SHA512 3a47c269d285f3930eefda4cae6f1c7e157fc4e88d7d64ad029542586b6592b32d5f9bf0e22344e27a21869aea2191051505f3727e52dff268cf2be4d52f15c3 + REF 08aba2f0018f4e7c2af855c268a97b8b84f8dc06 #vlibmt32emu_2_7_0 + SHA512 ef277767c6c18b1aa341b2e2cdac04c27bc19ef0aa2f1e0a4125c92128f64d5938eab53cf1d6bf2f9abaa5a59d14873e91e1518878165af48ac6b93c3e208aa5 HEAD_REF master ) diff --git a/ports/libmt32emu/vcpkg.json b/ports/libmt32emu/vcpkg.json index 115c3206e2b7e1..45be996b263caa 100644 --- a/ports/libmt32emu/vcpkg.json +++ b/ports/libmt32emu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmt32emu", - "version": "2.6.2", + "version": "2.7.0", "description": "A MT-32 emulator", "homepage": "https://github.com/munt/munt/tree/master/mt32emu", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index da61913a3651ea..0c968a86d03983 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3877,7 +3877,7 @@ "port-version": 4 }, "libmt32emu": { - "baseline": "2.6.2", + "baseline": "2.7.0", "port-version": 0 }, "libmupdf": { diff --git a/versions/l-/libmt32emu.json b/versions/l-/libmt32emu.json index 76e96543d70af6..b202270b31de18 100644 --- a/versions/l-/libmt32emu.json +++ b/versions/l-/libmt32emu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf84211f16b9b598e1ebd2cee0be2487d2e49fca", + "version": "2.7.0", + "port-version": 0 + }, { "git-tree": "de283dae22ced9be75cf6356a02732fec8b4eb11", "version": "2.6.2", From d742b0b4897fe73e1879b7f06f82e4ca8dfd5c75 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Tue, 16 Aug 2022 17:13:14 +0100 Subject: [PATCH 403/791] [dpp] update from 10.0.15 to 10.0.16 (#26356) * vcpkg dpp port built from our CI * fix missing dependency * update * Update Sun Jul 24 11:26:12 UTC 2022 * exclude uwp for dpp * Update Sun Jul 24 13:21:45 UTC 2022 * fix supports * fix supports * Update Sun Jul 24 14:14:29 UTC 2022 * Update Sun Jul 24 15:36:39 UTC 2022 * Update Mon Jul 25 12:04:56 UTC 2022 * * Add https:// to the homepage so that it is a valid URI. * Added usage. * Forced pkgconfig to be required rather than quiet. * Changed tabs to spaces in portfile.cmake. * Update Mon Aug 15 12:38:09 UTC 2022 * Update Mon Aug 15 13:08:33 UTC 2022 * Put back missing patches * Update portfile.cmake * fix breakage of wrapping * Update Mon Aug 15 13:59:12 UTC 2022 * fix up version file * fix newlines where they dont belong * update version * updtae version * update version Co-authored-by: Billy O'Neal Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/dpp/portfile.cmake | 5 +++-- ports/dpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index bd3a05e933de5c..dc50440d2209cd 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP - REF d9eb0083c7d4f3bb188ac4fde12f3af9a4443696 - SHA512 5b6514a1152d566bba8959f2e51284142d57eec086e634a2b33a08186ee5cb5800a6244d92b9c8e367b60a542ed75b4401f4d68b510f16226633b958aa4aeefa + REF 6e0e324dad8bf00b497d9340c0aa675b3e62f530 + SHA512 835f99e4bd092c7b60b299bf5de65ed6d10cc23743bdfa8c0ac93a66a224c7af1a0c30aedbac6b128d3db38bc5bfb8e12b314392ab3bf9ccc84a85c2a3fc12c1 HEAD_REF master PATCHES make-pkgconfig-required.patch @@ -30,3 +30,4 @@ file( ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 5531c18dca4aef..3dd8e81dcdd30d 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.15", + "version": "10.0.16", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0c968a86d03983..47b5b690861d05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1973,7 +1973,7 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.15", + "baseline": "10.0.16", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index d9393630faee01..f5bb89a9fe81fc 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf6a0accfbdf7a2a5f639ed5c32247e2a81b7b48", + "version": "10.0.16", + "port-version": 0 + }, { "git-tree": "fe4fafd238e318a6ddf7d5c4db59da499328fdae", "version": "10.0.15", From bd4fb64b3b95d69319a5cb2ac8c7c3ed410000c2 Mon Sep 17 00:00:00 2001 From: cnbatch Date: Wed, 17 Aug 2022 00:13:51 +0800 Subject: [PATCH 404/791] [asio] upgrade to version 1.24.0 (#26358) * [asio] upgrade to version 1.24.0 * [asio] upgrade to version 1.24.0 --- ports/asio/portfile.cmake | 4 ++-- ports/asio/vcpkg.json | 4 ++-- versions/a-/asio.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index 55f855620a0cc0..ee176cca72c9f2 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF 4915cfd8a1653c157a1480162ae5601318553eb8 #vasio-1-23-0 - SHA512 4fb30b82d51726b621fe80a17dac0ce23d4d48c813d3d45b394aac4e6de68008f142da848d6d6f2a69f70147dfb52b7bac4f45b15385ac227d94fd2e15f9e4b3 + REF asio-1-24-0 + SHA512 a5d6e597e5611b7293375965f37c09cb73e27639ebdda6163557fab8bbff2ddbb301080ad86ff7f97e8ed8454da25176385cfc43103447a4a04e35a9c41aec3e HEAD_REF master ) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index cf1381ec44ef4f..b3608e5a06853d 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "asio", - "version": "1.23.0", + "version": "1.24.0", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", - "documentation": "https://think-async.com/Asio/asio-1.22.1/doc/", + "documentation": "https://think-async.com/Asio/asio-1.24.0/doc/", "license": "BSL-1.0", "dependencies": [ { diff --git a/versions/a-/asio.json b/versions/a-/asio.json index dff326db0926a3..3376212f660961 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bba8740d419878e427c71f076d569f8a26833c6b", + "version": "1.24.0", + "port-version": 0 + }, { "git-tree": "029bab0230676c0a38979db2b89076983401e553", "version": "1.23.0", diff --git a/versions/baseline.json b/versions/baseline.json index 47b5b690861d05..c09c1592bd1c7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -185,7 +185,7 @@ "port-version": 0 }, "asio": { - "baseline": "1.23.0", + "baseline": "1.24.0", "port-version": 0 }, "asio-grpc": { From c175d8efa7de016dc7a8a22b5c76d201db3ef2d5 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 16 Aug 2022 09:14:22 -0700 Subject: [PATCH 405/791] [docs] Update triplets.md for VS2022 (#26365) --- docs/users/triplets.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 39ecdde5151977..1b42bd7505dad6 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -161,7 +161,7 @@ To select the precise combination of Visual Studio instance and toolset version, 1. Determine the setting for `VCPKG_VISUAL_STUDIO_PATH` from the triplet, or the environment variable `VCPKG_VISUAL_STUDIO_PATH`, or consider it unset 2. Determine the setting for `VCPKG_PLATFORM_TOOLSET` from the triplet or consider it unset 3. Gather a list of all pairs of Visual Studio Instances with all toolsets available in those instances - 1. This is ordered first by instance type (Stable, Prerelease, Legacy) and then by toolset version (v142, v141, v140) + 1. This is ordered first by instance type (Stable, Prerelease, Legacy) and then by toolset version (v143, v142, v141, v140) 4. Filter the list based on the settings for `VCPKG_VISUAL_STUDIO_PATH` and `VCPKG_PLATFORM_TOOLSET`. 5. Select the best remaining option @@ -176,6 +176,7 @@ Specifies the VS-based C/C++ compiler toolchain to use. See [`VCPKG_VISUAL_STUDIO_PATH`](#VCPKG_VISUAL_STUDIO_PATH) for the full selection algorithm. Valid settings: +* The Visual Studio 2022 platform toolset is `v143`. * The Visual Studio 2019 platform toolset is `v142`. * The Visual Studio 2017 platform toolset is `v141`. * The Visual Studio 2015 platform toolset is `v140`. From 84ba8a5a5ca7db2029d4cd11d1f9959ed6ddbb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 16 Aug 2022 16:21:49 +0000 Subject: [PATCH 406/791] [libsquish] Fix usage (#26367) * [libsquish] Fix usage * version --- ports/libsquish/export-target.patch | 13 +++++++++++-- ports/libsquish/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsquish.json | 5 +++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ports/libsquish/export-target.patch b/ports/libsquish/export-target.patch index 78f5f30f584504..92df9e6ad7dd9a 100644 --- a/ports/libsquish/export-target.patch +++ b/ports/libsquish/export-target.patch @@ -1,8 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3ecdde..94c7b3d 100644 +index a3ecdde..6aa9e64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -120,8 +120,14 @@ INCLUDE(GNUInstallDirs) +@@ -75,6 +75,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + + ADD_LIBRARY(squish ${SQUISH_SRCS} ${SQUISH_HDRS}) + ++TARGET_INCLUDE_DIRECTORIES(squish PUBLIC $) ++ + INCLUDE(GenerateExportHeader) + GENERATE_EXPORT_HEADER(squish + EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/squish_export.h +@@ -120,8 +122,14 @@ INCLUDE(GNUInstallDirs) INSTALL( TARGETS squish diff --git a/ports/libsquish/vcpkg.json b/ports/libsquish/vcpkg.json index 0ae034fa6ce98d..14752f0d7f10d7 100644 --- a/ports/libsquish/vcpkg.json +++ b/ports/libsquish/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsquish", "version": "1.15", - "port-version": 11, + "port-version": 12, "description": "Open source DXT compression library.", "homepage": "https://sourceforge.net/projects/libsquish", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c09c1592bd1c7b..abc0f9d922cade 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4114,7 +4114,7 @@ }, "libsquish": { "baseline": "1.15", - "port-version": 11 + "port-version": 12 }, "libsrt": { "baseline": "1.5.0", diff --git a/versions/l-/libsquish.json b/versions/l-/libsquish.json index dd90ef4f34ce14..0c4945447d9588 100644 --- a/versions/l-/libsquish.json +++ b/versions/l-/libsquish.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a7a36071f8261b00c8720cbf8024df31c15650f", + "version": "1.15", + "port-version": 12 + }, { "git-tree": "3c259e069413fc51d82423f6c9842ad285e210e9", "version": "1.15", From a9a23172a7768a05e5d5763e5dee8658eae1bdf9 Mon Sep 17 00:00:00 2001 From: Evgeny Karpov Date: Tue, 16 Aug 2022 18:33:28 +0200 Subject: [PATCH 407/791] [gmp] arm64 windows build support (#26300) * * support gmp:arm64-windows by disabling assembly optimization * * update version * * marks some nettle port builds as expected to fail * Remove x64-osx skip. Co-authored-by: Billy O'Neal --- ports/gmp/portfile.cmake | 4 ++++ ports/gmp/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 2 +- versions/g-/gmp.json | 5 +++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 2138744fcb40a4..92c38bf7d0af25 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -43,6 +43,10 @@ if(VCPKG_CROSSCOMPILING) set(ENV{CPP_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") endif() +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^(arm|arm64)$") + list(APPEND OPTIONS --enable-assembly=no) +endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 12a6e0d4332c43..e238d06fe98ade 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,10 +1,9 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 10, + "port-version": 11, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", - "supports": "!(windows & (arm | arm64))", "dependencies": [ { "name": "gmp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d07d67957565e7..92a5ac1c7a859c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -707,6 +707,8 @@ nanodbc:x64-uwp=fail nanodbc:x64-linux=skip nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail +nettle:arm-uwp=fail +nettle:arm64-windows=fail ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index abc0f9d922cade..86bf09db6613b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2634,7 +2634,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 10 + "port-version": 11 }, "gmsh": { "baseline": "4.9.0", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 2a4b1a1f2f0c7c..340b3d7eae4d05 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "678326aeaf5a7fed7d24a2184cb0d483336cac74", + "version": "6.2.1", + "port-version": 11 + }, { "git-tree": "f4748213535c3fd004de44f6b1f15d123927cce6", "version": "6.2.1", From cd5e7946ad051b7379739fe075df6e500c296432 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Tue, 16 Aug 2022 22:23:12 +0200 Subject: [PATCH 408/791] [arrow] Update Arrow to 9.0.0 (#26187) * update patches * fix parquet * format * add xsimd dep * update version * cuda fix * update version --- ports/arrow/cuda-ptr.patch | 61 +++++++++ ports/arrow/fix-ThirdPartyToolchain.patch | 147 ++++------------------ ports/arrow/portfile.cmake | 8 +- ports/arrow/static-link-libs.patch | 119 +++++++++++++++++- ports/arrow/vcpkg.json | 4 +- ports/arrow/vs-2022-fixes.patch | 42 ------- versions/a-/arrow.json | 5 + versions/baseline.json | 4 +- 8 files changed, 216 insertions(+), 174 deletions(-) create mode 100644 ports/arrow/cuda-ptr.patch delete mode 100644 ports/arrow/vs-2022-fixes.patch diff --git a/ports/arrow/cuda-ptr.patch b/ports/arrow/cuda-ptr.patch new file mode 100644 index 00000000000000..928c0d2abe835a --- /dev/null +++ b/ports/arrow/cuda-ptr.patch @@ -0,0 +1,61 @@ +diff --git a/cpp/src/arrow/gpu/cuda_context.h b/cpp/src/arrow/gpu/cuda_context.h +index 00bcf94c8..0115ed19a 100644 +--- a/cpp/src/arrow/gpu/cuda_context.h ++++ b/cpp/src/arrow/gpu/cuda_context.h +@@ -76,7 +76,7 @@ class ARROW_EXPORT CudaDeviceManager { + static std::unique_ptr instance_; + + class Impl; +- std::unique_ptr impl_; ++ std::shared_ptr impl_; + + friend class CudaContext; + friend class CudaDevice; +@@ -146,7 +146,7 @@ class ARROW_EXPORT CudaDevice : public Device { + /// \endcond + + explicit CudaDevice(Impl); +- std::unique_ptr impl_; ++ std::shared_ptr impl_; + }; + + /// \brief Return whether a device instance is a CudaDevice +@@ -297,7 +297,7 @@ class ARROW_EXPORT CudaContext : public std::enable_shared_from_this impl_; ++ std::shared_ptr impl_; + + friend class CudaBuffer; + friend class CudaBufferReader; +diff --git a/cpp/src/arrow/gpu/cuda_internal.h b/cpp/src/arrow/gpu/cuda_internal.h +index 25eb6e06c..d70873634 100644 +--- a/cpp/src/arrow/gpu/cuda_internal.h ++++ b/cpp/src/arrow/gpu/cuda_internal.h +@@ -33,6 +33,7 @@ namespace internal { + + std::string CudaErrorDescription(CUresult err); + ++ARROW_EXPORT + Status StatusFromCuda(CUresult res, const char* function_name = nullptr); + + #define CU_RETURN_NOT_OK(FUNC_NAME, STMT) \ +diff --git a/cpp/src/arrow/gpu/cuda_memory.h b/cpp/src/arrow/gpu/cuda_memory.h +index 4efd38894..18c23a507 100644 +--- a/cpp/src/arrow/gpu/cuda_memory.h ++++ b/cpp/src/arrow/gpu/cuda_memory.h +@@ -250,10 +250,12 @@ Result> AllocateCudaHostBuffer(int device_number + const int64_t size); + + /// Low-level: get a device address through which the CPU data be accessed. ++ARROW_EXPORT + Result GetDeviceAddress(const uint8_t* cpu_data, + const std::shared_ptr& ctx); + + /// Low-level: get a CPU address through which the device data be accessed. ++ARROW_EXPORT + Result GetHostAddress(uintptr_t device_ptr); + + } // namespace cuda + \ No newline at end of file diff --git a/ports/arrow/fix-ThirdPartyToolchain.patch b/ports/arrow/fix-ThirdPartyToolchain.patch index 2b84dbe17e473c..7cb1db7e640ed3 100644 --- a/ports/arrow/fix-ThirdPartyToolchain.patch +++ b/ports/arrow/fix-ThirdPartyToolchain.patch @@ -1,8 +1,8 @@ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 7d9c5c7..33afd70 100644 +index bca86d4c1..52f87aa97 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt -@@ -705,7 +705,7 @@ endif() +@@ -737,7 +737,7 @@ endif() if(ARROW_WITH_BROTLI) # Order is important for static linking @@ -11,19 +11,7 @@ index 7d9c5c7..33afd70 100644 list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) if(Brotli_SOURCE STREQUAL "SYSTEM") -@@ -721,9 +721,9 @@ if(ARROW_WITH_BZ2) - endif() - - if(ARROW_WITH_LZ4) -- list(APPEND ARROW_STATIC_LINK_LIBS LZ4::lz4) -+ list(APPEND ARROW_STATIC_LINK_LIBS lz4::lz4) - if(Lz4_SOURCE STREQUAL "SYSTEM") -- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS LZ4::lz4) -+ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS lz4::lz4) - endif() - endif() - -@@ -793,10 +793,10 @@ if(ARROW_WITH_OPENTELEMETRY) +@@ -825,10 +825,10 @@ if(ARROW_WITH_OPENTELEMETRY) endif() if(ARROW_WITH_UTF8PROC) @@ -38,7 +26,7 @@ index 7d9c5c7..33afd70 100644 endif() diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index f070323..290b5a7 100644 +index 5d1da18b7..9c5adf47d 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES @@ -50,35 +38,24 @@ index f070323..290b5a7 100644 BZip2 c-ares gflags -@@ -62,7 +62,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - gRPC - GTest - LLVM -- Lz4 -+ lz4 - nlohmann_json - opentelemetry-cpp - ORC -@@ -72,7 +72,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES - Snappy +@@ -74,7 +74,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES Substrait Thrift + ucx - utf8proc + unofficial-utf8proc xsimd ZLIB zstd) -@@ -139,6 +139,9 @@ foreach(DEPENDENCY ${ARROW_THIRDPARTY_DEPENDENCIES}) +@@ -152,6 +152,7 @@ foreach(DEPENDENCY ${ARROW_THIRDPARTY_DEPENDENCIES}) endforeach() macro(build_dependency DEPENDENCY_NAME) -+ if(NOT "${DEPENDENCY_NAME}" STREQUAL "xsimd") -+ message(FATAL_ERROR "dependencies should never be built in vcpkg") -+ endif() ++ message(FATAL_ERROR "dependencies should never be built in vcpkg") if("${DEPENDENCY_NAME}" STREQUAL "AWSSDK") build_awssdk() elseif("${DEPENDENCY_NAME}" STREQUAL "benchmark") -@@ -222,7 +225,7 @@ macro(resolve_dependency DEPENDENCY_NAME) +@@ -239,7 +240,7 @@ macro(resolve_dependency DEPENDENCY_NAME) endif() if(ARG_HAVE_ALT) @@ -87,9 +64,11 @@ index f070323..290b5a7 100644 else() set(PACKAGE_NAME ${DEPENDENCY_NAME}) endif() -@@ -1061,7 +1064,21 @@ endmacro() - if(ARROW_WITH_SNAPPY) - resolve_dependency(Snappy PC_PACKAGE_NAMES snappy) +@@ -1138,8 +1139,23 @@ if(ARROW_WITH_SNAPPY) + TRUE + PC_PACKAGE_NAMES + snappy) ++ set(Snappy_TARGET "Snappy::snappy") if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND) + get_target_property(SNAPPY_IMPLIB_DEBUG Snappy::snappy IMPORTED_IMPLIB_DEBUG) + get_target_property(SNAPPY_LIB_DEBUG Snappy::snappy IMPORTED_LOCATION_DEBUG) @@ -104,115 +83,39 @@ index f070323..290b5a7 100644 + elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE" AND SNAPPY_LIB_RELEASE) + set(SNAPPY_LIB "${SNAPPY_LIB_RELEASE}") + else() - get_target_property(SNAPPY_LIB Snappy::snappy IMPORTED_LOCATION) + get_target_property(SNAPPY_TYPE ${Snappy_TARGET} TYPE) + endif() - string(APPEND ARROW_PC_LIBS_PRIVATE " ${SNAPPY_LIB}") - endif() - # TODO: Don't use global includes but rather target_include_directories -@@ -1129,10 +1132,14 @@ macro(build_brotli) + if(NOT SNAPPY_TYPE STREQUAL "INTERFACE_LIBRARY") + get_target_property(SNAPPY_LIB ${Snappy_TARGET} + IMPORTED_LOCATION_${UPPERCASE_BUILD_TYPE}) +@@ -1214,7 +1230,8 @@ macro(build_brotli) endmacro() if(ARROW_WITH_BROTLI) - resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) + set(Brotli_SOURCE SYSTEM) + resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) - # TODO: Don't use global includes but rather target_include_directories -- get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon -+ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon - INTERFACE_INCLUDE_DIRECTORIES) -+ if(NOT BROTLI_INCLUDE_DIR) -+ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static INTERFACE_INCLUDE_DIRECTORIES) -+ endif() - include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) endif() -@@ -1434,6 +1446,13 @@ if(ARROW_WITH_THRIFT) - # TODO: Don't use global includes but rather target_include_directories - include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) - -+ if(THRIFT_INCLUDE_DIR) -+ file(READ "${THRIFT_INCLUDE_DIR}/config.h" THRIFT_CONFIG_H_CONTENT) -+ string(REGEX MATCH "#define PACKAGE_VERSION \"[0-9.]+\"" THRIFT_VERSION_DEFINITION "${THRIFT_CONFIG_H_CONTENT}") -+ string(REGEX MATCH "[0-9.]+" THRIFT_VERSION "${THRIFT_VERSION_DEFINITION}") -+ set(THRIFT_VERSION "${THRIFT_VERSION}") -+ endif() -+ - string(REPLACE "." ";" VERSION_LIST ${THRIFT_VERSION}) - list(GET VERSION_LIST 0 THRIFT_VERSION_MAJOR) - list(GET VERSION_LIST 1 THRIFT_VERSION_MINOR) -@@ -1561,6 +1580,8 @@ if(ARROW_WITH_PROTOBUF) + if(PARQUET_REQUIRE_ENCRYPTION AND NOT ARROW_PARQUET) +@@ -1646,7 +1663,8 @@ if(ARROW_WITH_PROTOBUF) ${ARROW_PROTOBUF_REQUIRED_VERSION} PC_PACKAGE_NAMES protobuf) +- + get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf + INTERFACE_INCLUDE_DIRECTORIES) - if(NOT Protobuf_USE_STATIC_LIBS AND MSVC_TOOLCHAIN) add_definitions(-DPROTOBUF_USE_DLLS) -@@ -2260,10 +2276,11 @@ macro(build_lz4) - endmacro() - - if(ARROW_WITH_LZ4) -- resolve_dependency(Lz4 PC_PACKAGE_NAMES liblz4) -+ set(Lz4_SOURCE SYSTEM) -+ resolve_dependency(lz4 USE_CONFIG TRUE PC_PACKAGE_NAMES liblz4) - - # TODO: Don't use global includes but rather target_include_directories -- get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) -+ get_target_property(LZ4_INCLUDE_DIR lz4::lz4 INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) - endif() - -@@ -2517,9 +2534,8 @@ macro(build_utf8proc) + endif() +@@ -2599,9 +2617,7 @@ macro(build_utf8proc) endmacro() if(ARROW_WITH_UTF8PROC) - resolve_dependency(utf8proc - REQUIRED_VERSION - "2.2.0" -+ set(utf8proc_SOURCE SYSTEM) + resolve_dependency(unofficial-utf8proc PC_PACKAGE_NAMES libutf8proc) - -@@ -2527,7 +2543,7 @@ if(ARROW_WITH_UTF8PROC) - - # TODO: Don't use global definitions but rather - # target_compile_definitions or target_link_libraries -- get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc::utf8proc -+ get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc - INTERFACE_COMPILER_DEFINITIONS) - if(UTF8PROC_COMPILER_DEFINITIONS) - add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) -@@ -2535,7 +2551,7 @@ if(ARROW_WITH_UTF8PROC) - - # TODO: Don't use global includes but rather - # target_include_directories or target_link_libraries -- get_target_property(UTF8PROC_INCLUDE_DIR utf8proc::utf8proc -+ get_target_property(UTF8PROC_INCLUDE_DIR utf8proc - INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) - endif() -@@ -3719,6 +3735,9 @@ if(ARROW_WITH_GRPC) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) -+ if (ABSL_USE_CXX17) -+ set(CMAKE_CXX_STANDARD 17) -+ endif() - - if(GRPC_VENDORED) - set(GRPCPP_PP_INCLUDE TRUE) -diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt -index b1b6847..444a45e 100644 ---- a/cpp/src/arrow/adapters/orc/CMakeLists.txt -+++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt -@@ -30,7 +30,7 @@ set(ORC_MIN_TEST_LIBS - GTest::gtest_main - GTest::gtest - Snappy::snappy -- LZ4::lz4 -+ lz4::lz4 - ZLIB::ZLIB) - - if(ARROW_BUILD_STATIC) + add_definitions(-DARROW_WITH_UTF8PROC) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index b0439310759c3a..59a4864e2231fc 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-8.0.1 - SHA512 b32f5a3666de7d6d16ea828697bb42e1b6605f58719c42e670c9ec0a8782057dac933f6e14e97b46f82802fc38cc7f4cc825794a4a95ac641593c2ee26ac5bbe + REF apache-arrow-9.0.0 + SHA512 1191793dd56471fb2b402afbe9b31cde4c5126785243e538e42ba95ccd31d523121f07b144461c99a4b7449e611aa5998bd0de95e8e4b0e3c80397499fe746f0 HEAD_REF master PATCHES - vs-2022-fixes.patch + cuda-ptr.patch msvc-static-name.patch fix-ThirdPartyToolchain.patch - static-link-libs.patch # https://github.com/apache/arrow/pull/13707 + static-link-libs.patch # https://github.com/apache/arrow/pull/13707 & pull/13863 ) file(REMOVE "${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake" "${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake" diff --git a/ports/arrow/static-link-libs.patch b/ports/arrow/static-link-libs.patch index 1dd7fe7b77dbdf..ed0ecafab9d05a 100644 --- a/ports/arrow/static-link-libs.patch +++ b/ports/arrow/static-link-libs.patch @@ -1,8 +1,8 @@ diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt -index 690c51a..2f7d26b 100644 +index 93dd1297b..6b04f7d46 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt -@@ -570,6 +570,7 @@ add_arrow_lib(arrow +@@ -581,6 +581,7 @@ add_arrow_lib(arrow ${ARROW_SHARED_PRIVATE_LINK_LIBS} STATIC_LINK_LIBS ${ARROW_STATIC_LINK_LIBS} @@ -10,3 +10,118 @@ index 690c51a..2f7d26b 100644 ${ARROW_STATIC_INSTALL_INTERFACE_LIBS} SHARED_INSTALL_INTERFACE_LIBS ${ARROW_SHARED_INSTALL_INTERFACE_LIBS}) + +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index 9e732db80afb..f0c3f30ef3d8 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -822,6 +822,17 @@ if(ARROW_WITH_OPENTELEMETRY) + opentelemetry-cpp::trace + opentelemetry-cpp::ostream_span_exporter + opentelemetry-cpp::otlp_http_exporter) ++ if(opentelemetry_SOURCE STREQUAL "SYSTEM") ++ list(APPEND ++ ARROW_STATIC_INSTALL_INTERFACE_LIBS ++ opentelemetry-cpp::trace ++ opentelemetry-cpp::ostream_span_exporter ++ opentelemetry-cpp::otlp_http_exporter) ++ endif() ++ if(Protobuf_SOURCE STREQUAL "SYSTEM") ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS ${ARROW_PROTOBUF_LIBPROTOBUF}) ++ endif() ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS CURL::libcurl) + endif() + + if(ARROW_WITH_UTF8PROC) +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +index ad8351f9cc6e..5c1dd9d34d12 100644 +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake +@@ -1083,6 +1083,7 @@ endif() + macro(find_curl) + if(NOT TARGET CURL::libcurl) + find_package(CURL REQUIRED) ++ list(APPEND ARROW_SYSTEM_DEPENDENCIES CURL) + if(NOT TARGET CURL::libcurl) + # For CMake 3.11 or older + add_library(CURL::libcurl UNKNOWN IMPORTED) +@@ -4540,11 +4541,11 @@ macro(build_opentelemetry) + + foreach(_OPENTELEMETRY_LIB ${_OPENTELEMETRY_LIBS}) + add_dependencies(opentelemetry-cpp::${_OPENTELEMETRY_LIB} opentelemetry_ep) ++ list(APPEND ARROW_BUNDLED_STATIC_LIBS opentelemetry-cpp::${_OPENTELEMETRY_LIB}) + endforeach() + + # Work around https://gitlab.kitware.com/cmake/cmake/issues/15052 + file(MAKE_DIRECTORY ${OPENTELEMETRY_INCLUDE_DIR}) +- + endmacro() + + if(ARROW_WITH_OPENTELEMETRY) +diff --git a/cpp/examples/parquet/parquet_arrow/CMakeLists.txt b/cpp/examples/parquet/parquet_arrow/CMakeLists.txt +index 32f980060c95..c89751731575 100644 +--- a/cpp/examples/parquet/parquet_arrow/CMakeLists.txt ++++ b/cpp/examples/parquet/parquet_arrow/CMakeLists.txt +@@ -24,7 +24,7 @@ include(ExternalProject) + include(FindPkgConfig) + include(GNUInstallDirs) + +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") ++option(PARQUET_LINK_SHARED "Link to the Parquet shared library" ON) + + # This ensures that things like gnu++11 get passed correctly + if(NOT DEFINED CMAKE_CXX_STANDARD) +@@ -39,4 +39,8 @@ find_package(Arrow REQUIRED) + find_package(Parquet REQUIRED) + + add_executable(parquet-arrow-example reader_writer.cc) +-target_link_libraries(parquet-arrow-example parquet_shared arrow_shared) ++if(PARQUET_LINK_SHARED) ++ target_link_libraries(parquet-arrow-example parquet_shared) ++else() ++ target_link_libraries(parquet-arrow-example parquet_static) ++endif() +diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt +index 542fa5bc083b..caed26173428 100644 +--- a/cpp/src/parquet/CMakeLists.txt ++++ b/cpp/src/parquet/CMakeLists.txt +@@ -106,9 +106,11 @@ endfunction() + + if(ARROW_BUILD_STATIC) + set(PARQUET_STATIC_LINK_LIBS arrow_static ${ARROW_STATIC_LINK_LIBS}) ++ set(PARQUET_STATIC_INTERFACE_INSTALL_LIBS arrow_static) + set(ARROW_LIBRARIES_FOR_STATIC_TESTS arrow_testing_static arrow_static + ${ARROW_STATIC_LINK_LIBS}) + else() ++ set(PARQUET_STATIC_INTERFACE_INSTALL_LIBS) + set(ARROW_LIBRARIES_FOR_STATIC_TESTS arrow_testing_shared arrow_shared) + endif() + +@@ -218,8 +220,9 @@ if(NOT PARQUET_MINIMAL_DEPENDENCY) + + # Link publicly with parquet_static (because internal users need to + # transitively link all dependencies) +- set(PARQUET_STATIC_LINK_LIBS ${PARQUET_STATIC_LINK_LIBS} thrift::thrift) +-endif(NOT PARQUET_MINIMAL_DEPENDENCY) ++ list(APPEND PARQUET_STATIC_LINK_LIBS thrift::thrift) ++ list(APPEND PARQUET_STATIC_INTERFACE_INSTALL_LIBS thrift::thrift) ++endif() + + if(CXX_LINKER_SUPPORTS_VERSION_SCRIPT) + set(PARQUET_SHARED_LINK_FLAGS +@@ -243,8 +246,12 @@ add_arrow_lib(parquet + ${PARQUET_SHARED_LINK_LIBS} + SHARED_PRIVATE_LINK_LIBS + ${PARQUET_SHARED_PRIVATE_LINK_LIBS} ++ SHARED_INSTALL_INTERFACE_LIBS ++ arrow_shared + STATIC_LINK_LIBS +- ${PARQUET_STATIC_LINK_LIBS}) ++ ${PARQUET_STATIC_LINK_LIBS} ++ STATIC_INSTALL_INTERFACE_LIBS ++ ${PARQUET_STATIC_INTERFACE_INSTALL_LIBS}) + + if(WIN32 AND NOT (ARROW_TEST_LINKAGE STREQUAL "static")) + add_library(parquet_test_support STATIC + + \ No newline at end of file diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 6cdd7c5e4ed1a9..87f34fab6620cf 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "arrow", - "version": "8.0.1", - "port-version": 1, + "version": "9.0.0", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "license": "Apache-2.0", @@ -27,6 +26,7 @@ "name": "vcpkg-cmake-config", "host": true }, + "xsimd", "zlib", "zstd" ], diff --git a/ports/arrow/vs-2022-fixes.patch b/ports/arrow/vs-2022-fixes.patch deleted file mode 100644 index 964706331d1f17..00000000000000 --- a/ports/arrow/vs-2022-fixes.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/cpp/src/arrow/compute/light_array_test.cc b/cpp/src/arrow/compute/light_array_test.cc -index 3f6d47803..dcc7841a0 100644 ---- a/cpp/src/arrow/compute/light_array_test.cc -+++ b/cpp/src/arrow/compute/light_array_test.cc -@@ -18,6 +18,7 @@ - #include "arrow/compute/light_array.h" - - #include -+#include - - #include "arrow/compute/exec/test_util.h" - #include "arrow/testing/generator.h" -diff --git a/cpp/src/arrow/util/tracing.cc b/cpp/src/arrow/util/tracing.cc -index b8bddcd50..126c69781 100644 ---- a/cpp/src/arrow/util/tracing.cc -+++ b/cpp/src/arrow/util/tracing.cc -@@ -38,6 +38,7 @@ Span::Impl& Span::Set(Impl&& impl) { - #endif - - // Default destructor when impl type is complete. -+Span::Span() = default; - Span::~Span() = default; - - } // namespace tracing -diff --git a/cpp/src/arrow/util/tracing.h b/cpp/src/arrow/util/tracing.h -index 15f7fca1e..1d9d08b33 100644 ---- a/cpp/src/arrow/util/tracing.h -+++ b/cpp/src/arrow/util/tracing.h -@@ -35,11 +35,11 @@ class SpanImpl; - namespace util { - namespace tracing { - --class ARROW_EXPORT Span { -+class Span { - public: - using Impl = arrow::internal::tracing::SpanImpl; - -- Span() = default; // Default constructor. The inner_impl is a nullptr. -+ Span(); // Default constructor. The inner_impl is a nullptr. - ~Span(); // Destructor. Default destructor defined in tracing.cc where impl is a - // complete type. - diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index a8ea48212f258b..9c9f29ed990951 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "757fb3dc2404c152b9628f324087a761070406c4", + "version": "9.0.0", + "port-version": 0 + }, { "git-tree": "d53797d201548a07be19eaf7d12d87198c458636", "version": "8.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 86bf09db6613b0..7f8512d1bdc7a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -177,8 +177,8 @@ "port-version": 0 }, "arrow": { - "baseline": "8.0.1", - "port-version": 1 + "baseline": "9.0.0", + "port-version": 0 }, "ashes": { "baseline": "2022-06-08", From 23cc58477e200bb54c293ad76f3ce438dbabc86c Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 16 Aug 2022 15:51:42 -0700 Subject: [PATCH 409/791] [docs] Rewrite docs for vcpkg_cmake_build and vcpkg_cmake_install (#25477) * [docs] Rewrite docs for vcpkg_cmake_build and vcpkg_cmake_install * [docs] Fix broken links * [docs] Add notes about parent helper port --- docs/examples/packaging-github-repos.md | 2 +- docs/maintainers/maintainer-guide.md | 4 +- docs/maintainers/portfile-functions.md | 10 ++- docs/maintainers/ports/vcpkg-cmake.md | 4 +- .../ports/vcpkg-cmake/vcpkg_cmake_build.md | 38 ----------- .../ports/vcpkg-cmake/vcpkg_cmake_install.md | 25 ------- docs/maintainers/vcpkg_build_cmake.md | 2 +- docs/maintainers/vcpkg_cmake_build.md | 68 +++++++++++++++++++ docs/maintainers/vcpkg_cmake_configure.md | 8 ++- docs/maintainers/vcpkg_cmake_install.md | 53 +++++++++++++++ docs/maintainers/vcpkg_install_cmake.md | 2 +- docs/users/config-environment.md | 3 +- 12 files changed, 139 insertions(+), 80 deletions(-) delete mode 100644 docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md delete mode 100644 docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md create mode 100644 docs/maintainers/vcpkg_cmake_build.md create mode 100644 docs/maintainers/vcpkg_cmake_install.md diff --git a/docs/examples/packaging-github-repos.md b/docs/examples/packaging-github-repos.md index f85a4b1fdb0d25..769f75455fe821 100644 --- a/docs/examples/packaging-github-repos.md +++ b/docs/examples/packaging-github-repos.md @@ -37,7 +37,7 @@ vcpkg_cmake_install() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libogg" RENAME copyright) ``` -Check the documentation for [`vcpkg_cmake_configure`](../maintainers/vcpkg_cmake_configure.md) and [`vcpkg_cmake_install`](../maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md) if your package needs additional options. +Check the documentation for [`vcpkg_cmake_configure`](../maintainers/vcpkg_cmake_configure.md) and [`vcpkg_cmake_install`](../maintainers/vcpkg_cmake_install.md) if your package needs additional options. Now you can run `vcpkg install libogg` to build and install the package. diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 5aed050e24e6e9..d02da50546b5a1 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -48,8 +48,8 @@ At this time, the following helpers are deprecated: - `vcpkg_build_msbuild()` should be replaced by [`vcpkg_install_msbuild()`](vcpkg_install_msbuild.md) - `vcpkg_copy_tool_dependencies()` should be replaced by [`vcpkg_copy_tools()`](vcpkg_copy_tools.md) - `vcpkg_configure_cmake` should be replaced by [`vcpkg_cmake_configure()`](vcpkg_cmake_configure.md) after removing `PREFER_NINJA` (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) -- `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](ports/vcpkg-cmake/vcpkg_cmake_build.md#vcpkg_cmake_build) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) -- `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](ports/vcpkg-cmake/vcpkg_cmake_install.md#vcpkg_cmake_install) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) +- `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](vcpkg_cmake_build.md) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) +- `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](vcpkg_cmake_install.md) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md)) - `vcpkg_fixup_cmake_targets` should be replaced by [`vcpkg_cmake_config_fixup`](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md#vcpkg_cmake_config_fixup) (from port [`vcpkg-cmake-config`](ports/vcpkg-cmake-config.md#vcpkg-cmake-config)) Some of the replacement helper functions are in "tools ports" to allow consumers to pin their diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index ec6fb536c98a45..60beddb7904839 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -1,12 +1,10 @@ - - # Portfile helper functions - [execute\_process](execute_process.md) - [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md) - [vcpkg\_add\_to\_path](vcpkg_add_to_path.md) - [vcpkg\_apply\_patches](vcpkg_apply_patches.md) (deprecated) - [vcpkg\_backup\_restore\_env\_vars](vcpkg_backup_restore_env_vars.md) -- [vcpkg\_build\_cmake](vcpkg_build_cmake.md) (deprecated, use [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md)) +- [vcpkg\_build\_cmake](vcpkg_build_cmake.md) (deprecated, use [vcpkg\_cmake\_build](vcpkg_cmake_build.md)) - [vcpkg\_build\_make](vcpkg_build_make.md) - [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md) - [vcpkg\_build\_ninja](vcpkg_build_ninja.md) @@ -46,7 +44,7 @@ - [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md) - [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md) - [vcpkg\_host\_path\_list](vcpkg_host_path_list.md) -- [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md)) +- [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](vcpkg_cmake_install.md)) - [vcpkg\_install\_gn](vcpkg_install_gn.md) (deprecated, use [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md)) - [vcpkg\_install\_copyright](vcpkg_install_copyright.md) - [vcpkg\_install\_make](vcpkg_install_make.md) @@ -71,9 +69,9 @@ ### [vcpkg-cmake](ports/vcpkg-cmake.md) -- [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md) +- [vcpkg\_cmake\_build](vcpkg_cmake_build.md) - [vcpkg\_cmake\_configure](vcpkg_cmake_configure.md) -- [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md) +- [vcpkg\_cmake\_install](vcpkg_cmake_install.md) ### [vcpkg-gn](ports/vcpkg-gn.md) diff --git a/docs/maintainers/ports/vcpkg-cmake.md b/docs/maintainers/ports/vcpkg-cmake.md index 7566ee0299c4ed..52f6c1fcd41038 100644 --- a/docs/maintainers/ports/vcpkg-cmake.md +++ b/docs/maintainers/ports/vcpkg-cmake.md @@ -3,5 +3,5 @@ This port contains portfile helper functions for dealing with a CMake buildsystem. - [`vcpkg_cmake_configure()`](../vcpkg_cmake_configure.md) -- [`vcpkg_cmake_install()`](vcpkg-cmake/vcpkg_cmake_install.md) -- [`vcpkg_cmake_build()`](vcpkg-cmake/vcpkg_cmake_build.md) +- [`vcpkg_cmake_install()`](../vcpkg_cmake_install.md) +- [`vcpkg_cmake_build()`](../vcpkg_cmake_build.md) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md deleted file mode 100644 index b8f9c3b8ab0515..00000000000000 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md +++ /dev/null @@ -1,38 +0,0 @@ -# vcpkg_cmake_build - -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_build.md). - -Build a cmake project. - -```cmake -vcpkg_cmake_build( - [TARGET ] - [LOGFILE_BASE ] - [DISABLE_PARALLEL] - [ADD_BIN_TO_PATH] -) -``` - -`vcpkg_cmake_build` builds an already-configured cmake project. -You can use the alias [`vcpkg_cmake_install()`] function -if your CMake build system supports the `install` TARGET, -and this is something we recommend doing whenever possible. -Otherwise, you can use `TARGET` to set the target to build. -This function defaults to not passing a target to cmake. - -[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md - -`LOGFILE_BASE` is used to set the base of the logfile names; -by default, this is `build`, and thus the logfiles end up being something like -`build-x86-windows-dbg.log`; if you use `vcpkg_cmake_install`, -this is set to `install`, so you'll get log names like `install-x86-windows-dbg.log`. - -For build systems that are buggy when run in parallel, -using `DISABLE_PARALLEL` will run the build with only one job. - -Finally, `ADD_BIN_TO_PATH` adds the appropriate (either release or debug) -`bin/` directories to the path during the build, -such that executables run during the build will be able to access those DLLs. - -## Source -[ports/vcpkg-cmake/vcpkg\_cmake\_build.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_build.cmake) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md deleted file mode 100644 index 1d708d3a1300d5..00000000000000 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md +++ /dev/null @@ -1,25 +0,0 @@ -# vcpkg_cmake_install - -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_install.md). - -Build and install a cmake project. - -```cmake -vcpkg_cmake_install( - [DISABLE_PARALLEL] - [ADD_BIN_TO_PATH] -) -``` - -`vcpkg_cmake_install` transparently forwards to [`vcpkg_cmake_build()`], -with additional parameters to set the `TARGET` to `install`, -and to set the `LOGFILE_ROOT` to `install` as well. - -[`vcpkg_cmake_build()`]: vcpkg_cmake_build.md - -## Examples: - -* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake) - -## Source -[ports/vcpkg-cmake/vcpkg\_cmake\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_install.cmake) diff --git a/docs/maintainers/vcpkg_build_cmake.md b/docs/maintainers/vcpkg_build_cmake.md index 485a8c9184017b..4163c6cc86236c 100644 --- a/docs/maintainers/vcpkg_build_cmake.md +++ b/docs/maintainers/vcpkg_build_cmake.md @@ -1,6 +1,6 @@ # vcpkg_build_cmake -**This function has been deprecated in favor of [`vcpkg_cmake_build`](ports/vcpkg-cmake/vcpkg_cmake_build.md) from the vcpkg-cmake port.** +**This function has been deprecated in favor of [`vcpkg_cmake_build`](vcpkg_cmake_build.md) from the vcpkg-cmake port.** The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_build_cmake.md). diff --git a/docs/maintainers/vcpkg_cmake_build.md b/docs/maintainers/vcpkg_cmake_build.md new file mode 100644 index 00000000000000..047290ec160e7e --- /dev/null +++ b/docs/maintainers/vcpkg_cmake_build.md @@ -0,0 +1,68 @@ +# vcpkg_cmake_build + +**The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_cmake_build.md).** + +Build a cmake project with a custom install target. + +Conventionally, CMake uses the target `install` to build and copy binaries into the [`CMAKE_INSTALL_PREFIX`](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html). In rare circumstances, a project might have more specific targets that should be used instead. + +Ports should prefer calling [`vcpkg_cmake_install()`](vcpkg_cmake_install.md) when possible. + +## Usage + +```cmake +vcpkg_cmake_build( + [TARGET ] + [LOGFILE_BASE ] + [DISABLE_PARALLEL] + [ADD_BIN_TO_PATH] +) +``` + +To use this function, you must depend on the helper port [`vcpkg-cmake`](ports/vcpkg-cmake.md): +```no-highlight +"dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } +] +``` + +## Parameters + +All supported parameters to [`vcpkg_cmake_install()`] are supported by `vcpkg_cmake_build()`. See [`vcpkg_cmake_install()`] for additional parameter documentation. + +[`vcpkg_cmake_install()`]: vcpkg_cmake_install.md#parameters + +### TARGET +The CMake target to build. + +If this parameter is not passed, no target will be passed to the build. + +### LOGFILE_BASE +An alternate root name for the logs. + +Defaults to `build-${TARGET_TRIPLET}`. It should not contain any path separators. Logs will be generated matching the pattern `${CURRENT_BUILDTREES_DIR}/${LOGFILE_BASE}-.log` + +## Examples + +```cmake +vcpkg_from_github(OUT_SOURCE_PATH source_path ...) +vcpkg_cmake_configure( + SOURCE_PATH "${source_path}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) +vcpkg_cmake_build(TARGET my.install.target) +``` + +[Search microsoft/vcpkg for Examples](https://github.com/microsoft/vcpkg/search?q=vcpkg_cmake_build+path%3A%2Fports) + +## Remarks + +This command replaces [`vcpkg_build_cmake()`](vcpkg_build_cmake.md). + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_build.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_build.cmake) diff --git a/docs/maintainers/vcpkg_cmake_configure.md b/docs/maintainers/vcpkg_cmake_configure.md index 4ad2ad178e20f6..c3ef188b610e8c 100644 --- a/docs/maintainers/vcpkg_cmake_configure.md +++ b/docs/maintainers/vcpkg_cmake_configure.md @@ -1,11 +1,9 @@ # vcpkg_cmake_configure -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_cmake_configure.md). +**The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_cmake_configure.md).** Configure a CMake-based project. -This command replaces [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). - ## Usage ```cmake @@ -128,6 +126,10 @@ vcpkg_cmake_install() [Search microsoft/vcpkg for Examples](https://github.com/microsoft/vcpkg/search?q=vcpkg_cmake_configure+path%3A%2Fports) +## Remarks + +This command replaces [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). + ## Source [ports/vcpkg-cmake/vcpkg\_cmake\_configure.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake) diff --git a/docs/maintainers/vcpkg_cmake_install.md b/docs/maintainers/vcpkg_cmake_install.md new file mode 100644 index 00000000000000..5845fecc3f5df8 --- /dev/null +++ b/docs/maintainers/vcpkg_cmake_install.md @@ -0,0 +1,53 @@ +# vcpkg_cmake_install + +**The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_cmake_install.md).** + +Build and install a cmake project. + +## Usage + +```cmake +vcpkg_cmake_install( + [DISABLE_PARALLEL] + [ADD_BIN_TO_PATH] +) +``` + +To use this function, you must depend on the helper port [`vcpkg-cmake`](ports/vcpkg-cmake.md): +```no-highlight +"dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } +] +``` + +## Parameters + +### DISABLE_PARALLEL +Disables running the build in parallel. + +By default builds are run with up to [VCPKG_MAX_CONCURRENCY](../users/config-environment.md#VCPKG_MAX_CONCURRENCY) jobs. This option limits the build to a single job and should be used only if the underlying build is unable to run correctly with concurrency. + +### ADD_BIN_TO_PATH +Adds the configuration-specific `bin/` directory to the `PATH` during the build. + +When building for a Windows dynamic triplet, newly built executables may not be immediately executable because their dependency DLLs may not be findable from the build environment. This flag instructs vcpkg to add any additional paths needed to locate those dependency DLLs to the `PATH` environment variable. This is required if the project needs to execute newly built binaries as part of the build (such as to generate code). + +## Examples: + +```cmake +vcpkg_from_github(OUT_SOURCE_PATH source_path ...) +vcpkg_cmake_configure(SOURCE_PATH "${source_path}") +vcpkg_cmake_install() +``` + +[Search microsoft/vcpkg for Examples](https://github.com/microsoft/vcpkg/search?q=vcpkg_cmake_install+path%3A%2Fports) + +## Remarks + +This command replaces [`vcpkg_install_cmake()`](vcpkg_install_cmake.md). + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_install.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_install.cmake) diff --git a/docs/maintainers/vcpkg_install_cmake.md b/docs/maintainers/vcpkg_install_cmake.md index f8d3b6107b9bfb..e7388783d3ef1a 100644 --- a/docs/maintainers/vcpkg_install_cmake.md +++ b/docs/maintainers/vcpkg_install_cmake.md @@ -1,6 +1,6 @@ # vcpkg_install_cmake -**This function has been deprecated in favor of [`vcpkg_cmake_install`](ports/vcpkg-cmake/vcpkg_cmake_install.md) from the vcpkg-cmake port.** +**This function has been deprecated in favor of [`vcpkg_cmake_install`](vcpkg_cmake_install.md) from the vcpkg-cmake port.** The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_cmake.md). diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 6cf44aa0953cea..cb0d40b9a17bbb 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -73,9 +73,10 @@ pass in environment variables that should cause rebuilds on change, see [`VCPKG_ Example: `FOO_SDK_DIR;BAR_SDK_DIR` + #### VCPKG_MAX_CONCURRENCY -This environment variables limits the amount of concurrency requested by underlying buildsystems. If unspecified, this defaults to logical cores + 1. +This environment variables limits the amount of concurrency used by underlying buildsystems. If unspecified, this defaults to logical cores + 1. #### VCPKG_DEFAULT_BINARY_CACHE From b14fb7282ff17434af5ea679933cb3347bf4918f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 18 Aug 2022 00:28:34 +0800 Subject: [PATCH 410/791] [raylib] update to 4.2.0 (#26393) * [raylib] update to 4.2.0 * update version * Update portfile.cmake * update version --- ports/raylib/portfile.cmake | 5 ++--- ports/raylib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/raylib.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index 96a0298d42d527..4b7eed0678adbb 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -17,8 +17,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib - REF 4.0.0 - SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417 + REF bf2ad9df5fdcaa385b2a7f66fd85632eeebbadaa #v4.2.0 + SHA512 f6b1738d96fef89059062f570f67aaa8b143ccfbee78abfe5fbb25083371a4c432f3d1d0d357e4b475b4b72a6db7823c2341b70ac947759603b033c2b0acec47 HEAD_REF master PATCHES ${patches} ) @@ -42,7 +42,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF - -DBUILD_GAMES=OFF -DSHARED=${SHARED} -DSTATIC=${STATIC} -DUSE_EXTERNAL_GLFW=OFF # externl glfw3 causes build errors on Windows diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 348eb943e668e7..467dbf5ef340a5 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "raylib", - "version-semver": "4.0.0", - "port-version": 3, + "version-semver": "4.2.0", "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 7f8512d1bdc7a0..e4c571a19325c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6217,8 +6217,8 @@ "port-version": 1 }, "raylib": { - "baseline": "4.0.0", - "port-version": 3 + "baseline": "4.2.0", + "port-version": 0 }, "rbdl": { "baseline": "3.2.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 91b54dde0c2ac4..6ba27d5f7a939c 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84270f09d9ecfed2207ea866910905fdfcf8b229", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "0b15021a8c0247cf83d5e4ca352b7e53b510b743", "version-semver": "4.0.0", From 3632576376ea6ee839bb54275e4d9abebd5fa408 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 18 Aug 2022 00:29:56 +0800 Subject: [PATCH 411/791] [folly] update to (#26392) * [folly] update to * update version --- ports/folly/portfile.cmake | 6 ++---- ports/folly/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/folly.json | 5 +++++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 6b2585573d66bb..db3bed6de2c4da 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF 4ba3bfed38ad14d0951d82b154c44235d380f59b #v2022.07.11.00 - SHA512 d2dd31a42475e564d01a0e7d99b59382f0afd56d89beb189e580b654650d2f9316cbeb459a038f9534881f22efd1571494926c1ea88b827de6ac56317d3c135b + REF 46c03de426e26f4c5a92df37ab233c586fbe369a #v2022.08.15.00 + SHA512 6798878d6892ed79d954fb5754ee102ea04868bce4be9be5dc7c6d6c7ddcbc5573719fe09470d89c385d9e487a75d1a9abc70c29c67698b957fc68b97a8bea32 HEAD_REF main PATCHES reorder-glog-gflags.patch @@ -56,8 +56,6 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON -DLIBAIO_FOUND=OFF - -DLIBURCU_FOUND=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LibURCU=ON -DCMAKE_INSTALL_DIR=share/folly ${FEATURE_OPTIONS} ) diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 32f5afda363151..5d9e7dda030888 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,6 @@ { "name": "folly", - "version-string": "2022.07.11.00", + "version-string": "2022.08.15.00", "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e4c571a19325c9..84b15efa093cf5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2329,7 +2329,7 @@ "port-version": 0 }, "folly": { - "baseline": "2022.07.11.00", + "baseline": "2022.08.15.00", "port-version": 0 }, "font-chef": { diff --git a/versions/f-/folly.json b/versions/f-/folly.json index bd43dd1d391e3a..5226756b3e0033 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f046523ca3488aa4e35d11656fcb15acb5b0f4f3", + "version-string": "2022.08.15.00", + "port-version": 0 + }, { "git-tree": "fcb721c422a09f612a5a83519d0c163c8cc83257", "version-string": "2022.07.11.00", From 77fe4349743fe4a0918c7e340220023250b043b3 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 18 Aug 2022 00:30:57 +0800 Subject: [PATCH 412/791] [Sciplot] update to 0.3.1 (#26386) * [Sciplot] update to 0.3.1 * update version --- ports/sciplot/portfile.cmake | 10 +++++----- ports/sciplot/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sciplot.json | 5 +++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/sciplot/portfile.cmake b/ports/sciplot/portfile.cmake index a38cce918a2bcc..6ebd09ed310d08 100644 --- a/ports/sciplot/portfile.cmake +++ b/ports/sciplot/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sciplot/sciplot - REF v0.2.2 - SHA512 2e7646e0fd52643bf86c09466d921d7b6a53349cd113e15177c3389654e0489df1d56f5fdcad7fc73834e632fff0a303d1366688ac7bb11937d49babd0742a7f + REF f8d779a1110b76c6bdc77edcdc7fa798156a6917 #v0.3.1 + SHA512 fa21895c637bc42071fbd951e1c2ee450798398863626e31015f106077de4ad17dc276d77f2f1a4a7679c055c8cd8caafea513d746ac7ddbb22a16cc9382f39a HEAD_REF vcpkg ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSCIPLOT_BUILD_TESTS=OFF ) @@ -18,6 +18,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/sciplot) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"RENAME copyright) diff --git a/ports/sciplot/vcpkg.json b/ports/sciplot/vcpkg.json index 39d3809675ed74..e0c1fd8d195d15 100644 --- a/ports/sciplot/vcpkg.json +++ b/ports/sciplot/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sciplot", - "version": "0.2.2", - "port-version": 1, + "version": "0.3.1", "description": "A modern c++ scientific plotting library powered by gnuplot", "homepage": "https://github.com/sciplot/sciplot", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 84b15efa093cf5..b9a5262f948186 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6465,8 +6465,8 @@ "port-version": 1 }, "sciplot": { - "baseline": "0.2.2", - "port-version": 1 + "baseline": "0.3.1", + "port-version": 0 }, "sciter": { "baseline": "0", diff --git a/versions/s-/sciplot.json b/versions/s-/sciplot.json index a06704b03fb989..803b42af6ddbdf 100644 --- a/versions/s-/sciplot.json +++ b/versions/s-/sciplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aac1c6064d43d5166bfe8bb2f65864fb9261c417", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "e28065774395839bda6f9bc898b6214141fcb746", "version": "0.2.2", From 5fb8f6c24ec13a36db460a555b24b20be03bd73c Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 17 Aug 2022 09:35:26 -0700 Subject: [PATCH 413/791] [kubazip] update to 0.2.4 (#26368) * [kubazip] update to 0.2.4 * x-add-version --- ports/kubazip/fix_targets.patch | 45 +++++++++++++-------------------- ports/kubazip/portfile.cmake | 15 +++++------ ports/kubazip/vcpkg.json | 16 +++++++++--- versions/baseline.json | 4 +-- versions/k-/kubazip.json | 5 ++++ 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/ports/kubazip/fix_targets.patch b/ports/kubazip/fix_targets.patch index e5ffb86085cd78..fc0a11e8f11120 100644 --- a/ports/kubazip/fix_targets.patch +++ b/ports/kubazip/fix_targets.patch @@ -1,25 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55dfc77..f0182f9 100644 +index cf86d70..c2bc2f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.4) + cmake_minimum_required(VERSION 3.14) -project(zip +project(kubazip LANGUAGES C - VERSION "0.1.19") + VERSION "0.2.3") set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) -@@ -15,7 +15,7 @@ if (MSVC) - elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR - "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic") - endif (MSVC) - - # zip -@@ -37,7 +37,7 @@ endif() +@@ -46,11 +46,11 @@ endif() target_include_directories(${PROJECT_NAME} PUBLIC $ @@ -28,25 +19,23 @@ index 55dfc77..f0182f9 100644 ) # test -@@ -52,7 +52,7 @@ endif() - # Installation (https://github.com/forexample/package-example) { +-if (NOT CMAKE_DISABLE_TESTING) ++if (0) + enable_testing() + add_subdirectory(test) + endif() +@@ -69,12 +69,12 @@ if (MSVC) + elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR + "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -pedantic") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic") + endif (MSVC) + #### set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") -set(INCLUDE_INSTALL_DIR "include") +set(INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}") set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 04c2123..002cf5a 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.4) - set(test_out test.out) - - add_executable(${test_out} test.c) --target_link_libraries(${test_out} zip) -+target_link_libraries(${test_out} kubazip) - - add_test(NAME ${test_out} COMMAND ${test_out}) - diff --git a/ports/kubazip/portfile.cmake b/ports/kubazip/portfile.cmake index ba2f488e0a9414..e08713a127de4d 100644 --- a/ports/kubazip/portfile.cmake +++ b/ports/kubazip/portfile.cmake @@ -3,20 +3,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kuba--/zip - REF 96924c94dabe362bbb1588aa70209e638e6fb35c - SHA512 bc3e9ecf39d54321314d09209f356a2491893591a016b1619abcdea8c1fb1fa8ba1f9858f4e758641df083ed237a2ec9f0af13e0f1d802502257644168ae8907 + REF 42151612e8546c55485ec38cf0d57e57e51a8abd #v0.2.4 + SHA512 9cbb7bcb8095c365c4529f06c883f3aa0c1038ed3aa6a0419dafb90355abf6e5cd02f7ffd5cbb54fe3893102bb21f568d415b71500630ad203a1f911b6e52ef5 HEAD_REF master PATCHES fix_targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/kubazip) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/kubazip) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kubazip/vcpkg.json b/ports/kubazip/vcpkg.json index 1eecb26ba311de..1d296ea8e8361d 100644 --- a/ports/kubazip/vcpkg.json +++ b/ports/kubazip/vcpkg.json @@ -1,7 +1,17 @@ { "name": "kubazip", - "version-string": "0.1.19", - "port-version": 1, + "version": "0.2.4", "description": "A portable, simple zip library written in C", - "homepage": "https://github.com/kuba--/zip" + "homepage": "https://github.com/kuba--/zip", + "license": "Unlicense", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index b9a5262f948186..e99b3b622d0324 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3369,8 +3369,8 @@ "port-version": 0 }, "kubazip": { - "baseline": "0.1.19", - "port-version": 1 + "baseline": "0.2.4", + "port-version": 0 }, "kubernetes": { "baseline": "2022-01-19", diff --git a/versions/k-/kubazip.json b/versions/k-/kubazip.json index 1286e2b6ffc6fb..f895e05b2384f0 100644 --- a/versions/k-/kubazip.json +++ b/versions/k-/kubazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14bf9d5b15ecf5769d10e5000e74167e97b0ade1", + "version": "0.2.4", + "port-version": 0 + }, { "git-tree": "131416be9d3de3fccb254751a17cd78e1252b464", "version-string": "0.1.19", From d3431006f27468065ef53f33254fac9a181337ef Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 17 Aug 2022 19:41:39 +0200 Subject: [PATCH 414/791] [tesseract] fix downstream usage (#26378) * [tesseract5] fix downstream usage * fix references --- ports/opencv3/0018-fix-depend-tesseract.patch | 11 +++++++++++ ports/opencv3/portfile.cmake | 1 + ports/opencv3/vcpkg.json | 1 + ports/opencv4/0018-fix-depend-tesseract.patch | 2 -- ports/opencv4/vcpkg.json | 2 +- ports/tesseract/fix-depend-libarchive.patch | 2 -- ports/tesseract/portfile.cmake | 1 + ports/tesseract/vcpkg.json | 2 ++ versions/baseline.json | 6 +++--- versions/o-/opencv3.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ versions/t-/tesseract.json | 5 +++++ 12 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 ports/opencv3/0018-fix-depend-tesseract.patch diff --git a/ports/opencv3/0018-fix-depend-tesseract.patch b/ports/opencv3/0018-fix-depend-tesseract.patch new file mode 100644 index 00000000000000..6a8bc7acd38276 --- /dev/null +++ b/ports/opencv3/0018-fix-depend-tesseract.patch @@ -0,0 +1,11 @@ +--- a/modules/text/cmake/init.cmake ++++ b/modules/text/cmake/init.cmake +@@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO + if(NOT HAVE_TESSERACT + AND (WITH_TESSERACT OR OPENCV_FIND_TESSERACT) + ) ++ find_package(Tesseract CONFIG REQUIRED) ++ set(Tesseract_LIBRARIES Tesseract::libtesseract) + if(NOT Tesseract_FOUND) + find_package(Tesseract QUIET) # Prefer CMake's standard locations (including Tesseract_DIR) + endif() diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 2567a072bfcf62..568b1fb752d759 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -157,6 +157,7 @@ if("contrib" IN_LIST FEATURES) 0007-fix-hdf5.patch 0013-fix-ceres.patch 0016-fix-freetype-contrib.patch + 0018-fix-depend-tesseract.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index a237deb5359237..b6787027ed8052 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv3", "version": "3.4.18", + "port-version": 1, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/0018-fix-depend-tesseract.patch b/ports/opencv4/0018-fix-depend-tesseract.patch index 3f873bc59a64be..6a8bc7acd38276 100644 --- a/ports/opencv4/0018-fix-depend-tesseract.patch +++ b/ports/opencv4/0018-fix-depend-tesseract.patch @@ -1,5 +1,3 @@ -diff --git a/modules/text/cmake/init.cmake b/modules/text/cmake/init.cmake -index 254757e..73194ec 100644 --- a/modules/text/cmake/init.cmake +++ b/modules/text/cmake/init.cmake @@ -4,6 +4,8 @@ OCV_OPTION(WITH_TESSERACT "Include Tesseract OCR library support" (NOT CMAKE_CRO diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index d42295f1ebd071..c77f11d7ea6a5e 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.6.0", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/tesseract/fix-depend-libarchive.patch b/ports/tesseract/fix-depend-libarchive.patch index 1b57247126c06c..5d510e16ec5c8c 100644 --- a/ports/tesseract/fix-depend-libarchive.patch +++ b/ports/tesseract/fix-depend-libarchive.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd2649d..f932913 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -792,7 +792,8 @@ if(OpenCL_FOUND) diff --git a/ports/tesseract/portfile.cmake b/ports/tesseract/portfile.cmake index 3764e47ef0233a..a30d57a38aa1a0 100644 --- a/ports/tesseract/portfile.cmake +++ b/ports/tesseract/portfile.cmake @@ -51,6 +51,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tesseract) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/tesseract/TesseractConfig.cmake" "find_dependency(Leptonica)" [[ +find_dependency(CURL) find_dependency(Leptonica) find_dependency(LibArchive) ]] diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index f62bc6cb20820f..04a1de7fb5461f 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,11 +1,13 @@ { "name": "tesseract", "version": "5.2.0", + "port-version": 1, "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "license": "Apache-2.0", "supports": "!(arm & (osx | linux))", "dependencies": [ + "curl", "leptonica", "libarchive", { diff --git a/versions/baseline.json b/versions/baseline.json index e99b3b622d0324..9342e608862783 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5202,11 +5202,11 @@ }, "opencv3": { "baseline": "3.4.18", - "port-version": 0 + "port-version": 1 }, "opencv4": { "baseline": "4.6.0", - "port-version": 1 + "port-version": 2 }, "opendnp3": { "baseline": "3.1.1", @@ -7046,7 +7046,7 @@ }, "tesseract": { "baseline": "5.2.0", - "port-version": 0 + "port-version": 1 }, "tfhe": { "baseline": "1.0.1", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index b40aebe00ad326..7febef4608ffc4 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f45f46b8a492b795cce92786a3d2048ef24ef38", + "version": "3.4.18", + "port-version": 1 + }, { "git-tree": "15c9083efa4c00674bef4fbca443a662fe6dd5cd", "version": "3.4.18", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index a96d1fe034f440..59035e59c2a5b0 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57554ec83d4e4667344f005a1f61be8164cbf58a", + "version": "4.6.0", + "port-version": 2 + }, { "git-tree": "a6c9bded8fc4ad22bea6869caecf2881c8da2d41", "version": "4.6.0", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 1d7f6743abefcd..2d99c2416c0c92 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea93f36603ca265da43ef28d6583871ef3d97b43", + "version": "5.2.0", + "port-version": 1 + }, { "git-tree": "5ea8fcd243e8aa38e1a83eaa1c745fc53a3464cc", "version": "5.2.0", From d00e2cbbec919249af0c7d84341b2a36ea9351ff Mon Sep 17 00:00:00 2001 From: Nursultan Zarlyk Date: Wed, 17 Aug 2022 19:42:05 +0200 Subject: [PATCH 415/791] [X264] Add arm64-windows by disabling asm (#26371) * Disable asm for x264 to support arm64-windows * Add version * Fix vcpkg.json * Add version Co-authored-by: Nursultan Zarlyk --- ports/x264/portfile.cmake | 5 +++++ ports/x264/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/x-/x264.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 33e6979ac0e776..922fed459bbd84 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -19,6 +19,11 @@ if(VCPKG_TARGET_IS_WINDOWS) z_vcpkg_determine_autotools_target_cpu(HOST_ARCH) list(APPEND OPTIONS --build=${BUILD_ARCH}-pc-mingw32) list(APPEND OPTIONS --host=${HOST_ARCH}-pc-mingw32) + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPTIONS --disable-asm) + endif() + set(ENV{AS} "${NASM}") endif() diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 436cf0b5efd276..194887fd91f529 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,10 +1,9 @@ { "name": "x264", "version-string": "164-5db6aa6cab1b146", - "port-version": 4, + "port-version": 5, "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)", "dependencies": [ { "name": "pthread", diff --git a/versions/baseline.json b/versions/baseline.json index 9342e608862783..97aedd3002fc7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7710,7 +7710,7 @@ }, "x264": { "baseline": "164-5db6aa6cab1b146", - "port-version": 4 + "port-version": 5 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index bd8a969ea8dad4..a4737cfcd02cc0 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59d158d37c92adf78716bc36f80a82853149e368", + "version-string": "164-5db6aa6cab1b146", + "port-version": 5 + }, { "git-tree": "7eea109502309e62a578bcc69811ad0659e00f9d", "version-string": "164-5db6aa6cab1b146", From dc9d737351f916eb349e7bc85671d3dba4043399 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 17 Aug 2022 21:36:12 +0200 Subject: [PATCH 416/791] [pixman] add missing include and fix clang-cl build (#26186) * pixman: add missing include and fix clang-cl builds * v db * use correct <> isntead of "" * v db * make the patch depend on _MSC_VER * v db * fix bug in vcpkg_configure_meson not linking WindowsApp.lib fix another bug that system=windowsstore which meson doesn recognize * bump port version * v db --- ports/pixman/fix_clang-cl.patch | 13 +++++++++++++ ports/pixman/missing_intrin_include.patch | 15 +++++++++++++++ ports/pixman/portfile.cmake | 6 ++---- ports/pixman/vcpkg.json | 2 +- scripts/cmake/vcpkg_configure_meson.cmake | 11 ++++++++++- versions/baseline.json | 2 +- versions/p-/pixman.json | 5 +++++ 7 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 ports/pixman/fix_clang-cl.patch create mode 100644 ports/pixman/missing_intrin_include.patch diff --git a/ports/pixman/fix_clang-cl.patch b/ports/pixman/fix_clang-cl.patch new file mode 100644 index 00000000000000..0a6bdba566b2ea --- /dev/null +++ b/ports/pixman/fix_clang-cl.patch @@ -0,0 +1,13 @@ +diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c +index d7cf2659d..625a08ace 100644 +--- a/pixman/pixman-mmx.c ++++ b/pixman/pixman-mmx.c +@@ -137,7 +137,7 @@ _mm_mulhi_pu16 (__m64 __A, __m64 __B) + * then define USE_M64_CASTS. + * If __m64 is a double datatype, then define USE_M64_DOUBLE. + */ +-#ifdef _MSC_VER ++#if defined(_MSC_VER) && !defined(__clang__) + # define M64_MEMBER m64_u64 + #elif defined(__ICC) + # define USE_CVT_INTRINSICS diff --git a/ports/pixman/missing_intrin_include.patch b/ports/pixman/missing_intrin_include.patch new file mode 100644 index 00000000000000..76f74af70a54f5 --- /dev/null +++ b/ports/pixman/missing_intrin_include.patch @@ -0,0 +1,15 @@ +diff --git a/pixman/pixman-x86.c b/pixman/pixman-x86.c +index 0130b7bfa..d3d0fe1d9 100644 +--- a/pixman/pixman-x86.c ++++ b/pixman/pixman-x86.c +@@ -24,7 +24,10 @@ + #endif + + #include "pixman-private.h" ++#ifdef _MSC_VER ++#include ++#endif + + #if defined(USE_X86_MMX) || defined (USE_SSE2) || defined (USE_SSSE3) + + /* The CPU detection code needs to be in a file not compiled with diff --git a/ports/pixman/portfile.cmake b/ports/pixman/portfile.cmake index ed0ceef4fbd931..8e6096369b93d0 100644 --- a/ports/pixman/portfile.cmake +++ b/ports/pixman/portfile.cmake @@ -1,7 +1,3 @@ -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs -endif() - if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS -Dmmx=disabled @@ -46,6 +42,8 @@ vcpkg_extract_source_archive_ex( PATCHES remove_test_demos.patch no-host-cpu-checks.patch + fix_clang-cl.patch + missing_intrin_include.patch ) # Meson install wrongly pkgconfig file! vcpkg_configure_meson( diff --git a/ports/pixman/vcpkg.json b/ports/pixman/vcpkg.json index 1098ef64b1b153..d46c7195d2138c 100644 --- a/ports/pixman/vcpkg.json +++ b/ports/pixman/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pixman", "version": "0.40.0", - "port-version": 3, + "port-version": 4, "description": "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid rasterization.", "homepage": "https://www.cairographics.org/releases", "license": "MIT", diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 9056a1099f91d3..2115680d8b7852 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -270,7 +270,7 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu string(APPEND cross_file "[host_machine]\n") string(APPEND cross_file "endian = 'little'\n") - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW) + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW OR VCPKG_TARGET_IS_UWP) set(meson_system_name "windows") else() string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name) @@ -319,6 +319,15 @@ function(z_vcpkg_meson_generate_cross_file_config config_type) #https://mesonbui if(${config_type} STREQUAL "DEBUG") set(crt_type ${crt_type}d) endif() + set(c_winlibs "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + set(cpp_winlibs "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + foreach(libvar IN ITEMS c_winlibs cpp_winlibs) + string(REGEX REPLACE "( |^)(-|/)" [[;\2]] "${libvar}" "${${libvar}}") + string(REPLACE ".lib " ".lib;" "${libvar}" "${${libvar}}") + vcpkg_list(REMOVE_ITEM "${libvar}" "") + vcpkg_list(JOIN "${libvar}" "', '" "${libvar}") + string(APPEND cross_${config_type}_log "${libvar} = ['${${libvar}}']\n") + endforeach() string(APPEND cross_${config_type}_log "b_vscrt = '${crt_type}'\n") endif() string(TOLOWER "${config_type}" lowerconfig) diff --git a/versions/baseline.json b/versions/baseline.json index 97aedd3002fc7b..cde931096ddb24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5530,7 +5530,7 @@ }, "pixman": { "baseline": "0.40.0", - "port-version": 3 + "port-version": 4 }, "pkgconf": { "baseline": "1.8.0", diff --git a/versions/p-/pixman.json b/versions/p-/pixman.json index 0dec4d74100a75..9944061c0340d7 100644 --- a/versions/p-/pixman.json +++ b/versions/p-/pixman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0209cb23d5ca18cd74fa4a67e7ca80f7e81c0cd", + "version": "0.40.0", + "port-version": 4 + }, { "git-tree": "f6930f7300af86c20679b38f53bbdbc1a1310eed", "version": "0.40.0", From 4217fee510d4c592d3e45564d3ee116ae301189f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 17 Aug 2022 16:44:51 -0700 Subject: [PATCH 417/791] Update Windows VMs for Patch Tuesday August 2022 (#26283) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Install haskell-stack with apt instead of piping a sh. * Update pools. * Linux is exploding for some reason. I just found out it is getting created with a 30GB disk I'm guessing may be involved. Did not wait for x64_windows_static_md to finish because enough was already on the floor. PASSING, REMOVE FROM FAIL LIST: angle:arm-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: angle:arm64-windows (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: angle:x64-uwp (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: angle:x64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: angle:x64-windows-static (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: angle:x86-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: qtwebengine:x64-windows (C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: qtwebengine:x64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: qtwebengine:x64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: qtwebengine:x64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: qtwebengine:x64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: qtwebengine:x64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: rsocket:x64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). PASSING, REMOVE FROM FAIL LIST: rsocket:x64-windows-static (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). REGRESSION: gazebo:x64-windows failed with BUILD_FAILED. If expected, add gazebo:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): error C2275: 'dart::common::Signal<_Res(_ArgTypes...),Combiner>::ConnectionBodyType': expected an expression instead of a type D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): error C2923: 'std::shared_ptr': 'dart::common::Signal<_Res(_ArgTypes...),Combiner>::ConnectionBodyType' is not a valid template type argument for parameter '_Ty' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): note: see declaration of 'dart::common::Signal<_Res(_ArgTypes...),Combiner>::ConnectionBodyType' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): error C2955: 'std::shared_ptr': use of class template requires template argument list ``` We have been seeing intermittent failures in gazebo:x64-windows and I think this just repro'd that... REGRESSION: graphicsmagick:x64-windows failed with BUILD_FAILED. If expected, add graphicsmagick:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: graphicsmagick:x64-windows-static failed with BUILD_FAILED. If expected, add graphicsmagick:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: graphicsmagick:x86-windows failed with BUILD_FAILED. If expected, add graphicsmagick:x86-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` D:\buildtrees\graphicsmagick\src\2e465a2909-adf106de54.clean\magick/nt_base.h(95): warning C4005: 'HAVE_FT2BUILD_H': macro redefinition D:\buildtrees\graphicsmagick\src\2e465a2909-adf106de54.clean\magick/magick_config.h(123): note: see previous definition of 'HAVE_FT2BUILD_H' D:\buildtrees\graphicsmagick\src\2e465a2909-adf106de54.clean\magick\effect.c(689) : fatal error C1001: Internal compiler error. (compiler file 'D:\a\_work\1\s\src\vctools\Compiler\Utc\src\p2\main.c', line 224) To work around this problem, try simplifying or changing the program near the locations listed above. If possible please provide a repro here: https://developercommunity.visualstudio.com Please choose the Technical Support command on the Visual C++ Help menu, or open the Technical Support help file for more information cl!RaiseException()+0x6c cl!RaiseException()+0x6c cl!DllGetObjHandler()+0xdb94f cl!DllGetObjHandler()+0x1ac555 ``` 😭 REGRESSION: mathgl:x64-windows failed with POST_BUILD_CHECKS_FAILED. If expected, add mathgl:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: mathgl:x64-windows-static failed with POST_BUILD_CHECKS_FAILED. If expected, add mathgl:x64-windows-static=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. REGRESSION: mathgl:x86-windows failed with POST_BUILD_CHECKS_FAILED. If expected, add mathgl:x86-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` -- Performing post-build validation The following files contain an absolute path ('D:\packages\mathgl_x64-windows', 'D:\installed', 'D:\buildtrees\mathgl'): D:\packages\mathgl_x64-windows\include\mgl2\config.h There should be no absolute paths in the installed package, only relative ones. Found 1 post-build check problem(s). To submit these ports to curated catalogs, please first correct the portfile: C:\a\2\s\ports\mathgl\portfile.cmake -- Performing post-build validation done error: building mathgl:x64-windows failed with: POST_BUILD_CHECKS_FAILED ``` @autoantwort REGRESSION: qtwebengine:arm64-windows failed with POST_BUILD_CHECKS_FAILED. If expected, add qtwebengine:arm64-windows=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt. ``` Building qtwebengine[core,default-features,geolocation,spellchecker,webchannel]:arm64-windows... -- Setting up python virtual environmnent... -- Installing python packages: html5lib -- Setting up python virtual environmnent...finished. CMake Warning at ports/qtwebengine/portfile.cmake:83 (message): Buildtree path 'D:/buildtrees/qtwebengine' is too long. Consider passing --x-buildtrees-root= to vcpkg! Trying to use 'D:/buildtrees/qtwebengine/../tmp' Call Stack (most recent call first): scripts/ports.cmake:147 (include) -- Using cached qtwebengine-everywhere-src-6.3.1.tar.xz. -- Cleaning sources at D:/buildtrees/tmp/src/here-src-6-367c283e50.clean. Use --editable to skip cleaning for the packages you specify. -- Extracting source D:/downloads/qtwebengine-everywhere-src-6.3.1.tar.xz -- Using source at D:/buildtrees/tmp/src/here-src-6-367c283e50.clean -- Found external ninja('1.10.2'). -- Configuring arm64-windows-dbg -- Configuring arm64-windows-rel CMake Warning at D:/installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_configure.cmake:302 (message): The following variables are not used in CMakeLists.txt: FEATURE_webengine_geolocation FEATURE_webengine_spellchecker FEATURE_webengine_v8_snapshot_support FEATURE_webengine_webchannel FEATURE_webengine_webrtc Please recheck them and remove the unnecessary options from the `vcpkg_cmake_configure` call. If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument. Call Stack (most recent call first): D:/installed/arm64-windows/share/qtbase/qt_install_submodule.cmake:108 (vcpkg_cmake_configure) ports/qtwebengine/portfile.cmake:102 (qt_cmake_configure) scripts/ports.cmake:147 (include) -- Building arm64-windows-dbg -- Building arm64-windows-rel -- Installing: D:/packages/qtwebengine_arm64-windows/share/qtwebengine/copyright -- Performing post-build validation The folder /include is empty or not present. This indicates the library was not correctly installed. There should be no empty directories in D:\packages\qtwebengine_arm64-windows The following empty directories were found: ``` This was previously blocked by qtwebengine:x64-windows=fail. Will investigate... * Remove attempt to install extra stuff for scale set agents. * Turn on boot diagnostics. * Update pools. * Back out most Linux changes. * Analysis of https://dev.azure.com/vcpkg/public/_build/results?buildId=76482&view=results REGRESSION: graphicsmagick:x86-windows failed with BUILD_FAILED. If expected, add graphicsmagick:x86-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. Added this skip too. REGRESSION: gazebo:x64-windows failed with BUILD_FAILED. If expected, add gazebo:x64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. ``` C:\PROGRA~1\MICROS~1\2022\ENTERP~1\VC\Tools\MSVC\1433~1.316\bin\Hostx64\x64\cl.exe /TP -DBOOST_ALL_DYN_LINK -DBOOST_ALL_NO_LIB -DBOOST_TEST_DYN_LINK -DBUILDING_DLL -DBUILDING_DLL_GZ_PHYSICS -DFREEIMAGE_LIB -DH5_BUILT_AS_DYNAMIC_LIB -DIGN_PROFILER_ENABLE=0 -DLIBBULLET_VERSION=3.21 -DLIBBULLET_VERSION_GT_282 -DNOMINMAX -DNOUSER -DPROTOBUF_USE_DLLS -DTINYXML2_DEBUG -DTINYXML2_IMPORT -DWIN32_LEAN_AND_MEAN -D_USE_MATH_DEFINES -DdIDEDOUBLE -Dgazebo_physics_EXPORTS -ID:\buildtrees\gazebo\src\46e867c51d-eba7a8151f.clean\test\gtest\include -ID:\buildtrees\gazebo\src\46e867c51d-eba7a8151f.clean -ID:\buildtrees\gazebo\x64-windows-dbg -ID:\installed\x64-windows\debug\..\include\libusb-1.0 -external:ID:\buildtrees\gazebo\src\46e867c51d-eba7a8151f.clean\deps\opende\include -external:ID:\installed\x64-windows\include -external:ID:\installed\x64-windows\debug\..\include -external:ID:\installed\x64-windows\include\ignition\msgs5 -external:ID:\installed\x64-windows\include\ignition\math6 -external:ID:\installed\x64-windows\include\ignition\transport8 -external:ID:\installed\x64-windows\include\ignition\common3 -external:ID:\installed\x64-windows\include\ignition\fuel_tools4 -external:ID:\installed\x64-windows\include\OGRE -external:ID:\installed\x64-windows\include\sdformat-9.8 -external:ID:\installed\x64-windows\include\bullet -external:ID:\installed\x64-windows\include\sdformat-9.8\sdf\.. -external:ID:\installed\x64-windows\include\ignition\cmake2 -external:ID:\installed\x64-windows\include\eigen3 -external:ID:\installed\x64-windows\share\urdfdom_headers\..\..\include -external:ID:\installed\x64-windows\include\urdfdom -external:ID:\installed\x64-windows\include\urdfdom_headers -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /wd4005 /wd4068 /wd4244 /wd4251 /wd4267 /wd4275 /wd4996 /EHsc /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /EHsc -I"D:/installed/x64-windows/include" /Zc:__cplusplus /permissive- /Zc:strictStrings- /Zc:externC- -std:c++17 /showIncludes /Fogazebo\physics\CMakeFiles\gazebo_physics.dir\dart\DARTBoxShape.cc.obj /Fdgazebo\physics\CMakeFiles\gazebo_physics.dir\ /FS -c D:\buildtrees\gazebo\src\46e867c51d-eba7a8151f.clean\gazebo\physics\dart\DARTBoxShape.cc D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): error C2275: 'dart::common::Signal<_Res(_ArgTypes...),Combiner>::ConnectionBodyType': expected an expression instead of a type D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): error C2923: 'std::shared_ptr': 'dart::common::Signal<_Res(_ArgTypes...),Combiner>::ConnectionBodyType' is not a valid template type argument for parameter '_Ty' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): note: see declaration of 'dart::common::Signal<_Res(_ArgTypes...),Combiner>::ConnectionBodyType' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): error C2955: 'std::shared_ptr': use of class template requires template argument list C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.33.31629\include\memory(1493): note: see declaration of 'std::shared_ptr' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(87): error C2955: 'std::shared_ptr': use of class template requires template argument list C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.33.31629\include\memory(1493): note: see declaration of 'std::shared_ptr' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(182): error C2275: 'dart::common::Signal::ConnectionBodyType': expected an expression instead of a type D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(182): error C2923: 'std::shared_ptr': 'dart::common::Signal::ConnectionBodyType' is not a valid template type argument for parameter '_Ty' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(182): note: see declaration of 'dart::common::Signal::ConnectionBodyType' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(182): error C2955: 'std::shared_ptr': use of class template requires template argument list C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.33.31629\include\memory(1493): note: see declaration of 'std::shared_ptr' D:\installed\x64-windows\include\dart/common/detail/Signal.hpp(182): error C2955: 'std::shared_ptr': use of class template requires template argument list C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.33.31629\include\memory(1493): note: see declaration of 'std::shared_ptr' ``` PASSING, REMOVE FROM FAIL LIST: luajit:arm64-windows (C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt). This was https://github.com/microsoft/vcpkg/pull/26360 REGRESSION: qtwebengine:arm64-windows failed with POST_BUILD_CHECKS_FAILED. If expected, add qtwebengine:arm64-windows=fail to C:\a\2\s\scripts\azure-pipelines/../ci.baseline.txt. This was previously blocked by x64-windows being skipped, so I'm just adding it to the baseline for now. --- scripts/azure-pipelines/azure-pipelines.yml | 2 +- scripts/azure-pipelines/linux/create-vmss.ps1 | 4 +++ .../azure-pipelines/linux/provision-image.sh | 7 +++--- .../azure-pipelines/windows/create-vmss.ps1 | 4 +++ scripts/ci.baseline.txt | 25 +++++++------------ 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 12e0354af74ceb..d1db6ebf5bafde 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-07-14' + windows-pool: 'PrWin-2022-08-10' linux-pool: 'PrLin-2022-07-14' osx-pool: 'PrOsx-2022-02-04' diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index cbbb9b5af8937d..54ed2142bb9e99 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -98,6 +98,10 @@ $Vmss = Set-AzVmssStorageProfile ` -DiffDiskSetting Local ` -ImageReferenceId $Image.Id +$Vmss = Set-AzVmssBootDiagnostic ` + -VirtualMachineScaleSet $Vmss ` + -Enabled $true + New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 8c78f485f8fb57..ce25aa10d7a65c 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -66,14 +66,14 @@ APT_PACKAGES="$APT_PACKAGES libdbus-1-dev" # Additionally required by at-spi2-atk APT_PACKAGES="$APT_PACKAGES libxtst-dev" +# Additionally required by bond +APT_PACKAGES="$APT_PACKAGES haskell-stack" + # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70" apt-get -y install $APT_PACKAGES -# Install the latest Haskell stack for bond -curl -sSL https://get.haskellstack.org/ | sh - # Start up cudnn update-nvidia-cudnn -d update-nvidia-cudnn -u @@ -89,6 +89,7 @@ apt-get install --no-install-recommends libnccl2 libnccl-dev # Install PowerShell wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb dpkg -i packages-microsoft-prod.deb +rm -f packages-microsoft-prod.deb apt-get update add-apt-repository universe apt-get install -y powershell diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 index bf3586c84aabc1..ea2a00a7f007a2 100644 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -84,6 +84,10 @@ $Vmss = Set-AzVmssStorageProfile ` -DiffDiskSetting Local ` -ImageReferenceId $Image.Id +$Vmss = Set-AzVmssBootDiagnostic ` + -VirtualMachineScaleSet $Vmss ` + -Enabled $true + New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 92a5ac1c7a859c..d8db40c7c89424 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -272,6 +272,8 @@ ftgl:arm-uwp=fail # https://github.com/GoogleCloudPlatform/functions-framework-cpp/issues/207 functions-framework-cpp:x64-uwp=fail +# VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 +gazebo:x64-windows=fail gazebo:x64-linux=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip @@ -323,6 +325,11 @@ gperftools:x64-uwp=fail gperftools:arm-uwp=fail graphicsmagick:arm-uwp=fail graphicsmagick:x64-uwp=fail +# graphicsmagick non-uwp trigger an ICE in VS 2022 17.3 https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1557251 +graphicsmagick:x86-windows=fail +graphicsmagick:x64-windows=fail +graphicsmagick:x64-windows-static=fail +graphicsmagick:x64-windows-static-md=fail gstreamer:x64-osx=fail gstreamer:arm64-osx=fail gtk:x64-windows-static=fail @@ -881,6 +888,8 @@ qt5-canvas3d:x86-windows=skip qt5-wayland:x64-osx=fail qtwayland:x64-osx=fail qtwayland:arm64-osx=fail +# Post build checks fail +qtwebengine:arm64-windows=fail # Missing prerequisites for CI success qt5-webengine:x64-linux=fail qt5-webengine:x64-osx=fail @@ -890,8 +899,6 @@ qt5-webengine:x64-osx=fail # Succesful built requires protobuf to be installed after qt5-webengine not before. Otherwise the build picks up the wrong headers from inside vcpkg. qt5-webengine:x64-windows=skip qt5-webengine:x86-windows=skip -# VS2022 17.2 ICE https://developercommunity.visualstudio.com/t/Visual-Studio-2022-v1720-reports-fata/10039296 -qtwebengine:x64-windows=fail # Missing system libraries qt5-x11extras:x64-osx=fail qt5-x11extras:arm64-osx=fail @@ -980,10 +987,6 @@ rsasynccpp:x64-osx=fail rsm-binary-io:x64-linux=fail # Requires g++10 but CI compiler only has g++9 rsm-bsa:x64-linux=fail -# VS2022 17.2 ICE https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1490389 -rsocket:x64-windows=fail -rsocket:x64-windows-static=fail -rsocket:x64-windows-static-md=fail rtlsdr:x64-uwp=fail rtlsdr:arm64-windows=fail rtlsdr:arm-uwp=fail @@ -1249,16 +1252,6 @@ zeroc-ice:arm64-windows=fail zeroc-ice:arm-uwp=fail zeroc-ice:x64-uwp=fail -# ANGLE triggers an intermittent ice in C1XX -# https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1472813 -angle:x86-windows=fail -angle:x64-windows=fail -angle:x64-windows-static=fail -angle:x64-windows-static-md=fail -angle:x64-uwp=fail -angle:arm64-windows=fail -angle:arm-uwp=fail - cmake-user:arm-uwp=pass cmake-user:arm64-windows=pass cmake-user:x64-linux=pass From f90bbd050f6c4fbdeda6214afe9943c46341c0e9 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt <7577172+hmoffatt@users.noreply.github.com> Date: Fri, 19 Aug 2022 03:37:24 +1000 Subject: [PATCH 418/791] [quazip] Add license (#26400) * [quazip] add licence data * [quazip] update version --- ports/quazip/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/q-/quazip.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/quazip/vcpkg.json b/ports/quazip/vcpkg.json index 89ee6996c8d2d0..61cd5cd68ad7cc 100644 --- a/ports/quazip/vcpkg.json +++ b/ports/quazip/vcpkg.json @@ -1,8 +1,10 @@ { "name": "quazip", "version": "1.3", + "port-version": 1, "description": "Qt/C++ wrapper over minizip", "homepage": "https://stachenov.github.io/quazip/", + "license": "LGPL-2.1-or-later", "dependencies": [ "qt5-base", { diff --git a/versions/baseline.json b/versions/baseline.json index cde931096ddb24..08e3ca368f6843 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6138,7 +6138,7 @@ }, "quazip": { "baseline": "1.3", - "port-version": 0 + "port-version": 1 }, "quickfast": { "baseline": "1.5", diff --git a/versions/q-/quazip.json b/versions/q-/quazip.json index 7433ea291d4d61..3c97a6643c2ee3 100644 --- a/versions/q-/quazip.json +++ b/versions/q-/quazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41bc9e2c011d91275f6b44d638257f88ee6223c8", + "version": "1.3", + "port-version": 1 + }, { "git-tree": "92000bba1473465da5e5de8864acc0e49250b2f2", "version": "1.3", From a68c22c9a76cb4a1641f5cb5bb280cd64c65a5a3 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 19 Aug 2022 01:38:09 +0800 Subject: [PATCH 419/791] [vcpkg] Fix typo (#26388) --- scripts/cmake/vcpkg_find_acquire_program.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 8fa5c184887fa0..58b3d7039715a7 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -564,7 +564,7 @@ function(vcpkg_find_acquire_program program) endif() set(version_command --version) else() - message(FATAL "unknown tool ${program} -- unable to acquire.") + message(FATAL_ERROR "unknown tool ${program} -- unable to acquire.") endif() if("${program_name}" STREQUAL "") From 99c3325e98cccb680a4dac1bb4b3266c8ec8195a Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 19 Aug 2022 01:39:56 +0800 Subject: [PATCH 420/791] [gmp] Fix usage (#26306) * Add config.cmake.in * add port version * Add new line in the end of the file * Add license * update * add usage file --- ports/gmp/portfile.cmake | 2 +- ports/gmp/usage | 11 +++++++++++ ports/gmp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/g-/gmp.json | 5 +++++ 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 ports/gmp/usage diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 92c38bf7d0af25..36a19daf0c4b7e 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -81,4 +81,4 @@ 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 "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/gmp/usage b/ports/gmp/usage new file mode 100644 index 00000000000000..c8ff10a975d4ac --- /dev/null +++ b/ports/gmp/usage @@ -0,0 +1,11 @@ +The package gmp can be imported via CMake FindPkgConfig module: + + # gmp + find_package(PkgConfig REQUIRED) + pkg_check_modules(gmp REQUIRED IMPORTED_TARGET gmp) + target_link_libraries(main PkgConfig::gmp) + + # gmpxx + find_package(PkgConfig REQUIRED) + pkg_check_modules(gmpxx REQUIRED IMPORTED_TARGET gmpxx) + target_link_libraries(main PkgConfig::gmpxx) diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index e238d06fe98ade..c30e55be5cbff3 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 11, + "port-version": 12, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", + "license": "LGPL-3.0-only OR GPL-2.0-only", "dependencies": [ { "name": "gmp", diff --git a/versions/baseline.json b/versions/baseline.json index 08e3ca368f6843..b7b1eb2620fc2b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2634,7 +2634,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 11 + "port-version": 12 }, "gmsh": { "baseline": "4.9.0", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 340b3d7eae4d05..76537850b81129 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53a7476d7dc1a0a00be2ef9578ba87c3bc13f06f", + "version": "6.2.1", + "port-version": 12 + }, { "git-tree": "678326aeaf5a7fed7d24a2184cb0d483336cac74", "version": "6.2.1", From a2968fdd92fba1ae294162713e1d3c6bc427f6e5 Mon Sep 17 00:00:00 2001 From: alex-tdrn Date: Thu, 18 Aug 2022 19:44:46 +0200 Subject: [PATCH 421/791] [tracy] update to 0.8.2 (#26200) * [tracy] update to 0.8.2 * rever rename of capstone patch * add back newlines * update versions * revert removal of vcxproj patch * fixup vcxproj vcpkg patch * update git-tree hash --- ports/tracy/001-fix-vcxproj-vcpkg.patch | 18 +++++++++--------- ports/tracy/portfile.cmake | 4 ++-- ports/tracy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tracy.json | 5 +++++ 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ports/tracy/001-fix-vcxproj-vcpkg.patch b/ports/tracy/001-fix-vcxproj-vcpkg.patch index cef0a0ad22664a..f712a4974dde15 100644 --- a/ports/tracy/001-fix-vcxproj-vcpkg.patch +++ b/ports/tracy/001-fix-vcxproj-vcpkg.patch @@ -1,44 +1,44 @@ diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj -index 8215cc7..f427953 100644 +index 7be39025..ddb49fbc 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj -@@ -57,7 +57,7 @@ +@@ -60,7 +60,7 @@ Disabled true _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) -- ..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) +- ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true false true -@@ -67,9 +67,8 @@ +@@ -70,9 +70,8 @@ Fast - brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows -- ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib true -@@ -83,7 +82,7 @@ +@@ -86,7 +85,7 @@ true true NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;IMGUI_ENABLE_FREETYPE;%(PreprocessorDefinitions) -- ..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) +- ..\..\..\imgui;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) + ..\..\..\imgui;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 -@@ -94,9 +93,8 @@ +@@ -97,9 +96,8 @@ true true - brotlicommon-static.lib;brotlidec-static.lib;ws2_32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) + ws2_32.lib;%(AdditionalDependencies) Windows -- ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib +- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib true diff --git a/ports/tracy/portfile.cmake b/ports/tracy/portfile.cmake index e687dd3a2f1be9..2c01885ab7a503 100644 --- a/ports/tracy/portfile.cmake +++ b/ports/tracy/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfpld/tracy - REF 80f6a93da79af94fc4604e37439f5a75d5e7dfbd - SHA512 80d24fd969a9f8ac000b127c586745c85239139c50f6aacf625cea50551303031a7e14da01fd96a0e17d59ea639019cab119b76945e96cb6e7cfc7e5399252f8 + REF a8511d357650282c6915f7aa9775e9c4945e42b5 + SHA512 6e0ff0be7621490b607eaae46d4ec13ea66b0061ed580c99d75eda3a7c9479b34c70da9ad844bd4a05e329bb40cebf48e7c6bab05d2a946d56b2d432c7ddc125 HEAD_REF master PATCHES 001-fix-vcxproj-vcpkg.patch diff --git a/ports/tracy/vcpkg.json b/ports/tracy/vcpkg.json index 8e6345964ce614..f507334a33e454 100644 --- a/ports/tracy/vcpkg.json +++ b/ports/tracy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tracy", - "version-semver": "0.8.1", + "version-semver": "0.8.2", "description": "A real time, nanosecond resolution, remote telemetry, hybrid frame and sampling profiler for games and other applications.", "homepage": "https://github.com/wolfpld/tracy", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index b7b1eb2620fc2b..bc523e02f00856 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7237,7 +7237,7 @@ "port-version": 3 }, "tracy": { - "baseline": "0.8.1", + "baseline": "0.8.2", "port-version": 0 }, "transwarp": { diff --git a/versions/t-/tracy.json b/versions/t-/tracy.json index 17181457306977..c0f531e2f06222 100644 --- a/versions/t-/tracy.json +++ b/versions/t-/tracy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fac1fe3f245ef69b648a6846e631795fe4ee5eb", + "version-semver": "0.8.2", + "port-version": 0 + }, { "git-tree": "a703a83cacfbb242afd294baeb87ca1a497c5bf1", "version-semver": "0.8.1", From 52bd38fdf0d826a10fc2e8521b28525e785e810a Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 18 Aug 2022 19:59:28 +0200 Subject: [PATCH 422/791] [civetweb] use newer scripts (#26250) * [civetweb] use vcpkg-cmake * v db * add patch to fix build * v db --- ports/civetweb/disable_warnings.patch | 37 +++++++++++++++++++++++++++ ports/civetweb/portfile.cmake | 18 +++++++------ ports/civetweb/vcpkg.json | 12 ++++++++- versions/baseline.json | 2 +- versions/c-/civetweb.json | 5 ++++ 5 files changed, 64 insertions(+), 10 deletions(-) create mode 100644 ports/civetweb/disable_warnings.patch diff --git a/ports/civetweb/disable_warnings.patch b/ports/civetweb/disable_warnings.patch new file mode 100644 index 00000000000000..8b10a435d08242 --- /dev/null +++ b/ports/civetweb/disable_warnings.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1eb391f2c..2665fa73e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -360,6 +360,7 @@ if (CIVETWEB_ENABLE_CXX) + else() + add_cxx_compiler_flag(-std=${CIVETWEB_CXX_STANDARD}) + endif() ++ if(0) + add_cxx_compiler_flag(-Wall) + add_cxx_compiler_flag(-Wextra) + add_cxx_compiler_flag(-Wshadow) +@@ -377,6 +378,7 @@ if (CIVETWEB_ENABLE_CXX) + add_cxx_compiler_flag(-Werror) + add_cxx_compiler_flag(/WX) + endif() ++ endif() + add_cxx_compiler_flag(-pedantic-errors) + add_cxx_compiler_flag(-fvisibility=hidden) + add_cxx_compiler_flag(-fstack-protector-strong RELEASE) +@@ -403,6 +405,7 @@ endif() + + if (NOT ZEPHYR) + #Warnings: enable everything ++ if(0) + add_c_compiler_flag(-Wall) + add_c_compiler_flag(-Wextra) + add_c_compiler_flag(-Wshadow) +@@ -422,7 +425,7 @@ if (NOT ZEPHYR) + add_c_compiler_flag(-Wno-format-nonliteral) # printf(myFormatStringVar, ...) + add_c_compiler_flag(-Wno-cast-qual) # const cast + add_c_compiler_flag(/Wd4820) # padding +- ++ endif() + add_c_compiler_flag(-pedantic-errors) + add_c_compiler_flag(-fvisibility=hidden) + add_c_compiler_flag(-fstack-protector-strong RELEASE) diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 1797bf08356995..e568049d0df748 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15 SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d HEAD_REF master + PATCHES + disable_warnings.patch # cl will simply ignore the other invalid options. ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -13,9 +15,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ssl CIVETWEB_ENABLE_SSL ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - # PREFER_NINJA - See https://github.com/civetweb/civetweb/issues/1024 +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCIVETWEB_BUILD_TESTING=OFF -DCIVETWEB_ENABLE_DEBUG_TOOLS=OFF @@ -25,17 +26,18 @@ vcpkg_configure_cmake( -DCIVETWEB_ENABLE_SERVER_EXECUTABLE=OFF -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF -DCIVETWEB_ENABLE_WEBSOCKETS=ON + -DCIVETWEB_ALLOW_WARNINGS=ON ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/civetweb) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/civetweb) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json index e804454c36c09e..98ce11d2235b86 100644 --- a/ports/civetweb/vcpkg.json +++ b/ports/civetweb/vcpkg.json @@ -1,10 +1,20 @@ { "name": "civetweb", "version": "1.15", - "port-version": 1, + "port-version": 2, "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "ssl": { "description": "Enable SSL support", diff --git a/versions/baseline.json b/versions/baseline.json index bc523e02f00856..622bd184cc9908 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1402,7 +1402,7 @@ }, "civetweb": { "baseline": "1.15", - "port-version": 1 + "port-version": 2 }, "cjson": { "baseline": "1.7.15", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index d3c12485555410..07285a0c432152 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5c4ed510288187d465737a301891b1101d6c373", + "version": "1.15", + "port-version": 2 + }, { "git-tree": "0e09fcaf964728e71394be1fc43d018fcde2e355", "version": "1.15", From 39b46237e4cee57c561665c2fcd5bc6f7bb821d6 Mon Sep 17 00:00:00 2001 From: Lanyi Date: Thu, 18 Aug 2022 21:58:38 +0200 Subject: [PATCH 423/791] [detours] Add usage tip for detours package (#26398) * add detours usage * detours x-add-version --- ports/detours/usage | 7 +++++++ ports/detours/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/detours.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 ports/detours/usage diff --git a/ports/detours/usage b/ports/detours/usage new file mode 100644 index 00000000000000..00f978fb68a468 --- /dev/null +++ b/ports/detours/usage @@ -0,0 +1,7 @@ +detours can be used from CMake via: + + find_path(DETOURS_INCLUDE_DIRS "detours/detours.h") + find_library(DETOURS_LIBRARY detours REQUIRED) + + target_include_directories(main PRIVATE ${DETOURS_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${DETOURS_LIBRARY}) diff --git a/ports/detours/vcpkg.json b/ports/detours/vcpkg.json index ba134218d1183f..05c99034ce7795 100644 --- a/ports/detours/vcpkg.json +++ b/ports/detours/vcpkg.json @@ -1,7 +1,7 @@ { "name": "detours", "version": "4.0.1", - "port-version": 5, + "port-version": 6, "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", "homepage": "https://github.com/microsoft/Detours", "supports": "windows" diff --git a/versions/baseline.json b/versions/baseline.json index 622bd184cc9908..bfb8a5430268f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1870,7 +1870,7 @@ }, "detours": { "baseline": "4.0.1", - "port-version": 5 + "port-version": 6 }, "devicenameresolver": { "baseline": "2016-06-26", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index b868ac038c5fd5..e374c0c66be828 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c418a44692bd9eb06163e66ea779dfd57b84e07", + "version": "4.0.1", + "port-version": 6 + }, { "git-tree": "9dc31719cf3c251f0530bf8ddb5c6131590386da", "version": "4.0.1", From 571a0551ebab159fd460cb1534f6c820fcd6565a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:01:55 +0000 Subject: [PATCH 424/791] [opus/x265] Fix version in pkgconfig (#26389) * [opus/x265] Fix version in pkgconfig * version-string->version * version * x265 license * version * version --- ports/opus/fix-pkgconfig-version.patch | 13 ++++++ ports/opus/portfile.cmake | 59 +++++++++++++------------- ports/opus/vcpkg.json | 15 ++++++- ports/x265/fix-pkgconfig-version.patch | 13 ++++++ ports/x265/portfile.cmake | 2 + ports/x265/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/o-/opus.json | 5 +++ versions/x-/x265.json | 5 +++ 9 files changed, 85 insertions(+), 35 deletions(-) create mode 100644 ports/opus/fix-pkgconfig-version.patch create mode 100644 ports/x265/fix-pkgconfig-version.patch diff --git a/ports/opus/fix-pkgconfig-version.patch b/ports/opus/fix-pkgconfig-version.patch new file mode 100644 index 00000000000000..e513b6199a46a4 --- /dev/null +++ b/ports/opus/fix-pkgconfig-version.patch @@ -0,0 +1,13 @@ +diff --git a/opus_functions.cmake b/opus_functions.cmake +index a3ac1c0..ef2d4c0 100644 +--- a/opus_functions.cmake ++++ b/opus_functions.cmake +@@ -43,6 +43,8 @@ function(get_library_version OPUS_LIBRARY_VERSION OPUS_LIBRARY_VERSION_MAJOR) + endfunction() + + function(get_package_version PACKAGE_VERSION) ++ set(PACKAGE_VERSION "0" CACHE STRING "opus package version") ++ return() + find_package(Git) + if(Git_FOUND AND EXISTS "${CMAKE_CURRENT_LIST_DIR}/.git") + execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --match "v*" diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index b2e1e3807b04ee..a9782d883682a5 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -1,43 +1,44 @@ vcpkg_from_github( - OUT_SOURCE_PATH - SOURCE_PATH - REPO - xiph/opus - REF - 5c94ec3205c30171ffd01056f5b4622b7c0ab54c - SHA512 - 2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea - HEAD_REF - master) + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/opus + REF 5c94ec3205c30171ffd01056f5b4622b7c0ab54c + SHA512 2423b1fc86d5b46c32d8e3bde5fc2b410a5c25c001995ce234a94a3a6c7a8b1446fdf19eafe9d6a8a7356fe0857697053db5eb8380d18f8111818aa770b4c4ea + HEAD_REF master + PATCHES fix-pkgconfig-version.patch +) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - avx AVX_SUPPORTED + FEATURES + avx AVX_SUPPORTED ) if(VCPKG_TARGET_IS_MINGW) - set(STACK_PROTECTOR OFF) - string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0") - string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0") + set(STACK_PROTECTOR OFF) + string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0") + string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0") else() - set(STACK_PROTECTOR ON) + set(STACK_PROTECTOR ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR} - PREFER_NINJA) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Opus) + -DPACKAGE_VERSION=1.3.1 + -DOPUS_STACK_PROTECTOR=${STACK_PROTECTOR} + -DOPUS_INSTALL_PKG_CONFIG_MODULE=ON + -DOPUS_INSTALL_CMAKE_CONFIG_MODULE=ON + -DOPUS_BUILD_PROGRAMS=OFF + -DOPUS_BUILD_TESTING=OFF +) +vcpkg_cmake_install() vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Opus) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) -file(INSTALL - ${SOURCE_PATH}/COPYING - DESTINATION - ${CURRENT_PACKAGES_DIR}/share/opus - RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opus/vcpkg.json b/ports/opus/vcpkg.json index f1ea43d6952d02..e56ce6f8027b4d 100644 --- a/ports/opus/vcpkg.json +++ b/ports/opus/vcpkg.json @@ -1,9 +1,20 @@ { "name": "opus", - "version-string": "1.3.1", - "port-version": 6, + "version": "1.3.1", + "port-version": 7, "description": "Totally open, royalty-free, highly versatile audio codec", "homepage": "https://github.com/xiph/opus", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "avx": { "description": "Builds the library with avx instruction set" diff --git a/ports/x265/fix-pkgconfig-version.patch b/ports/x265/fix-pkgconfig-version.patch new file mode 100644 index 00000000000000..f5c3d436643dfb --- /dev/null +++ b/ports/x265/fix-pkgconfig-version.patch @@ -0,0 +1,13 @@ +diff --git a/source/cmake/version.cmake b/source/cmake/version.cmake +index b1e995f..d7df148 100644 +--- a/source/cmake/version.cmake ++++ b/source/cmake/version.cmake +@@ -7,7 +7,7 @@ find_package(Git QUIET) # present in 2.8.8 + + # defaults, in case everything below fails + set(X265_VERSION "unknown") +-set(X265_LATEST_TAG "0.0") ++set(X265_LATEST_TAG "0.0" CACHE STRING "x265 version") + set(X265_TAG_DISTANCE "0") + + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.hg_archival.txt) diff --git a/ports/x265/portfile.cmake b/ports/x265/portfile.cmake index 52a111ad753021..4aace861c8942a 100644 --- a/ports/x265/portfile.cmake +++ b/ports/x265/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES disable-install-pdb.patch + fix-pkgconfig-version.patch ) set(ASSEMBLY_OPTIONS "-DENABLE_ASSEMBLY=OFF") @@ -22,6 +23,7 @@ vcpkg_cmake_configure( ${ASSEMBLY_OPTIONS} -DENABLE_SHARED=${ENABLE_SHARED} -DENABLE_LIBNUMA=OFF + -DX265_LATEST_TAG=3.4 OPTIONS_DEBUG -DENABLE_CLI=OFF MAYBE_UNUSED_VARIABLES diff --git a/ports/x265/vcpkg.json b/ports/x265/vcpkg.json index 99242f2b52d625..c859dc260ef6c2 100644 --- a/ports/x265/vcpkg.json +++ b/ports/x265/vcpkg.json @@ -1,10 +1,10 @@ { "name": "x265", "version": "3.4", - "port-version": 6, + "port-version": 7, "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", "homepage": "https://github.com/videolan/x265", - "license": "GPL-2.0", + "license": "GPL-2.0-or-later", "supports": "!(uwp | arm)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index bfb8a5430268f8..6d967889aa645e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5330,7 +5330,7 @@ }, "opus": { "baseline": "1.3.1", - "port-version": 6 + "port-version": 7 }, "opusfile": { "baseline": "0.12", @@ -7714,7 +7714,7 @@ }, "x265": { "baseline": "3.4", - "port-version": 6 + "port-version": 7 }, "xalan-c": { "baseline": "1.12", diff --git a/versions/o-/opus.json b/versions/o-/opus.json index bdd667ec3e30a0..e9dfc1e319f0a1 100644 --- a/versions/o-/opus.json +++ b/versions/o-/opus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad2b9149564516603dab6b996af3d4bc7ba29017", + "version": "1.3.1", + "port-version": 7 + }, { "git-tree": "e718de4be5f3dcb0e0c7922a9ef7ef13bf5148b3", "version-string": "1.3.1", diff --git a/versions/x-/x265.json b/versions/x-/x265.json index cfa7e14a77da0c..29999f52a41522 100644 --- a/versions/x-/x265.json +++ b/versions/x-/x265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "994e11b88e86c790b503ec381185f33833b351f9", + "version": "3.4", + "port-version": 7 + }, { "git-tree": "15ee257957dfa5a194cf602c160713369b7c313a", "version": "3.4", From 727bdba9a3765a181cb6be9cb1f6aa01f2c2b5df Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Fri, 19 Aug 2022 10:15:25 +1000 Subject: [PATCH 425/791] [inih] Upgrade from r51 to r56 (#25879) * [ports/inih/{portfile.cmake,vcpkg.json}] Upgrade from r51 to r56 * [ports/inih] Upgrade to latest vcpkg recommendations * [ports/inih/CMakeLists.txt] Export targets (following `ports/openctm/CMakeLists.txt` template) * Thomas1664's nitpicks agreed on by BillyONeal. * Fix vcpkg_cmake_config_fixup call and add usage. * Hook up with_INIReader * Version DB oops Co-authored-by: Billy Robert O'Neal III --- ports/inih/CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++------ ports/inih/portfile.cmake | 32 +++++++++++++++------ ports/inih/vcpkg.json | 22 ++++++++++++-- ports/minio-cpp/vcpkg.json | 8 +++++- versions/baseline.json | 6 ++-- versions/i-/inih.json | 5 ++++ versions/m-/minio-cpp.json | 5 ++++ 7 files changed, 112 insertions(+), 25 deletions(-) diff --git a/ports/inih/CMakeLists.txt b/ports/inih/CMakeLists.txt index 6601e543af3099..184c0c4f81e64a 100644 --- a/ports/inih/CMakeLists.txt +++ b/ports/inih/CMakeLists.txt @@ -1,15 +1,56 @@ -project(inih) +cmake_minimum_required(VERSION 3.19) +project( + inih + VERSION 56 + LANGUAGES C CXX) -set(SOURCES ini.c cpp/INIReader.cpp) -set(HEADERS ini.h cpp/INIReader.h) +set(Header_Files "ini.h") +set(Source_Files "ini.c") -add_library(inih ${SOURCES}) +# TODO: Put this as vcpkg-feature before `project(` so can do `LANGUAGES C` if false +option(with_INIReader "build the C++ library" OFF) +if (with_INIReader) + list(APPEND Header_Files "cpp/INIReader.h") + list(APPEND Source_Files "cpp/INIReader.cpp") +endif (with_INIReader) + +add_library("${PROJECT_NAME}" "${Header_Files}" "${Source_Files}") + +include(GNUInstallDirs) +target_include_directories( + "${PROJECT_NAME}" + PUBLIC + "$" + "$" +) +target_compile_features("${PROJECT_NAME}" PRIVATE c_std_90) +set_target_properties("${PROJECT_NAME}" PROPERTIES C_VISIBILITY_PRESET hidden + PUBLIC_HEADER "${Header_Files}") install( - TARGETS inih - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + TARGETS "${PROJECT_NAME}" + EXPORT "unofficial-${PROJECT_NAME}Config" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +include(CMakePackageConfigHelpers) +set(VERSION_FILE_PATH "${CMAKE_CURRENT_BINARY_DIR}/unofficial-${PROJECT_NAME}ConfigVersion.cmake") +write_basic_package_version_file( + "${VERSION_FILE_PATH}" + VERSION "${PROJECT_VERSION}" + COMPATIBILITY SameMajorVersion ) +install(FILES "${VERSION_FILE_PATH}" DESTINATION "share/unofficial-${PROJECT_NAME}") + +install(FILES ${Header_Files} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + +install( + EXPORT "unofficial-${PROJECT_NAME}Config" + FILE "unofficial-${PROJECT_NAME}Config.cmake" + NAMESPACE "unofficial::${PROJECT_NAME}::" + DESTINATION "share/unofficial-${PROJECT_NAME}") -install(FILES ${HEADERS} DESTINATION include) +export(PACKAGE "${PROJECT_NAME}") diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake index 471b35f86773a0..de15f762906fd4 100644 --- a/ports/inih/portfile.cmake +++ b/ports/inih/portfile.cmake @@ -3,20 +3,34 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO benhoyt/inih - REF d7f465792c0c7686b50ed45c9a435394ae418d3e # r51 - SHA512 f3b621225933d74e9b130957aab1d55a82f06fd836aace439f9192a393d82a446e9f2152bb617a73a1dc681a821fc31d217c41f38c8ef8eeef7ad64c3e274b5d + REF 5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b # r56 + SHA512 477a66643f6636a5826a1206c6588a12827e24a4a2609e11f0695888998e2bfcba8bdb2240c561404ee675bf4c72e85d7d008a1fbddb142c0d263b413de8d358 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cpp with_INIReader ) -vcpkg_install_cmake() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-inih) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/inih RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" [=[ +inih provides CMake targets: + find_package(unofficial-inih CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::inih::inih) +]=]) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/inih/vcpkg.json b/ports/inih/vcpkg.json index 5b137dcba4bc8c..5b76e98e6a3b10 100644 --- a/ports/inih/vcpkg.json +++ b/ports/inih/vcpkg.json @@ -1,6 +1,22 @@ { "name": "inih", - "version-string": "51", - "port-version": 1, - "description": "Simple .INI file parser" + "version": "56", + "description": "Simple .INI file parser", + "homepage": "https://github.com/benhoyt/inih", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cpp": { + "description": "Build the C++ library" + } + } } diff --git a/ports/minio-cpp/vcpkg.json b/ports/minio-cpp/vcpkg.json index 22e330ca6567f9..b207d4fa67dc2e 100644 --- a/ports/minio-cpp/vcpkg.json +++ b/ports/minio-cpp/vcpkg.json @@ -1,13 +1,19 @@ { "name": "minio-cpp", "version": "0.1.1", + "port-version": 1, "description": "The MinIO C++ Client SDK provides simple APIs to access any Amazon S3 compatible object storage", "homepage": "https://github.com/minio/minio-cpp", "license": "Apache-2.0", "supports": "!windows & !uwp", "dependencies": [ "curlpp", - "inih", + { + "name": "inih", + "features": [ + "cpp" + ] + }, "nlohmann-json", "openssl", "pugixml", diff --git a/versions/baseline.json b/versions/baseline.json index 6d967889aa645e..2f88646d7b40ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3021,8 +3021,8 @@ "port-version": 1 }, "inih": { - "baseline": "51", - "port-version": 1 + "baseline": "56", + "port-version": 0 }, "iniparser": { "baseline": "2020-04-06", @@ -4618,7 +4618,7 @@ }, "minio-cpp": { "baseline": "0.1.1", - "port-version": 0 + "port-version": 1 }, "minisat-master-keying": { "baseline": "2.3.6", diff --git a/versions/i-/inih.json b/versions/i-/inih.json index ef0781ca21a585..000f4f53b8b430 100644 --- a/versions/i-/inih.json +++ b/versions/i-/inih.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ccae9a4d18198ac2d9303cac12c4dbb1fbe0bf24", + "version": "56", + "port-version": 0 + }, { "git-tree": "de1d85a0ea62e95bd096ecff062115646742cf1e", "version-string": "51", diff --git a/versions/m-/minio-cpp.json b/versions/m-/minio-cpp.json index 50ef5890e0c09f..345558d6ef7e1e 100644 --- a/versions/m-/minio-cpp.json +++ b/versions/m-/minio-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c6bcc87e2a8548708c11f3e7c3148f1004d3146", + "version": "0.1.1", + "port-version": 1 + }, { "git-tree": "8442cf19a35307cd48476abbf05e85194509c7a2", "version": "0.1.1", From e99d9a4facea9d7e15a91212364d7a12762b7512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 19 Aug 2022 02:17:11 +0200 Subject: [PATCH 426/791] [shiftmedia-libgcrypt] new port (Windows fork of Libgcrypt) (#26364) * [shiftmedia-libgcrypt] new port * [shiftmedia-libgcrypt] add license * [shiftmedia-libgcrypt] fix formatting * [shiftmedia-libgcrypt] add version * [shiftmedia-libgcrypt] update to 1.10.1, also support UWP * [shiftmedia-libgcrypt] update version * [ci.baseline.txt] restore gpg-error running on CI * [libgpg-error] add TargetPlatformMinVersion * [libgpg-error] update versions * [shiftmedia-libgcrypt] fix supported platform * [shiftmedia-libgcrypt] fix missing Version in .pc * [shiftmedia-libgcrypt] update version * [shiftmedia-libgcrypt] remove leftover warning * [shiftmedia-libgcrypt] update version * Update shiftmedia-libgcrypt.json * Update libgpg-error.json * [shiftmedia-libgcrypt] install includes instead of moving them around in buildtree * [shiftmedia-libgcrypt] update version * [shiftmedia-libgcrypt] wrap paths in quotes Co-authored-by: Billy O'Neal * [shiftmedia-libgcrypt] support for Windows implies UWP Co-authored-by: Javier Matos Denizac * [shiftmedia-libgcrypt] update version * [shiftmedia-libgcrypt] use vcpkg_replace_string() instead of patches * [shiftmedia-libgcrypt] update version * [shiftmedia-libgcrypt] gpg-error already inupstream .pc as Requires.private * [shiftmedia-libgcrypt] -L${libdir} already in upstream .pc * [shiftmedia-libgcrypt] update version * [shiftmedia-libgcrypt] pass OutDir as property, no need to patch * [shiftmedia-libgcrypt] update version * [shiftmedia-libgcrypt] msbuild adds a subfolder to OutDir on UWP * [shiftmedia-libgcrypt] fix aclocal installation path * [shiftmedia-libgcrypt] update version Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Co-authored-by: Billy O'Neal Co-authored-by: Javier Matos Denizac --- .../TargetPlatformMinVersion.patch | 12 ++ ports/libgpg-error/portfile.cmake | 1 + ports/libgpg-error/vcpkg.json | 2 +- ports/shiftmedia-libgcrypt/portfile.cmake | 107 ++++++++++++++++++ ports/shiftmedia-libgcrypt/vcpkg.json | 11 ++ scripts/ci.baseline.txt | 3 +- versions/baseline.json | 6 +- versions/l-/libgpg-error.json | 5 + versions/s-/shiftmedia-libgcrypt.json | 9 ++ 9 files changed, 152 insertions(+), 4 deletions(-) create mode 100644 ports/libgpg-error/TargetPlatformMinVersion.patch create mode 100644 ports/shiftmedia-libgcrypt/portfile.cmake create mode 100644 ports/shiftmedia-libgcrypt/vcpkg.json create mode 100644 versions/s-/shiftmedia-libgcrypt.json diff --git a/ports/libgpg-error/TargetPlatformMinVersion.patch b/ports/libgpg-error/TargetPlatformMinVersion.patch new file mode 100644 index 00000000000000..fe8288ff3cda88 --- /dev/null +++ b/ports/libgpg-error/TargetPlatformMinVersion.patch @@ -0,0 +1,12 @@ +diff --git a/SMP/libgpg-error_winrt.vcxproj b/SMP/llibgpg-error_winrt.vcxproj +index e1acf679..f9c302be 100644 +--- a/SMP/libgpg-error_winrt.vcxproj ++++ b/SMP/libgpg-error_winrt.vcxproj +@@ -3,6 +3,7 @@ + + {AA4A762D-A8D7-4F68-9B79-FBE63C6BE105} + gpg-error ++ 10.0.17200.0 + + + diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index cc795c59daf03f..ef9bf510dd89fe 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -11,6 +11,7 @@ if(VCPKG_TARGET_IS_WINDOWS) PATCHES outdir.patch runtime.patch + TargetPlatformMinVersion.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index 8132e6b2d62f55..1af3d6592e1235 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgpg-error", "version": "1.42", - "port-version": 3, + "port-version": 4, "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "supports": "!(windows & (arm | arm64))" diff --git a/ports/shiftmedia-libgcrypt/portfile.cmake b/ports/shiftmedia-libgcrypt/portfile.cmake new file mode 100644 index 00000000000000..f8a0637a44ffaf --- /dev/null +++ b/ports/shiftmedia-libgcrypt/portfile.cmake @@ -0,0 +1,107 @@ +set(PACKAGE_VERSION_MAJOR 1) +set(PACKAGE_VERSION_MINOR 10) +set(PACKAGE_VERSION_PATCH 1) +set(PACKAGE_VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ShiftMediaProject/libgcrypt + REF libgcrypt-${PACKAGE_VERSION} + SHA512 6da8225ec73c51562cd76a0c0abc19506a7378750ed2a9ea45f03df3c8d7cf500840459deb9b0a694a5602fe77ee2b0dd5b2e37376745233350b0f218dff4f1c + HEAD_REF master +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(CONFIGURATION_RELEASE ReleaseDLL) + set(CONFIGURATION_DEBUG DebugDLL) +else() + set(CONFIGURATION_RELEASE Release) + set(CONFIGURATION_DEBUG Debug) +endif() + +if(VCPKG_TARGET_IS_UWP) + string(APPEND CONFIGURATION_RELEASE WinRT) + string(APPEND CONFIGURATION_DEBUG WinRT) +endif() + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") +else() + set(RuntimeLibraryExt "DLL") +endif() + +# patch output library file path and name; inject RuntimeLibrary property to control CRT linkage +foreach(PROPS IN ITEMS + "${SOURCE_PATH}/SMP/smp_deps.props" + "${SOURCE_PATH}/SMP/smp_winrt_deps.props") + vcpkg_replace_string( + "${PROPS}" + [=[_winrt]=] + [=[]=] + ) + vcpkg_replace_string( + "${PROPS}" + [=[lib$(RootNamespace)]=] + [=[$(RootNamespace)]=] + ) + vcpkg_replace_string( + "${PROPS}" + [=[]=] + [=[$(RuntimeLibrary)]=] + ) +endforeach() + +# patch gpg-error library file name +foreach(VCXPROJ IN ITEMS + "${SOURCE_PATH}/SMP/libgcrypt.vcxproj" + "${SOURCE_PATH}/SMP/libgcrypt_winrt.vcxproj") + vcpkg_replace_string( + "${VCXPROJ}" + "_winrt.lib" + ".lib" + ) + vcpkg_replace_string( + "${VCXPROJ}" + "libgpg-error" + "gpg-error" + ) +endforeach() + +vcpkg_install_msbuild( + USE_VCPKG_INTEGRATION + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH SMP/libgcrypt.sln + PLATFORM ${TRIPLET_SYSTEM_ARCH} + LICENSE_SUBPATH COPYING.LIB + RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} + SKIP_CLEAN + OPTIONS /p:OutDir=..\\msvc + OPTIONS_DEBUG "/p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt}" + OPTIONS_RELEASE "/p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt}" +) + +get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) +if(VCPKG_TARGET_IS_UWP) + set(WINRT_SUBFOLDER libgcrypt_winrt) +endif() +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/${WINRT_SUBFOLDER}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(LIBGCRYPT_CONFIG_LIBS "-lgcrypt") +configure_file("${SOURCE_PATH}/src/libgcrypt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libgcrypt.pc" @ONLY) + +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/../include") +set(LIBGCRYPT_CONFIG_LIBS "-lgcryptd") +configure_file("${SOURCE_PATH}/src/libgcrypt.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libgcrypt.pc" @ONLY) + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/src/libgcrypt.m4" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libgcrypt/aclocal/") + +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/COPYING.LIB" "${CURRENT_PACKAGES_DIR}/debug/lib/COPYING.LIB") diff --git a/ports/shiftmedia-libgcrypt/vcpkg.json b/ports/shiftmedia-libgcrypt/vcpkg.json new file mode 100644 index 00000000000000..10e7530a2f8df0 --- /dev/null +++ b/ports/shiftmedia-libgcrypt/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "shiftmedia-libgcrypt", + "version": "1.10.1", + "description": "An unofficial LibGCrypt with added custom native Visual Studio project build tools. LibGCrypt", + "homepage": "https://github.com/ShiftMediaProject/libgcrypt", + "license": "LGPL-2.1-only", + "supports": "windows", + "dependencies": [ + "libgpg-error" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d8db40c7c89424..7c9c6e600250c5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -432,9 +432,8 @@ libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail -# the msbuild for libgpg:x64-uwp and libgpg-error:x64-uwp are broken on VS2022 due to TargetPlatformMinVersion not existing +# the msbuild for libgpg:x64-uwp is broken on VS2022 due to TargetPlatformMinVersion not existing libgpg:x64-uwp=fail -libgpg-error:x64-uwp=fail libgxps:x64-windows-static=fail libgxps:x64-windows-static-md=fail libhdfs3:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2f88646d7b40ec..eb454653d3fee3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3674,7 +3674,7 @@ }, "libgpg-error": { "baseline": "1.42", - "port-version": 3 + "port-version": 4 }, "libgpiod": { "baseline": "1.6.3", @@ -6604,6 +6604,10 @@ "baseline": "1.5.0", "port-version": 3 }, + "shiftmedia-libgcrypt": { + "baseline": "1.10.1", + "port-version": 0 + }, "shiva": { "baseline": "1.0", "port-version": 5 diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index 7b6379058fd517..0b83c5910dc0cb 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "728a8999d1083dc72eae0612669f0c34075a3f01", + "version": "1.42", + "port-version": 4 + }, { "git-tree": "1ced42ca6160e2283326366e1c1132fe50acfb97", "version": "1.42", diff --git a/versions/s-/shiftmedia-libgcrypt.json b/versions/s-/shiftmedia-libgcrypt.json new file mode 100644 index 00000000000000..f0f6d053b443ef --- /dev/null +++ b/versions/s-/shiftmedia-libgcrypt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f69b9722e8207f50879ed85697253223eb014a9c", + "version": "1.10.1", + "port-version": 0 + } + ] +} From 8ffacb09447634ef3ec3268a3ff920f13d23f5e9 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Sat, 20 Aug 2022 02:43:44 +0900 Subject: [PATCH 427/791] [pango] Update to 1.50.9 (#26414) * [pango] Update to 1.50.9 (microsoft#26413) * [pango] Regenerate version regisitry (microsoft#26413) --- ports/pango/portfile.cmake | 4 ++-- ports/pango/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pango.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 6c434e156fa734..0132f369f8d580 100644 --- a/ports/pango/portfile.cmake +++ b/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 a2ccd36a42e039d3600b04fe37fdc47f267d90c7 #v1.50.7 - SHA512 1116080b98e46eb436b5a8712f1f16b3debd22e4e549b7ed74e5f37985644b30c4639cf248758f1d8e72581b7b2009aed95cab47781b09cb9234fcf03f2b425c + REF a3517dcc6de9bae1193075b7112aa7db97b39dcc #v1.50.9 + SHA512 d09bc672e65897f5a3deae45f6e7f91844fb6d72c43944d3480a4b9e84b43fcb0e701b0b84d864b15d8520287f6d0d02b489a42775df6746ffe6673588f8f05c HEAD_REF master # branch name ) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 3f181b2762b790..566a8a0bc8963c 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pango", - "version": "1.50.7", + "version": "1.50.9", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index eb454653d3fee3..cbc9c09cbf9584 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5393,7 +5393,7 @@ "port-version": 0 }, "pango": { - "baseline": "1.50.7", + "baseline": "1.50.9", "port-version": 0 }, "pangolin": { diff --git a/versions/p-/pango.json b/versions/p-/pango.json index 2cbeede2cef894..de2a65bc1c9584 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5c70fae168a14f944757f55afaeb847f1a0d026", + "version": "1.50.9", + "port-version": 0 + }, { "git-tree": "5275b5581f4cfc5ccb547a556f3affc4c92e05cd", "version": "1.50.7", From 7e1a0143ab1429c49336a94e33d9e2d9e5959338 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Fri, 19 Aug 2022 10:45:06 -0700 Subject: [PATCH 428/791] [libjpeg-turbo] Update to 2.1.4 (#26326) * update libjpeg-turbo to 2.1.4 * update baseline --- ports/libjpeg-turbo/portfile.cmake | 4 ++-- ports/libjpeg-turbo/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 6a3bd056b5ec56..063edfb5d37a21 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo - REF c5f269eb9665435271c05fbcaf8721fa58e9eafa # 2.1.3 - SHA512 5d1c3cbbc7628339cfedc0f81a65ceb972aba2b8ffcc72d001f87526d0ff468f83665c78165051aa95c39200d9aaa6aee76e01266a4ea9cddb678dc6ef17ec27 + REF 2.1.4 + SHA512 d3e92d614168355827e0ed884ff847cc7df8f6f1fb7b673c6c99afdf61fdfc0372afe5d30fdbf5e743335e2a7a27ca9f510c67d213e5cb2315a8d946e9414575 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 564f93079c1d0e..9fa07778dd641b 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libjpeg-turbo", - "version": "2.1.3", - "port-version": 3, + "version": "2.1.4", "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index cbc9c09cbf9584..78b6744dad04dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3761,8 +3761,8 @@ "port-version": 4 }, "libjpeg-turbo": { - "baseline": "2.1.3", - "port-version": 3 + "baseline": "2.1.4", + "port-version": 0 }, "libjuice": { "baseline": "1.0.3", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 6860f26b233171..5319e084450a22 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07c9848d16ee346b314e87e6c0d856bfb0745af9", + "version": "2.1.4", + "port-version": 0 + }, { "git-tree": "f3ab7c40b47aa03953467e7697d3eea7b60d624e", "version": "2.1.3", From c805a5311a6672560194c39ca9c295dd34bb319f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 19 Aug 2022 20:15:25 +0200 Subject: [PATCH 429/791] [x264] Update and fixes (#26086) * Avoid race in x264 install step * Drop pointless port pthread dependency * Update homepage and license * Revise portfile * Add 'tool' feature * Add clang-cl patch * Pass compiler and cross-build prefix * Update to r3095, follow pc file versioning * Add feature 'asm', enable it for arm64-windows * Update versions Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Billy O'Neal --- ports/x264/allow-clang-cl.patch | 16 ++++ ports/x264/configure-as.patch | 10 +++ ports/x264/parallel-install.patch | 14 +++ ports/x264/portfile.cmake | 138 +++++++++++++++++++----------- ports/x264/vcpkg.json | 37 ++++++-- versions/baseline.json | 4 +- versions/x-/x264.json | 5 ++ 7 files changed, 167 insertions(+), 57 deletions(-) create mode 100644 ports/x264/allow-clang-cl.patch create mode 100644 ports/x264/configure-as.patch create mode 100644 ports/x264/parallel-install.patch diff --git a/ports/x264/allow-clang-cl.patch b/ports/x264/allow-clang-cl.patch new file mode 100644 index 00000000000000..fd363b64ea1a24 --- /dev/null +++ b/ports/x264/allow-clang-cl.patch @@ -0,0 +1,16 @@ +diff --git a/configure b/configure +index 6f95e2314..e677e36f4 100644 +--- a/configure ++++ b/configure +@@ -606,9 +606,9 @@ if [[ $host_os = mingw* || $host_os = msys* || $host_os = cygwin* ]]; then + if cc_check '' -Qdiag-error:10006,10157 ; then + CHECK_CFLAGS="$CHECK_CFLAGS -Qdiag-error:10006,10157" + fi +- elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* ]]; then ++ elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* || "$cc_base" = clang-cl || "$cc_base" = clang-cl[\ .]* ]]; then + # Standard Microsoft Visual Studio + compiler=CL + compiler_style=MS ++ CFLAGS="$CPPFLAGS $CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" +- CFLAGS="$CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras" + cpp_check '' '' '_MSC_VER > 1800 || (_MSC_VER == 1800 && _MSC_FULL_VER >= 180030324)' || die "Microsoft Visual Studio support requires Visual Studio 2013 Update 2 or newer" diff --git a/ports/x264/configure-as.patch b/ports/x264/configure-as.patch new file mode 100644 index 00000000000000..725d7f98af7bb7 --- /dev/null +++ b/ports/x264/configure-as.patch @@ -0,0 +1,10 @@ +diff --git a/configure b/configure +index c987491..f29c3c1 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,5 @@ + #!/bin/bash ++test "${AS:-:}" = ":" && unset AS + + if test x"$1" = x"-h" -o x"$1" = x"--help" ; then + cat <> config.mak +- echo 'install: install-cli' >> config.mak ++ echo 'install:' >> config.mak ++ echo ' $(MAKE) install-cli' >> config.mak + fi + + if [ "$shared" = "yes" ]; then diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 922fed459bbd84..047a255dd8a424 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -1,36 +1,81 @@ -set(X264_VERSION 164) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mirror/x264 - REF 5db6aa6cab1b146e07b60cc1736a01f21da01154 - SHA512 d2cdd40d195fd6507abacc8b8810107567dff2c0a93424ba1eb00b544cb78a5430f00f9bcf8f19bd663ae77849225577da05bfcdb57948a8af9dc32a7c8b9ffd + REF baee400fa9ced6f5481a728138fed6e867b0ff7f # 0.164.3095 in pc file, to be updated below + SHA512 3c7147457cbe0fea20cf3ed8cf7bbdca9ac15060cf86f81b9b5b54b018f922964e91b3c38962c81fedef92bc5b14489e04d0966d03d2b7a85b4dabab6ad816a2 HEAD_REF stable PATCHES - "uwp-cflags.patch" + uwp-cflags.patch + parallel-install.patch + allow-clang-cl.patch + configure-as.patch # Ignore ':' from `vcpkg_configure_make` ) - -vcpkg_find_acquire_program(NASM) -get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) -vcpkg_add_to_path(${NASM_EXE_PATH}) - -if(VCPKG_TARGET_IS_WINDOWS) - z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) - z_vcpkg_determine_autotools_target_cpu(HOST_ARCH) - list(APPEND OPTIONS --build=${BUILD_ARCH}-pc-mingw32) - list(APPEND OPTIONS --host=${HOST_ARCH}-pc-mingw32) - - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - list(APPEND OPTIONS --disable-asm) +# Note on x264 versioning: +# The pc file exports "0.164." where is the number of commits. +# This must be fixed here because vcpkg uses a GH tarball instead of cloning the source. +# (The binary releases on https://artifacts.videolan.org/x264/ are named x264-r-.) +vcpkg_replace_string("${SOURCE_PATH}/version.sh" [[ver="x"]] [[ver="3095"]]) + +# Ensure that 'ENV{PATH}' leads to tool 'name' exactly at 'filepath'. +function(ensure_tool_in_path name filepath) + unset(program_found CACHE) + find_program(program_found "${name}" PATHS ENV PATH NO_DEFAULT_PATH NO_CACHE) + if(NOT filepath STREQUAL program_found) + cmake_path(GET filepath PARENT_PATH parent_path) + vcpkg_add_to_path(PREPEND "${parent_path}") endif() - - set(ENV{AS} "${NASM}") +endfunction() + +# Ensure that parent-scope variable 'var' doesn't contain a space, +# updating 'ENV{PATH}' and 'var' if needed. +function(transform_path_no_space var) + set(path "${${var}}") + if(path MATCHES " ") + cmake_path(GET path FILENAME program_name) + set("${var}" "${program_name}" PARENT_SCOPE) + ensure_tool_in_path("${program_name}" "${path}") + endif() +endfunction() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +transform_path_no_space(VCPKG_DETECTED_CMAKE_C_COMPILER) +set(ENV{CC} "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + +vcpkg_list(SET OPTIONS) +if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "([^\/]*-)gcc$") + vcpkg_list(APPEND OPTIONS "--cross-prefix=${CMAKE_MATCH_1}") +endif() + +vcpkg_list(SET EXTRA_ARGS) +set(nasm_archs x86 x64) +set(gaspp_archs arm arm64) +if(NOT "asm" IN_LIST FEATURES) + vcpkg_list(APPEND OPTIONS --disable-asm) +elseif(NOT "$ENV{AS}" STREQUAL "") + # Accept setting from triplet +elseif(VCPKG_TARGET_ARCHITECTURE IN_LIST nasm_archs) + vcpkg_find_acquire_program(NASM) + transform_path_no_space(NASM) + list(APPEND EXTRA_ARGS CONFIGURE_ENVIRONMENT_VARIABLES AS) + set(AS "${NASM}") # for CONFIGURE_ENVIRONMENT_VARIABLES + set(ENV{AS} "${NASM}") # for non-WIN32 +elseif(VCPKG_TARGET_ARCHITECTURE IN_LIST gaspp_archs AND VCPKG_TARGET_IS_WINDOWS AND VCPKG_HOST_IS_WINDOWS) + vcpkg_find_acquire_program(GASPREPROCESSOR) + list(FILTER GASPREPROCESSOR INCLUDE REGEX gas-preprocessor) + file(INSTALL "${GASPREPROCESSOR}" DESTINATION "${SOURCE_PATH}/tools" RENAME "gas-preprocessor.pl") +endif() + +vcpkg_list(SET OPTIONS_RELEASE) +if("tool" IN_LIST FEATURES) + vcpkg_list(APPEND OPTIONS_RELEASE --enable-cli) +else() + vcpkg_list(APPEND OPTIONS_RELEASE --disable-cli) endif() if(VCPKG_TARGET_IS_UWP) - list(APPEND OPTIONS --extra-cflags=-DWINAPI_FAMILY=WINAPI_FAMILY_APP --extra-cflags=-D_WIN32_WINNT=0x0A00) - list(APPEND OPTIONS --extra-ldflags=-APPCONTAINER --extra-ldflags=WindowsApp.lib) - list(APPEND OPTIONS --disable-asm) + list(APPEND OPTIONS --extra-cflags=-D_WIN32_WINNT=0x0A00) endif() if(VCPKG_TARGET_IS_LINUX) @@ -38,57 +83,52 @@ if(VCPKG_TARGET_IS_LINUX) endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" NO_ADDITIONAL_PATHS + DETERMINE_BUILD_TRIPLET + ${EXTRA_ARGS} OPTIONS ${OPTIONS} - --enable-strip --disable-lavf --disable-swscale --disable-avs --disable-ffms --disable-gpac --disable-lsmash + --disable-bashcompletion + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + --enable-strip + OPTIONS_DEBUG --enable-debug - + --disable-cli ) vcpkg_install_make() -if(NOT VCPKG_TARGET_IS_UWP) +if("tool" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES x264 AUTO_CLEAN) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(VCPKG_TARGET_IS_WINDOWS) - set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc") - if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") - endif() - if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc") - if(EXISTS "${pcfile}") - vcpkg_replace_string("${pcfile}" "-lx264" "-llibx264") - endif() +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/x264.pc" "-lx264" "-llibx264") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/x264.pc" "-lx264" "-llibx264") endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/lib/libx264.lib) - + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libx264.dll.lib" "${CURRENT_PACKAGES_DIR}/lib/libx264.lib") if (NOT VCPKG_BUILD_TYPE) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib") endif() elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # force U_STATIC_IMPLEMENTATION macro - file(READ ${CURRENT_PACKAGES_DIR}/include/x264.h HEADER_CONTENTS) - string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/x264.h "${HEADER_CONTENTS}") - + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/x264.h" "defined(U_STATIC_IMPLEMENTATION)" "1") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) endif() @@ -96,4 +136,4 @@ vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 194887fd91f529..c5834dd3669caf 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,13 +1,38 @@ { "name": "x264", - "version-string": "164-5db6aa6cab1b146", - "port-version": 5, + "version": "0.164.3095", "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", + "homepage": "https://www.videolan.org/developers/x264.html", + "license": "GPL-2.0-or-later", "dependencies": [ { - "name": "pthread", - "platform": "linux & osx" + "name": "vcpkg-cmake-get-vars", + "host": true } - ] + ], + "default-features": [ + "default-features" + ], + "features": { + "asm": { + "description": "Enable platform-specific assembly optimizations", + "supports": "x86 | x64 | (arm & !windows) | arm64" + }, + "default-features": { + "description": "Default set of features", + "dependencies": [ + { + "name": "x264", + "features": [ + "asm" + ], + "platform": "x86 | x64 | (arm & !windows) | arm64" + } + ] + }, + "tool": { + "description": "Build the command line tool", + "supports": "!uwp" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 78b6744dad04dd..796cfba601b791 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7713,8 +7713,8 @@ "port-version": 1 }, "x264": { - "baseline": "164-5db6aa6cab1b146", - "port-version": 5 + "baseline": "0.164.3095", + "port-version": 0 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index a4737cfcd02cc0..74d00740f5ad6d 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e369a0924f6b28e965b0e0c8f35264b7fd5efb7f", + "version": "0.164.3095", + "port-version": 0 + }, { "git-tree": "59d158d37c92adf78716bc36f80a82853149e368", "version-string": "164-5db6aa6cab1b146", From ad64f05e39f59152cacf43f5015a0f5439ce9bb6 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 20 Aug 2022 04:39:16 +0800 Subject: [PATCH 430/791] [wxwidgets] Add feature webview2 (#26405) * add feature webview * update --- ports/wxwidgets/portfile.cmake | 1 + ports/wxwidgets/vcpkg.json | 8 +++++++- versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 4d3aef825c8ce6..5bee63f32bfdac 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -36,6 +36,7 @@ vcpkg_check_features( FEATURES sound wxUSE_SOUND fonts wxUSE_PRIVATE_FONTS + webview wxUSE_WEBVIEW_EDGE ) set(OPTIONS_RELEASE "") diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index a44afe12e6d2cf..de290c2cf681f7 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version": "3.2.0", - "port-version": 1, + "port-version": 2, "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.", @@ -65,6 +65,12 @@ "platform": "!windows & !osx" } ] + }, + "webview": { + "description": "The Edge backend uses Microsoft's Edge WebView2", + "dependencies": [ + "webview2" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 796cfba601b791..85d421bdb651fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7706,7 +7706,7 @@ }, "wxwidgets": { "baseline": "3.2.0", - "port-version": 1 + "port-version": 2 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index b9ea32ebfa5d93..19a6f9457a0c8b 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39e102a05ff8b8e2f8a137b1f3bbe8e44f88a8ad", + "version": "3.2.0", + "port-version": 2 + }, { "git-tree": "0d78ddc0e26a382e0eeca82b767dfbed70dda82e", "version": "3.2.0", From 6e2d5acac0d8806c791be5851bce2c25637ac6e6 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 19 Aug 2022 13:40:12 -0700 Subject: [PATCH 431/791] [socket-io-client] Update to latest commit (#26421) * [socket-io-client] Update to latest commit * x-add-version * apply suggestion * x-add-version --- .../socket-io-client/fix-file-not-found.patch | 49 ------------------- ports/socket-io-client/portfile.cmake | 17 +++++-- ports/socket-io-client/vcpkg.json | 7 ++- versions/baseline.json | 4 +- versions/s-/socket-io-client.json | 5 ++ 5 files changed, 25 insertions(+), 57 deletions(-) delete mode 100644 ports/socket-io-client/fix-file-not-found.patch diff --git a/ports/socket-io-client/fix-file-not-found.patch b/ports/socket-io-client/fix-file-not-found.patch deleted file mode 100644 index b758c7a2956c5b..00000000000000 --- a/ports/socket-io-client/fix-file-not-found.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -31,20 +31,24 @@ add_definitions( - -D_WEBSOCKETPP_CPP11_FUNCTIONAL_ - ) - -+find_package(websocketpp CONFIG REQUIRED) -+find_package(asio CONFIG REQUIRED) -+find_package(RapidJSON CONFIG REQUIRED) -+ - add_library(sioclient ${ALL_SRC}) - target_include_directories(sioclient PRIVATE - ${CMAKE_CURRENT_LIST_DIR}/src -- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp -- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include -- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include - ) - - if (CMAKE_VERSION VERSION_GREATER "3.1") - set_property(TARGET sioclient PROPERTY CXX_STANDARD 11) - set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON) - else() - set_property(TARGET sioclient APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11") - endif() -+ -+target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson) -+ - if(BUILD_SHARED_LIBS) - set_target_properties(sioclient - PROPERTIES -@@ -56,16 +59,13 @@ if(OPENSSL_FOUND) - add_library(sioclient_tls ${ALL_SRC}) - target_include_directories(sioclient_tls PRIVATE - ${CMAKE_CURRENT_LIST_DIR}/src -- ${CMAKE_CURRENT_LIST_DIR}/lib/websocketpp -- ${CMAKE_CURRENT_LIST_DIR}/lib/rapidjson/include -- ${CMAKE_CURRENT_LIST_DIR}/lib/asio/asio/include - ${OPENSSL_INCLUDE_DIR} - ) - - if (CMAKE_VERSION VERSION_GREATER "3.1") - set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD 11) - set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD_REQUIRED ON) --target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} ) -+target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} websocketpp::websocketpp asio asio::asio rapidjson) - else() - set_property(TARGET sioclient_tls APPEND_STRING PROPERTY COMPILE_FLAGS "-std=c++11") - endif() diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake index c5a1dfb32ef2cc..a0f97dc5a5d26c 100644 --- a/ports/socket-io-client/portfile.cmake +++ b/ports/socket-io-client/portfile.cmake @@ -3,18 +3,27 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO socketio/socket.io-client-cpp - REF 3.1.0 - SHA512 a0adaa06ddb24297686a40b1e71a55bbab437093f828f76040c376b4adccb7d8b06eff4d8569dbde9b2e071257b3290e7e2bffd6354b33ecf67378ffa1d0cc13 + REF dbb4547d3160368feaaf55c3338ad085a8f968b8 + SHA512 cbb2a4742d16ba9ee72ca49a56605690ed620c978f51012e0d655a86b110a557b196ffc55af8b0440c1d7cd76d9dffe6f85abd0af300095608434eb9394dc68b HEAD_REF master - PATCHES - fix-file-not-found.patch ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DUSE_SUBMODULES=OFF + -DCMAKE_INSTALL_INCLUDEDIR=include ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME sioclient CONFIG_PATH lib/cmake/sioclient) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/sioclient/sioclientConfig.cmake" + "include(CMakeFindDependencyMacro)" + [[include(CMakeFindDependencyMacro) +find_dependency(websocketpp CONFIG) +find_dependency(asio CONFIG) +find_dependency(RapidJSON CONFIG) +find_dependency(OpenSSL)]]) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json index aa6a8e52a159d5..84ee82e7a9cc40 100644 --- a/ports/socket-io-client/vcpkg.json +++ b/ports/socket-io-client/vcpkg.json @@ -1,7 +1,6 @@ { "name": "socket-io-client", - "version": "3.1.0", - "port-version": 1, + "version-date": "2022-08-19", "description": "C++11 implementation of Socket.IO client", "homepage": "https://github.com/socketio/socket.io-client-cpp", "license": "MIT", @@ -12,6 +11,10 @@ "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "websocketpp" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 85d421bdb651fd..739874e26bcd09 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6717,8 +6717,8 @@ "port-version": 0 }, "socket-io-client": { - "baseline": "3.1.0", - "port-version": 1 + "baseline": "2022-08-19", + "port-version": 0 }, "sockpp": { "baseline": "0.7.1", diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index 97a122629ddcdc..fd92a4d62598bf 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4f6bebb98623c2bf8602d7538ae4c1d7de6c0ad", + "version-date": "2022-08-19", + "port-version": 0 + }, { "git-tree": "f31e0afc883eef287abf9b7914563cd10b331b86", "version": "3.1.0", From 2ca44de51706b23ca12c9eb1b2c56095927e3c16 Mon Sep 17 00:00:00 2001 From: Samuel Surtees <11887457+samsinsane@users.noreply.github.com> Date: Sat, 20 Aug 2022 06:42:29 +1000 Subject: [PATCH 432/791] Libswscale aarch64 fix (#26404) * [ffmpeg] Fix issue that prevents gas-preprocessor.pl from matching conditionals * [ffmpeg] x-add-version --- .../ffmpeg/0020-fix-aarch64-libswscale.patch | 28 +++++++++++++++++++ ports/ffmpeg/portfile.cmake | 1 + ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 ++++ 5 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 ports/ffmpeg/0020-fix-aarch64-libswscale.patch diff --git a/ports/ffmpeg/0020-fix-aarch64-libswscale.patch b/ports/ffmpeg/0020-fix-aarch64-libswscale.patch new file mode 100644 index 00000000000000..6019b06645544c --- /dev/null +++ b/ports/ffmpeg/0020-fix-aarch64-libswscale.patch @@ -0,0 +1,28 @@ +diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S +index af677afe6..f4b220fb6 100644 +--- a/libswscale/aarch64/yuv2rgb_neon.S ++++ b/libswscale/aarch64/yuv2rgb_neon.S +@@ -169,19 +169,19 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 + sqdmulh v26.8H, v26.8H, v0.8H // ((Y1*(1<<3) - y_offset) * y_coeff) >> 15 + sqdmulh v27.8H, v27.8H, v0.8H // ((Y2*(1<<3) - y_offset) * y_coeff) >> 15 + +-.ifc \ofmt,argb // 1 2 3 0 ++.ifc \ofmt,argb + compute_rgba v5.8B,v6.8B,v7.8B,v4.8B, v17.8B,v18.8B,v19.8B,v16.8B + .endif + +-.ifc \ofmt,rgba // 0 1 2 3 ++.ifc \ofmt,rgba + compute_rgba v4.8B,v5.8B,v6.8B,v7.8B, v16.8B,v17.8B,v18.8B,v19.8B + .endif + +-.ifc \ofmt,abgr // 3 2 1 0 ++.ifc \ofmt,abgr + compute_rgba v7.8B,v6.8B,v5.8B,v4.8B, v19.8B,v18.8B,v17.8B,v16.8B + .endif + +-.ifc \ofmt,bgra // 2 1 0 3 ++.ifc \ofmt,bgra + compute_rgba v6.8B,v5.8B,v4.8B,v7.8B, v18.8B,v17.8B,v16.8B,v19.8B + .endif + diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index f9aa7247c504af..c7dabdf4b1dbfc 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_from_github( ${PATCHES} 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch 0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch + 0020-fix-aarch64-libswscale.patch ) if (SOURCE_PATH MATCHES " ") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index b183bbac0bf6a6..d7adcd54329df0 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 15, + "port-version": 16, "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." diff --git a/versions/baseline.json b/versions/baseline.json index 739874e26bcd09..057ba1ceb90793 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2250,7 +2250,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 15 + "port-version": 16 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 5bebae04402092..94e5cb1e6dce6f 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0aee15f22c29078cc18d6324f3f622ef6e94deba", + "version": "4.4.1", + "port-version": 16 + }, { "git-tree": "d42747aed3213bf6d62a4a986fb915bdfd854a08", "version": "4.4.1", From 479e1bd846ec3c58aacf2e5b2152672de298c418 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 19 Aug 2022 13:44:44 -0700 Subject: [PATCH 433/791] [dxut, effects11] update ports for August 2022 release (#26403) * [dxut, effects11] update ports for August 2022 release * Update baseline --- ports/dxut/portfile.cmake | 13 ++++++++++--- ports/dxut/vcpkg.json | 12 ++++++++++-- ports/effects11/portfile.cmake | 6 +++--- ports/effects11/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/dxut.json | 5 +++++ versions/e-/effects11.json | 5 +++++ 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake index e38856c50611f4..a09a762c9d17ee 100644 --- a/ports/dxut/portfile.cmake +++ b/ports/dxut/portfile.cmake @@ -3,17 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/DXUT - REF may2022 - SHA512 ea8ba759666acb4520c2dc1754e937433a1c54f1c83fe15396c573a6513d9b3fd49d1712eae9fc42fff9cddc4f3a4a759a7fc99377ef9750c6c55813d8c90000 + REF aug2022 + SHA512 33552c4ced7a2e5653e3af9eda19dc48e3794c67e02b1588a96f2b964e552137930f5b6a9ff26b9377074137a743cbf7bd654b3d17bca442a7b667eff6d9eff8 HEAD_REF main ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dxtk DIRECTXTK_INTEGRATION +) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/dxut/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/dxut) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json index fad08c19dc42c1..326e63198ad343 100644 --- a/ports/dxut/vcpkg.json +++ b/ports/dxut/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dxut", - "version": "11.27", + "version": "11.28", "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications", "homepage": "https://github.com/Microsoft/DXUT", "documentation": "https://github.com/microsoft/DXUT/wiki", @@ -16,5 +16,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "dxtk": { + "description": "Support integration with DirectX Tool Kit for DX11", + "dependencies": [ + "directxtk" + ] + } + } } diff --git a/ports/effects11/portfile.cmake b/ports/effects11/portfile.cmake index c1c3e87d08237f..01b490e3f755c8 100644 --- a/ports/effects11/portfile.cmake +++ b/ports/effects11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/FX11 - REF may2022 - SHA512 e395071430d7e6cd717729846e8d0f44700185597684f722cceb084df2a89b89ef7c04b5dfe948790640134838f409f0a3071e5d74760f8a9fcd74b0840ce78c + REF aug2022 + SHA512 babb9fb5f2ee822d21e7262e4d0a9fce8383c2415d6c59f4101b782688ea4a7818411a922c60fc88da136bf427eec4e57da3610955d4cdbf11a77b61fd9bba14 HEAD_REF main ) @@ -13,7 +13,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/effects11/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/effects11) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json index bcabd7295ef34a..50a0d31da41a0e 100644 --- a/ports/effects11/vcpkg.json +++ b/ports/effects11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "effects11", - "version": "11.27", + "version": "11.28", "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.", "homepage": "https://github.com/Microsoft/FX11", "documentation": "https://github.com/microsoft/FX11/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index 057ba1ceb90793..94c8c287fe3247 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2021,7 +2021,7 @@ "port-version": 4 }, "dxut": { - "baseline": "11.27", + "baseline": "11.28", "port-version": 0 }, "eabase": { @@ -2073,7 +2073,7 @@ "port-version": 1 }, "effects11": { - "baseline": "11.27", + "baseline": "11.28", "port-version": 0 }, "effolkronium-random": { diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json index 487d9ab966bbda..1a3dc49f7c9b4a 100644 --- a/versions/d-/dxut.json +++ b/versions/d-/dxut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b3dc36eb04da0286e4e2c5515a07cf7dbda4c03", + "version": "11.28", + "port-version": 0 + }, { "git-tree": "5b6c7ea3b64d6446296a16c7ad5f8ebdeb2e9915", "version": "11.27", diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json index 7e1872b1f40b53..5c465e3d6471ea 100644 --- a/versions/e-/effects11.json +++ b/versions/e-/effects11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d625012c718899dec9245d795413c2e86b52906d", + "version": "11.28", + "port-version": 0 + }, { "git-tree": "8a08f12302be72c15cea701a71122e62f4b7df5a", "version": "11.27", From df75e76ff4c5296e81fe55f55979f9822a8e986b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 19 Aug 2022 22:53:12 +0200 Subject: [PATCH 434/791] [dpdk] Fix build, dependencies, usage (#26188) * Fix static-or-shared patch * Don't build docs for debug * Fix dependencies * Fix tools fixup * Usage is via 'pkg_check_modules' * Move docs * Update versions --- ...enable-either-static-or-shared-build.patch | 158 ++++++------------ ports/dpdk/fix-dependencies.patch | 65 +++++++ ports/dpdk/portfile.cmake | 46 ++--- ports/dpdk/unofficial-dpdk-config.cmake.in | 74 -------- ports/dpdk/usage | 10 +- ports/dpdk/vcpkg.json | 11 +- versions/baseline.json | 2 +- versions/d-/dpdk.json | 5 + 8 files changed, 163 insertions(+), 208 deletions(-) create mode 100644 ports/dpdk/fix-dependencies.patch delete mode 100644 ports/dpdk/unofficial-dpdk-config.cmake.in diff --git a/ports/dpdk/enable-either-static-or-shared-build.patch b/ports/dpdk/enable-either-static-or-shared-build.patch index c281894969bd1f..5ec8f581e0ca53 100644 --- a/ports/dpdk/enable-either-static-or-shared-build.patch +++ b/ports/dpdk/enable-either-static-or-shared-build.patch @@ -1,133 +1,81 @@ +diff --git a/config/meson.build b/config/meson.build +index 7134e80..a77f533 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -57,7 +57,9 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) + # driver .so files often depend upon the bus drivers for their connect bus, + # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need + # to be in the library path, so symlink the drivers from the main lib directory. +-if not is_windows ++if get_option('default_library') == 'static' ++ # skip ++elif not is_windows + meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', + get_option('libdir'), pmd_subdir_opt) + elif meson.version().version_compare('>=0.55.0') diff --git a/drivers/meson.build b/drivers/meson.build -index 1d8123b00c..2de654692d 100644 +index 1d8123b..36ab3c0 100644 --- a/drivers/meson.build +++ b/drivers/meson.build -@@ -126,14 +126,15 @@ foreach subpath:subdirs - if not build - break - endif -- if not is_variable('shared_rte_' + d) -+ if get_option('default_library') == 'static' and is_variable('static_rte_' + d) -+ static_deps += [get_variable('static_rte_' + d)] -+ elif get_option('default_library') == 'shared' and is_variable('shared_rte_' + d) -+ shared_deps += [get_variable('shared_rte_' + d)] -+ else - build = false - reason = 'missing internal dependency, "@0@"'.format(d) - message('Disabling @1@ [@2@]: missing internal dependency "@0@"' - .format(d, name, 'drivers/' + drv_path)) -- else -- shared_deps += [get_variable('shared_rte_' + d)] -- static_deps += [get_variable('static_rte_' + d)] - endif - endforeach - endif -@@ -158,6 +159,7 @@ foreach subpath:subdirs - - install_headers(headers) +@@ -180,7 +180,7 @@ foreach subpath:subdirs + include_directories: includes, + dependencies: static_deps, + c_args: cflags, +- install: true) ++ install: get_option('default_library') == 'static') -+ if get_option('default_library') == 'static' - # generate pmdinfo sources by building a temporary - # lib and then running pmdinfogen on the contents of - # that lib. The final lib reuses the object files and -@@ -220,6 +222,13 @@ foreach subpath:subdirs + # now build the shared driver + version_map = '@0@/@1@/version.map'.format(meson.current_source_dir(), drv_path) +@@ -220,6 +220,7 @@ foreach subpath:subdirs endif endif -+ static_dep = declare_dependency( -+ include_directories: includes, -+ dependencies: static_deps) -+ dpdk_drivers += static_lib -+ set_variable('static_@0@'.format(lib_name), static_dep) -+ -+ else ++ if get_option('default_library') == 'shared' shared_lib = shared_library(lib_name, sources, objects: objs, include_directories: includes, -@@ -237,14 +246,10 @@ foreach subpath:subdirs +@@ -237,9 +238,13 @@ foreach subpath:subdirs shared_dep = declare_dependency(link_with: shared_lib, include_directories: includes, dependencies: shared_deps) -- static_dep = declare_dependency( -- include_directories: includes, -- dependencies: static_deps) -+ set_variable('shared_@0@'.format(lib_name), shared_dep) ++ endif + static_dep = declare_dependency( + include_directories: includes, + dependencies: static_deps) ++ if get_option('default_library') == 'static' ++ shared_dep = static_dep ++ endif -- dpdk_drivers += static_lib -+ endif + dpdk_drivers += static_lib -- set_variable('shared_@0@'.format(lib_name), shared_dep) -- set_variable('static_@0@'.format(lib_name), static_dep) - dependency_name = ''.join(lib_name.split('rte_')) - if developer_mode - message('drivers/@0@: Defining dependency "@1@"'.format( -diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build -index 8e5e8c1b55..39593cd8a6 100644 ---- a/drivers/net/octeontx/base/meson.build -+++ b/drivers/net/octeontx/base/meson.build -@@ -10,7 +10,7 @@ sources = [ - depends = ['ethdev', 'mempool_octeontx'] - static_objs = [] - foreach d: depends -- if not is_variable('shared_rte_' + d) -+ if get_option('default_library') == 'shared' and not is_variable('shared_rte_' + d) - subdir_done() - endif - static_objs += get_variable('static_rte_' + d) diff --git a/lib/meson.build b/lib/meson.build -index 24adbe44c9..e614ec57af 100644 +index 24adbe4..eef6e93 100644 --- a/lib/meson.build +++ b/lib/meson.build -@@ -146,14 +146,15 @@ foreach l:libraries - if not build - break - endif -- if not is_variable('shared_rte_' + d) -+ if get_option('default_library') == 'static' -+ static_deps += [get_variable('static_rte_' + d)] -+ elif is_variable('shared_rte_' + d) -+ shared_deps += [get_variable('shared_rte_' + d)] -+ else - build = false - reason = 'missing internal dependency, "@0@"'.format(d) - message('Disabling @1@ [@2@]: missing internal dependency "@0@"' - .format(d, name, 'lib/' + l)) -- else -- shared_deps += [get_variable('shared_rte_' + d)] -- static_deps += [get_variable('static_rte_' + d)] - endif - endforeach - -@@ -185,6 +186,7 @@ foreach l:libraries - endif - cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=lib.' + l - -+ if get_option('default_library') == 'static' - # first build static lib - static_lib = static_library(libname, - sources, -@@ -246,6 +248,10 @@ foreach l:libraries +@@ -192,7 +192,7 @@ foreach l:libraries + c_args: cflags, + dependencies: static_deps, + include_directories: includes, +- install: true) ++ install: get_option('default_library') == 'static') + static_dep = declare_dependency( + include_directories: includes, + dependencies: static_deps) +@@ -246,6 +246,7 @@ foreach l:libraries output: name + '.sym_chk') endif -+ dpdk_static_libraries = [static_lib] + dpdk_static_libraries -+ set_variable('static_rte_' + name, static_dep) -+ -+ else ++ if get_option('default_library') == 'shared' shared_lib = shared_library(libname, sources, objects: objs, -@@ -262,10 +268,10 @@ foreach l:libraries +@@ -262,6 +263,9 @@ foreach l:libraries dependencies: shared_deps) dpdk_libraries = [shared_lib] + dpdk_libraries -- dpdk_static_libraries = [static_lib] + dpdk_static_libraries -- ++ else ++ shared_dep = static_dep ++ endif + dpdk_static_libraries = [static_lib] + dpdk_static_libraries + set_variable('shared_rte_' + name, shared_dep) -- set_variable('static_rte_' + name, static_dep) -+ -+ endif -+ - if developer_mode - message('lib/@0@: Defining dependency "@1@"'.format(l, name)) - endif diff --git a/ports/dpdk/fix-dependencies.patch b/ports/dpdk/fix-dependencies.patch new file mode 100644 index 00000000000000..7bb4c26ef20fa4 --- /dev/null +++ b/ports/dpdk/fix-dependencies.patch @@ -0,0 +1,65 @@ +diff --git a/config/meson.build b/config/meson.build +index 0dde249..64f7d1c 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -181,12 +181,10 @@ if meson.is_cross_build() and not meson.get_cross_property('numa', true) + find_libnuma = false + endif + if find_libnuma +- numa_dep = cc.find_library('numa', required: false) +- if numa_dep.found() and cc.has_header('numaif.h') ++ numa_dep = dependency('numa', method: 'pkg-config') ++ if numa_dep.found() + dpdk_conf.set10('RTE_HAS_LIBNUMA', true) + has_libnuma = 1 +- add_project_link_arguments('-lnuma', language: 'c') +- dpdk_extra_ldflags += '-lnuma' + endif + endif + +@@ -211,8 +209,6 @@ if libarchive.found() + # Push libarchive link dependency at the project level to support + # statically linking dpdk apps. Details at: + # https://inbox.dpdk.org/dev/20210605004024.660267a1@sovereign/ +- add_project_link_arguments('-larchive', language: 'c') +- dpdk_extra_ldflags += '-larchive' + endif + + # check for libbsd +diff --git a/lib/eal/linux/meson.build b/lib/eal/linux/meson.build +index 65f2ac6..3e023f8 100644 +--- a/lib/eal/linux/meson.build ++++ b/lib/eal/linux/meson.build +@@ -23,5 +23,6 @@ sources += files( + + deps += ['kvargs', 'telemetry'] + if has_libnuma == 1 ++ ext_deps += numa_dep + dpdk_conf.set10('RTE_EAL_NUMA_AWARE_HUGEPAGES', true) + endif +diff --git a/lib/eal/meson.build b/lib/eal/meson.build +index 056beb9..04bd3fe 100644 +--- a/lib/eal/meson.build ++++ b/lib/eal/meson.build +@@ -29,6 +29,9 @@ endif + if dpdk_conf.has('RTE_USE_LIBBSD') + ext_deps += libbsd + endif ++if dpdk_conf.has('RTE_HAS_LIBARCHIVE') ++ ext_deps += libarchive ++endif + if cc.has_function('getentropy', prefix : '#include ') + cflags += '-DRTE_LIBEAL_USE_GETENTROPY' + endif +diff --git a/lib/vhost/meson.build b/lib/vhost/meson.build +index bc72720..83970c7 100644 +--- a/lib/vhost/meson.build ++++ b/lib/vhost/meson.build +@@ -6,6 +6,7 @@ if not is_linux + reason = 'only supported on Linux' + endif + if has_libnuma == 1 ++ ext_deps += numa_dep + dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true) + endif + if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0')) diff --git a/ports/dpdk/portfile.cmake b/ports/dpdk/portfile.cmake index 52b0a697e28e2d..61ceb70a1b1365 100644 --- a/ports/dpdk/portfile.cmake +++ b/ports/dpdk/portfile.cmake @@ -33,6 +33,7 @@ vcpkg_from_github( HEAD_REF main PATCHES enable-either-static-or-shared-build.patch + fix-dependencies.patch remove-examples-src-from-datadir.patch stop-building-apps.patch) @@ -44,10 +45,12 @@ macro(append_bool_option feature_name option_name) endif() endmacro() +set(DPDK_OPTIONS "") append_bool_option("docs" "enable_docs") append_bool_option("kmods" "enable_kmods") append_bool_option("tests" "tests") append_bool_option("trace" "enable_trace_fp") +string(REPLACE "-Denable_docs=true" "-Denable_docs=false" DPDK_OPTIONS_DEBUG "${DPDK_OPTIONS}") list(APPEND PYTHON_PACKAGES pyelftools) if("docs" IN_LIST FEATURES) @@ -55,32 +58,31 @@ if("docs" IN_LIST FEATURES) endif() x_vcpkg_get_python_packages(PYTHON_VERSION "3" PACKAGES ${PYTHON_PACKAGES}) -vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH} OPTIONS - -Ddisable_drivers=regex/cn9k -Dexamples= ${DPDK_OPTIONS}) +vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Ddisable_drivers=regex/cn9k + -Dexamples= + OPTIONS_RELEASE + ${DPDK_OPTIONS} + OPTIONS_DEBUG + ${DPDK_OPTIONS_DEBUG} +) vcpkg_install_meson() -vcpkg_copy_tools(TOOL_NAMES dpdk-devbind.py dpdk-pmdinfo.py dpdk-telemetry.py - dpdk-hugepages.py AUTO_CLEAN) +set(tools dpdk-devbind.py dpdk-pmdinfo.py dpdk-telemetry.py dpdk-hugepages.py) +if("tests" IN_LIST FEATURES) + list(APPEND tools dpdk-test) +endif() +vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) vcpkg_fixup_pkgconfig() -vcpkg_find_acquire_program(PKGCONFIG) -configure_file( - "${CMAKE_CURRENT_LIST_DIR}/unofficial-${PORT}-config.cmake.in" - "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config.cmake" - @ONLY) - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +if("docs" IN_LIST FEATURES) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/dpdk") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/dpdk" "${CURRENT_PACKAGES_DIR}/share/dpdk/doc") +endif() -file( - INSTALL "${SOURCE_PATH}/license/README" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/doc") -include(CMakePackageConfigHelpers) -write_basic_package_version_file( - "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-${PORT}-config-version.cmake" - VERSION ${PORT_VERSION} - COMPATIBILITY AnyNewerVersion) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/license/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dpdk/unofficial-dpdk-config.cmake.in b/ports/dpdk/unofficial-dpdk-config.cmake.in deleted file mode 100644 index 365ed25b5909b3..00000000000000 --- a/ports/dpdk/unofficial-dpdk-config.cmake.in +++ /dev/null @@ -1,74 +0,0 @@ -# By default CMAKE_PREFIX_PATH, which contains the VCPKG_INSTALLED_DIR, will be -# appended to the pkg-config search path. Because it is appending and not -# prepeding, system packages may be found first. Specifically prepending the -# vcpkg_pkg_config_path to ENV{PKG_CONFIG_PATH} will prioritize the vcpkg -# packages. -if(NOT VCPKG_PREFER_SYSTEM_LIBS) - if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES - "^[Dd][Ee][Bb][Uu][Gg]$") - set(path_suffix "/debug") - else() - set(path_suffix "") - endif() - set(backup_env_pkg_config_path "$ENV{PKG_CONFIG_PATH}") - - # Compute the installation prefix relative to this file. - get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) - get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - if(_IMPORT_PREFIX STREQUAL "/") - set(_IMPORT_PREFIX "") - endif() - - # libdpdk.pc and libdpdk-libs.pc are installed to this path - set(ENV{PKG_CONFIG_PATH} - "${_IMPORT_PREFIX}${path_suffix}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" - ) -else() - unset(backup_env_pkg_config_path) -endif() - -if(DEFINED ENV{PKG_CONFIG}) - set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}") -else() - set(PKG_CONFIG_EXECUTABLE "@PKGCONFIG@") -endif() -find_package(PkgConfig REQUIRED) -pkg_check_modules(LIBDPDK REQUIRED libdpdk>=@PORT_VERSION@) - -if(DEFINED backup_env_pkg_config_path) - set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path}") -endif() - -mark_as_advanced( - LIBDPDK_STATIC_INCLUDE_DIRS - LIBDPDK_INCLUDE_DIRS - LIBDPDK_STATIC_CFLAGS - LIBDPDK_CFLAGS - LIBDPDK_STATIC_LDFLAGS - LIBDPDK_LDFLAGS - LIBDPDK_VERSION) - -add_library(unofficial::@PORT@::dpdk INTERFACE IMPORTED) -unset(LIBDPDK_FOUND) - -if(@VCPKG_LIBRARY_LINKAGE@ STREQUAL "static") - set(INCLUDE_DIRS "${LIBDPDK_STATIC_INCLUDE_DIRS}") - # https://bechsoftware.com/2021/12/05/configuring-dpdk-projects-with-cmake/ - target_compile_options(unofficial::@PORT@::dpdk - INTERFACE ${LIBDPDK_STATIC_CFLAGS}) - target_link_libraries(unofficial::@PORT@::dpdk - INTERFACE ${LIBDPDK_STATIC_LDFLAGS}) -else() - set(INCLUDE_DIRS "${LIBDPDK_INCLUDE_DIRS}") - target_compile_options(unofficial::@PORT@::dpdk INTERFACE ${LIBDPDK_CFLAGS}) - target_link_libraries(unofficial::@PORT@::dpdk INTERFACE ${LIBDPDK_LDFLAGS}) -endif() - -target_include_directories(unofficial::@PORT@::dpdk INTERFACE ${INCLUDE_DIRS}) - -find_package_handle_standard_args( - unofficial-@PORT@ - REQUIRED_VARS INCLUDE_DIRS LIBDPDK_STATIC_CFLAGS LIBDPDK_CFLAGS - LIBDPDK_STATIC_LDFLAGS LIBDPDK_LDFLAGS - VERSION_VAR LIBDPDK_VERSION) diff --git a/ports/dpdk/usage b/ports/dpdk/usage index 0dc6cd0010ff35..5e058c3a4d8ee5 100644 --- a/ports/dpdk/usage +++ b/ports/dpdk/usage @@ -1,4 +1,6 @@ -The package dpdk is compatible with built-in CMake targets: - - find_package(unofficial-dpdk REQUIRED CONFIG) - target_link_libraries(main PRIVATE unofficial::dpdk::dpdk) +The package dpdk can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(DPDK REQUIRED IMPORTED_TARGET libdpdk) + + target_link_libraries(main PRIVATE PkgConfig::DPDK) diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json index cdfe57ec94e623..6de61c61388150 100644 --- a/ports/dpdk/vcpkg.json +++ b/ports/dpdk/vcpkg.json @@ -1,13 +1,17 @@ { "name": "dpdk", "version-string": "22.03", - "port-version": 1, + "port-version": 2, "description": "A set of libraries and drivers for fast packet processing", "homepage": "https://www.dpdk.org/", "documentation": "https://doc.dpdk.org/guides/index.html", "license": "BSD-3-Clause", "supports": "linux | freebsd", "dependencies": [ + { + "name": "libarchive", + "default-features": false + }, { "name": "numactl", "platform": "linux" @@ -32,7 +36,10 @@ "tests": { "description": "Build and install tests", "dependencies": [ - "libarchive" + { + "name": "libarchive", + "default-features": false + } ] }, "trace": { diff --git a/versions/baseline.json b/versions/baseline.json index 94c8c287fe3247..33e461049bd43f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1970,7 +1970,7 @@ }, "dpdk": { "baseline": "22.03", - "port-version": 1 + "port-version": 2 }, "dpp": { "baseline": "10.0.16", diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json index 79c39f544f56d3..54132f21308365 100644 --- a/versions/d-/dpdk.json +++ b/versions/d-/dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6b3f2c2e194013731669b4b6996026bd5611c15", + "version-string": "22.03", + "port-version": 2 + }, { "git-tree": "215be1cdd87b890d105bc8c5cb3e2e5d9a054038", "version-string": "22.03", From ef9628f44911405be206a85e0bc21d6f7a1f86bf Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 20 Aug 2022 00:12:14 +0200 Subject: [PATCH 435/791] [vcpkg script] build_nmake use z_vcpkg_get_cmake_vars (#25862) * use z_vcpkg_get_cmake_vars instead of including the toolchain * fix typo Co-authored-by: Osyotr * add supports expressions * use _ENV_ instead of ENV so vcpkgs flags will overwrite any other flags. (also fixes pdcurses using LINK) * v db * version Co-authored-by: Osyotr Co-authored-by: JackBoosY --- ports/detours/vcpkg.json | 4 ++-- ports/librttopo/vcpkg.json | 3 ++- scripts/cmake/vcpkg_build_nmake.cmake | 15 ++++++++------- versions/baseline.json | 4 ++-- versions/d-/detours.json | 5 +++++ versions/l-/librttopo.json | 5 +++++ 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ports/detours/vcpkg.json b/ports/detours/vcpkg.json index 05c99034ce7795..db238fc96cfa24 100644 --- a/ports/detours/vcpkg.json +++ b/ports/detours/vcpkg.json @@ -1,8 +1,8 @@ { "name": "detours", "version": "4.0.1", - "port-version": 6, + "port-version": 7, "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", "homepage": "https://github.com/microsoft/Detours", - "supports": "windows" + "supports": "windows & !uwp" } diff --git a/ports/librttopo/vcpkg.json b/ports/librttopo/vcpkg.json index 73e72959b3700c..674c2e9f54d98e 100644 --- a/ports/librttopo/vcpkg.json +++ b/ports/librttopo/vcpkg.json @@ -1,9 +1,10 @@ { "name": "librttopo", "version": "1.1.0", - "port-version": 5, + "port-version": 6, "description": "The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided data stores.", "homepage": "https://git.osgeo.org/gitea/rttopo/librttopo", + "supports": "!uwp", "dependencies": [ "geos" ] diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 54b132b315ecd9..d73551e775f69c 100755 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -35,10 +35,9 @@ function(vcpkg_build_nmake) find_program(NMAKE nmake REQUIRED) get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) # Load toolchains - if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") - endif() - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") # Set needed env set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") @@ -57,7 +56,7 @@ function(vcpkg_build_nmake) set(project_subpath "") endif() - vcpkg_backup_env_variables(VARS CL) + vcpkg_backup_env_variables(VARS CL LINK) cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR NORMALIZE install_dir_native) foreach(build_type IN ITEMS debug release) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL build_type) @@ -70,7 +69,8 @@ function(vcpkg_build_nmake) vcpkg_list(APPEND make_opts "INSTALLDIR=${install_dir_native}\\debug") endif() vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) - set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + set(ENV{_CL_} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + set(ENV{_LINK_} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG}") set(prerun_variable_name arg_PRERUN_SHELL_DEBUG) else() @@ -82,7 +82,8 @@ function(vcpkg_build_nmake) endif() vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) - set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + set(ENV{_CL_} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + set(ENV{_LINK_} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE}") set(prerun_variable_name arg_PRERUN_SHELL_RELEASE) endif() diff --git a/versions/baseline.json b/versions/baseline.json index 33e461049bd43f..793e03f608314f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1870,7 +1870,7 @@ }, "detours": { "baseline": "4.0.1", - "port-version": 6 + "port-version": 7 }, "devicenameresolver": { "baseline": "2016-06-26", @@ -4042,7 +4042,7 @@ }, "librttopo": { "baseline": "1.1.0", - "port-version": 5 + "port-version": 6 }, "libsamplerate": { "baseline": "0.2.2", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index e374c0c66be828..4af109787b6ed8 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a73bd010a9e693e683b647ce04855efca88f4d5", + "version": "4.0.1", + "port-version": 7 + }, { "git-tree": "7c418a44692bd9eb06163e66ea779dfd57b84e07", "version": "4.0.1", diff --git a/versions/l-/librttopo.json b/versions/l-/librttopo.json index 5c3773f059b578..6f3134362552f8 100644 --- a/versions/l-/librttopo.json +++ b/versions/l-/librttopo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83f4858afee7a92ece5923344f556b3900894eaf", + "version": "1.1.0", + "port-version": 6 + }, { "git-tree": "d747c88d429ff781b11627623d0958967f912a41", "version": "1.1.0", From 624f1b4ecaf652e074f4cc547f9a4679a28d2222 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Sat, 20 Aug 2022 00:13:23 +0200 Subject: [PATCH 436/791] [jemalloc|vcpkg_configure_make] update and some script fixes (#25009) * WIP commit * more jemalloc wip * v db * add license * v db * apply format diff * fix script * WIP commit * fix ARFLAGS for the wrapper * CR stuff * v db * use separate_arguments to add -Wl, to linker flags * say "-Xlinker" three times and it will come. * make assembler compile only. * disable _FOR_BUILD if crosscompiling. use function instead of macro. Remove AS settings * ignore settings for osx until somebody knows how to fix it. * CR z_vcpkg_make_set_env * CI retrigger * make conflicting options an error * remove DEFINED since the options are always defined --- docs/maintainers/vcpkg_configure_make.md | 5 +- ports/jemalloc/fix-cmakelists.patch | 67 ---------- ports/jemalloc/fix-configure-ac.patch | 13 ++ ports/jemalloc/fix-static-build.patch | 25 ---- ports/jemalloc/fix-utilities.patch | 30 ----- ports/jemalloc/portfile.cmake | 63 +++++---- ports/jemalloc/preprocessor.patch | 12 ++ ports/jemalloc/vcpkg.json | 6 +- scripts/cmake/vcpkg_configure_make.cmake | 156 ++++++++++++++++------- versions/baseline.json | 4 +- versions/j-/jemalloc.json | 5 + 11 files changed, 189 insertions(+), 197 deletions(-) delete mode 100644 ports/jemalloc/fix-cmakelists.patch create mode 100644 ports/jemalloc/fix-configure-ac.patch delete mode 100644 ports/jemalloc/fix-static-build.patch delete mode 100644 ports/jemalloc/fix-utilities.patch create mode 100644 ports/jemalloc/preprocessor.patch diff --git a/docs/maintainers/vcpkg_configure_make.md b/docs/maintainers/vcpkg_configure_make.md index af0213bd5a141b..da9346e23b45a7 100644 --- a/docs/maintainers/vcpkg_configure_make.md +++ b/docs/maintainers/vcpkg_configure_make.md @@ -9,7 +9,7 @@ Configure configure for Debug and Release builds of a project. vcpkg_configure_make( SOURCE_PATH <${SOURCE_PATH}> [AUTOCONFIG] - [USE_WRAPPERS] + [USE_WRAPPERS] [NO_WRAPPERS] [DETERMINE_BUILD_TRIPLET] [BUILD_TRIPLET "--host=x64 --build=i686-unknown-pc"] [NO_ADDITIONAL_PATHS] @@ -42,6 +42,9 @@ Skip configure process ### USE_WRAPPERS Use autotools ar-lib and compile wrappers (only applies to windows cl and lib) +### NO_WRAPPERS +Deactivate the use of autotools ar-lib and compile wrappers (only applies to windows cl and lib) + ### BUILD_TRIPLET Used to pass custom --build/--target/--host to configure. Can be globally overwritten by VCPKG_MAKE_BUILD_TRIPLET diff --git a/ports/jemalloc/fix-cmakelists.patch b/ports/jemalloc/fix-cmakelists.patch deleted file mode 100644 index 3ba70544c602be..00000000000000 --- a/ports/jemalloc/fix-cmakelists.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06e83ef..229e17a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,7 @@ option(enable-lazy-lock "Enable lazy locking (only lock when multi-threaded" OFF - option(force_lazy_lock "Forcing lazy-lock to avoid allocator/threading bootstrap issues" OFF) - # install_prefix - installation directory prefix - # with-xslroot= XSL stylesheet root path -+option(build-tests "Build tests" OFF) - - set (PACKAGE_NAME "jemalloc") - project (${PACKAGE_NAME} C) -@@ -711,12 +712,8 @@ endif() - - # The original library, delivery product - set(LIBJEMALLOCLIB jemalloc${install_suffix}) --add_library(${LIBJEMALLOCLIB} STATIC ${C_SRCS}) -- --# Now add shared library. Needed for integration tests --# and a benchmark --set(LIBJEMALLOCSO jemallocso${install_suffix}) --add_library(${LIBJEMALLOCSO} SHARED ${C_SRCS}) -+set(LIBJEMALLOCSO ${LIBJEMALLOCLIB}) -+add_library(${LIBJEMALLOCLIB} ${C_SRCS}) - - if(WIN32) - # May want to replace /d2Zi+ to /Zo -@@ -745,8 +745,6 @@ if(WIN32) - # either impport or export which is both wrong for a static library - set_target_properties(${LIBJEMALLOCLIB} - PROPERTIES -- COMPILE_DEFINITIONS -- "JEMALLOC_EXPORT=" - CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG - ${PROJECT_BINARY_DIR}/Debug - CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE -@@ -754,6 +752,9 @@ if(WIN32) - COMPILE_PDB_NAME - ${LIBJEMALLOCLIB} - ) -+ if(NOT BUILD_SHARED_LIBS) -+ target_compile_definitions(${LIBJEMALLOCLIB} "JEMALLOC_EXPORT=") -+ endif() - - endif() - -@@ -825,6 +822,14 @@ if(C_UTIL_INTEGRATION_DEFS) - "${C_UTIL_INTEGRATION_DEFS}") - endif() - -+install(FILES include/jemalloc/jemalloc${install_suffix}.h -+ DESTINATION include/jemalloc) -+ -+install(TARGETS ${LIBJEMALLOCSO} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+if (build-tests) - ################################################################## - # Common source for Unit, Integration and stress test libraries - set(C_TESTLIB_SRCS -@@ -1028,4 +1033,4 @@ foreach(sourcefile ${TESTS_INTEGRATION}) - add_test(NAME ${exename} COMMAND ${exename}) - add_dependencies(check ${exename}) - endforeach(sourcefile ${TESTS_UNIT}) -- -+endif() diff --git a/ports/jemalloc/fix-configure-ac.patch b/ports/jemalloc/fix-configure-ac.patch new file mode 100644 index 00000000000000..7799dfb9e80e39 --- /dev/null +++ b/ports/jemalloc/fix-configure-ac.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index f6d25f334..3115504e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1592,7 +1592,7 @@ fi + [enable_uaf_detection="0"] + ) + if test "x$enable_uaf_detection" = "x1" ; then +- AC_DEFINE([JEMALLOC_UAF_DETECTION], [ ]) ++ AC_DEFINE([JEMALLOC_UAF_DETECTION], [ ], ["enable UAF"]) + fi + AC_SUBST([enable_uaf_detection]) + diff --git a/ports/jemalloc/fix-static-build.patch b/ports/jemalloc/fix-static-build.patch deleted file mode 100644 index 3ede809a8a600d..00000000000000 --- a/ports/jemalloc/fix-static-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0b8959a..55e6a5f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -826,10 +826,16 @@ endif() - install(FILES include/jemalloc/jemalloc${install_suffix}.h - DESTINATION include/jemalloc) - --install(TARGETS ${LIBJEMALLOCSO} -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+if (without-export) -+ install(TARGETS ${C_JETLIB} -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+else() -+ install(TARGETS ${LIBJEMALLOCSO} -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) -+endif() - if (build-tests) - ################################################################## - # Common source for Unit, Integration and stress test libraries diff --git a/ports/jemalloc/fix-utilities.patch b/ports/jemalloc/fix-utilities.patch deleted file mode 100644 index 32c39e0b3e822d..00000000000000 --- a/ports/jemalloc/fix-utilities.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Utilities.cmake b/Utilities.cmake -index 562e948..d2d3530 100644 ---- a/Utilities.cmake -+++ b/Utilities.cmake -@@ -633,9 +633,11 @@ file(TO_NATIVE_PATH "${file_path}" ntv_file_path) - # This converts #undefs into #cmakedefines so configure_file can handle it - set(PS_CMD - "Get-Content \"${ntv_file_path}\" | --ForEach { -+ForEach { - if($_ -match '^#undef[ \t]*[^ \t]*') -- { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_}}" -+ { $_ -replace '^#undef[ \t]*([^ \t]*)','#cmakedefine $1 @$1@' } else {$_} -+} | -+Set-Content \"${ntv_file_path}.cmake\"" - ) - - if(EXISTS ${file_path}) -@@ -646,9 +648,8 @@ if(EXISTS ${file_path}) - # Convert autoconf .in into a cmake .in - execute_process(COMMAND powershell -Command "${PS_CMD}" - RESULT_VARIABLE error_level -- ERROR_VARIABLE error_output -- OUTPUT_FILE ${file_path}.cmake) -- -+ ERROR_VARIABLE error_output) -+ - if(NOT ${error_level} EQUAL 0) - message(FATAL_ERROR "Powershell completed with ${error_level} : ${error_output}") - endif() diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake index 013634577b0cb4..81c01ab9e4c7e0 100644 --- a/ports/jemalloc/portfile.cmake +++ b/ports/jemalloc/portfile.cmake @@ -1,35 +1,54 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO jemalloc/jemalloc-cmake - REF jemalloc-cmake.4.3.1 - SHA512 e94b62ec3a53acc0ab5acb247d7646bc172108e80f592bb41c2dd50d181cbbeb33d623adf28415ffc0a0e2de3818af2dfe4c04af75ac891ef5042bc5bb186886 + REPO jemalloc/jemalloc + REF 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c + SHA512 527bfbf5db9a5c2b7b04df4785b6ae9d445cff8cb17298bf3e550c88890d2bd7953642d8efaa417580610508279b527d3a3b9e227d17394fd2013c88cb7ae75a HEAD_REF master PATCHES - fix-cmakelists.patch - fix-utilities.patch - fix-static-build.patch + fix-configure-ac.patch + preprocessor.patch ) - -if (VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(BUILD_STATIC_LIBRARY OFF) -else() - set(BUILD_STATIC_LIBRARY ON) +if(VCPKG_TARGET_IS_WINDOWS) + set(opts "ac_cv_search_log=none required" "--without-private-namespace") endif() -vcpkg_configure_cmake( - DISABLE_PARALLEL_CONFIGURE - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DGIT_FOUND=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -Dwithout-export=${BUILD_STATIC_LIBRARY} + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + NO_WRAPPERS + OPTIONS ${opts} ) -vcpkg_install_cmake() +vcpkg_install_make() + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/jemalloc.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jemalloc.dll" "${CURRENT_PACKAGES_DIR}/bin/jemalloc.dll") + endif() + if(NOT VCPKG_BUILD_TYPE) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/jemalloc.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jemalloc.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/jemalloc.dll") + endif() + endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/jemalloc.pc" "install_suffix=" "install_suffix=_s") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/jemalloc.pc" "install_suffix=" "install_suffix=_s") + endif() + endif() +endif() + +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/jemalloc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/jemalloc/COPYING ${CURRENT_PACKAGES_DIR}/share/jemalloc/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jemalloc/preprocessor.patch b/ports/jemalloc/preprocessor.patch new file mode 100644 index 00000000000000..6e6e2d1403fb2e --- /dev/null +++ b/ports/jemalloc/preprocessor.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 3115504e2..ffb504b08 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -749,6 +749,7 @@ case "${host}" in + so="dll" + if test "x$je_cv_msvc" = "xyes" ; then + importlib="lib" ++ JE_APPEND_VS(CPPFLAGS, -DJEMALLOC_NO_PRIVATE_NAMESPACE) + DSO_LDFLAGS="-LD" + EXTRA_LDFLAGS="-link -DEBUG" + CTARGET='-Fo$@' diff --git a/ports/jemalloc/vcpkg.json b/ports/jemalloc/vcpkg.json index c23bdcaa803915..dccb6d1734e6e4 100644 --- a/ports/jemalloc/vcpkg.json +++ b/ports/jemalloc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "jemalloc", - "version-string": "4.3.1", - "port-version": 5, + "version": "5.3.0", "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support", - "homepage": "https://github.com/jemalloc/jemalloc-cmake" + "homepage": "https://jemalloc.net/", + "license": "BSD-2-Clause" } diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 971e56e329c01c..5ff0ab1ae3d650 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -124,7 +124,7 @@ endmacro() function(vcpkg_configure_make) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 arg - "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" + "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;NO_DEBUG;USE_WRAPPERS;NO_WRAPPERS;DETERMINE_BUILD_TRIPLET" "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES" ) @@ -133,6 +133,10 @@ function(vcpkg_configure_make) message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() + if(arg_USE_WRAPPERS AND arg_NO_WRAPPERS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed conflicting options USE_WRAPPERS and NO_WRAPPERS. Please remove one of them!") + endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") @@ -145,12 +149,9 @@ function(vcpkg_configure_make) set(requires_autogen OFF) # use autogen.sh set(requires_autoconfig OFF) # use autotools and configure.ac - if(EXISTS "${src_dir}/configure" AND "${src_dir}/configure.ac") # remove configure; rerun autoconf - if(NOT VCPKG_MAINTAINER_SKIP_AUTOCONFIG) # If fixing bugs skipping autoconfig saves a lot of time - set(requires_autoconfig ON) - file(REMOVE "${SRC_DIR}/configure") # remove possible autodated configure scripts - set(arg_AUTOCONFIG ON) - endif() + if(EXISTS "${src_dir}/configure" AND EXISTS "${src_dir}/configure.ac" AND arg_AUTOCONFIG) # remove configure; rerun autoconf + set(requires_autoconfig ON) + file(REMOVE "${SRC_DIR}/configure") # remove possible autodated configure scripts elseif(EXISTS "${src_dir}/configure" AND NOT arg_SKIP_CONFIGURE) # run normally; no autoconf or autogen required elseif(EXISTS "${src_dir}/configure.ac") # Run autoconfig set(requires_autoconfig ON) @@ -175,10 +176,13 @@ function(vcpkg_configure_make) else() set(arg_USE_WRAPPERS OFF) endif() + if(arg_NO_WRAPPERS) + set(arg_USE_WRAPPERS OFF) + endif() # Backup environment variables # CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJCXX R UPC Y - set(cm_FLAGS AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC) + set(cm_FLAGS AR AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC) list(TRANSFORM cm_FLAGS APPEND "FLAGS") vcpkg_backup_env_variables(VARS ${cm_FLAGS}) @@ -289,7 +293,16 @@ function(vcpkg_configure_make) z_vcpkg_append_to_configure_environment(configure_env CPP "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") z_vcpkg_append_to_configure_environment(configure_env CC "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") - z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + if(NOT VCPKG_CROSSCOMPILING) + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + else() + # Silly trick to make configure accept CC_FOR_BUILD but in reallity CC_FOR_BUILD is deactivated. + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() z_vcpkg_append_to_configure_environment(configure_env CXX "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env RC "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env WINDRES "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") @@ -301,7 +314,15 @@ function(vcpkg_configure_make) else() z_vcpkg_append_to_configure_environment(configure_env CPP "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") z_vcpkg_append_to_configure_environment(configure_env CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") - z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + if(NOT VCPKG_CROSSCOMPILING) + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + else() + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CPP_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + z_vcpkg_append_to_configure_environment(configure_env CXX_FOR_BUILD "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() z_vcpkg_append_to_configure_environment(configure_env CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") z_vcpkg_append_to_configure_environment(configure_env WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") @@ -363,6 +384,39 @@ function(vcpkg_configure_make) # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive" list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) endif() + elseif(NOT VCPKG_TARGET_IS_OSX) + # Because OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++ + function(z_vcpkg_make_set_env envvar cmakevar) + set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}} ${ARGN}") + string(STRIP "${prog}" prog) + if(DEFINED ENV{${envvar}}) + return() + endif() + if(VCPKG_DETECTED_CMAKE_${cmakevar}) + set(ENV{${envvar}} "${prog}") + endif() + endfunction() + z_vcpkg_make_set_env(CC C_COMPILER) + if(NOT VCPKG_CROSSCOMPILING) + z_vcpkg_make_set_env(CC_FOR_BUILD C_COMPILER) + z_vcpkg_make_set_env(CPP_FOR_BUILD C_COMPILER "-E") + z_vcpkg_make_set_env(CXX_FOR_BUILD C_COMPILER) + else() + set(ENV{CC_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CPP_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + set(ENV{CXX_FOR_BUILD} "touch a.out | touch conftest${VCPKG_HOST_EXECUTABLE_SUFFIX} | true") + endif() + z_vcpkg_make_set_env(CXX CXX_COMPILER) + z_vcpkg_make_set_env(NM NM) + z_vcpkg_make_set_env(RC RC) + z_vcpkg_make_set_env(WINDRES RC) + z_vcpkg_make_set_env(DLLTOOL DLLTOOL) + z_vcpkg_make_set_env(STRIP STRIP) + z_vcpkg_make_set_env(OBJDUMP OBJDUMP) + z_vcpkg_make_set_env(RANLIB RANLIB) + z_vcpkg_make_set_env(AR AR) + z_vcpkg_make_set_env(LD LINKER) + unset(z_vcpkg_make_set_env) endif() # Some PATH handling for dealing with spaces....some tools will still fail with that! @@ -537,7 +591,7 @@ function(vcpkg_configure_make) debug_message("ENV{LIBS}:$ENV{LIBS}") # Run autoconf if necessary - if (arg_AUTOCONFIG OR requires_autoconfig) + if (arg_AUTOCONFIG OR requires_autoconfig AND NOT arg_NO_AUTOCONFIG) find_program(AUTORECONF autoreconf) if(NOT AUTORECONF) message(FATAL_ERROR "${PORT} requires autoconf from the system package manager (example: \"sudo apt-get install autoconf\")") @@ -593,20 +647,17 @@ function(vcpkg_configure_make) endif() endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG) - set(var_suffix DEBUG) - set(path_suffix_${var_suffix} "/debug") - set(short_name_${var_suffix} "dbg") - list(APPEND all_buildtypes ${var_suffix}) + macro(z_vcpkg_setup_make_linker_flags_vars var_suffix) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") else() # dynamic set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") endif() - z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) - if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + set(ARFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") + set(LDFLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") + if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES [[cl\.exe$]]) if(NOT vcm_paths_with_spaces) - set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") + string(APPEND LDFLAGS_${var_suffix} " -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() if(DEFINED ENV{_LINK_}) set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") @@ -614,7 +665,7 @@ function(vcpkg_configure_make) set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") endif() else() - set(link_required_dirs) + set(link_required_dirs "") if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") endif() @@ -622,8 +673,40 @@ function(vcpkg_configure_make) set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() string(STRIP "${link_required_dirs}" link_required_dirs) - set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") + if(link_required_dirs) + string(PREPEND LDFLAGS_${var_suffix} "${link_required_dirs} ") + # ARFLAGS doesn't need -L search paths since it just bundles object files + endif() + if(ARFLAGS_${var_suffix}) + # ARFLAGS need to know the command for creating an archive (Maybe needs user customization?) + # or extract it from CMake via CMAKE_${lang}_ARCHIVE_CREATE ? + # or from CMAKE_${lang}_${rule} with rule being one of CREATE_SHARED_MODULE CREATE_SHARED_LIBRARY LINK_EXECUTABLE + string(PREPEND ARFLAGS_${var_suffix} "cr ") + endif() + string(STRIP "${LDFLAGS_${var_suffix}}" LDFLAGS_${var_suffix}) + string(STRIP "${ARFLAGS_${var_suffix}}" ARFLAGS_${var_suffix}) + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_DETECTED_CMAKE_LINKER MATCHES [[link\.exe$]]) + # Do not touch autotools quirks incoming! + # -Xlinker is repeated three times because: + # - libtool script eats -Xlinker + # - the compile wrapper eats -Xlinker + # - passing through both tools requires 3 -Xlinker; two being eaten in the first script. + # passing only through one script will keep one -Xlinker (done in configure) + # but cl will just ignore those with a warning. (Just like -Xcompiler) + separate_arguments(LDFLAGS_LIST NATIVE_COMMAND "${LDFLAGS_${var_suffix}}") + list(JOIN LDFLAGS_LIST " -Xlinker -Xlinker -Xlinker " LDFLAGS_${var_suffix}) + string(PREPEND LDFLAGS_${var_suffix} "-Xlinker -Xlinker -Xlinker ") + endif() endif() + endmacro() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG) + set(var_suffix DEBUG) + set(path_suffix_${var_suffix} "/debug") + set(short_name_${var_suffix} "dbg") + list(APPEND all_buildtypes ${var_suffix}) + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) + z_vcpkg_setup_make_linker_flags_vars(${var_suffix}) unset(var_suffix) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -631,32 +714,8 @@ function(vcpkg_configure_make) set(path_suffix_${var_suffix} "") set(short_name_${var_suffix} "rel") list(APPEND all_buildtypes ${var_suffix}) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") - else() # dynamic - set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") - endif() z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) - if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") - if(NOT vcm_paths_with_spaces) - set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") - endif() - if(DEFINED ENV{_LINK_}) - set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") - else() - set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") - endif() - else() - set(link_required_dirs "") - if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") - set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") - endif() - if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link") - set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") - endif() - string(STRIP "${link_required_dirs}" link_required_dirs) - set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") - endif() + z_vcpkg_setup_make_linker_flags_vars(${var_suffix}) unset(var_suffix) endif() @@ -699,7 +758,10 @@ function(vcpkg_configure_make) set(ENV{CXXFLAGS} "${CXXFLAGS_${current_buildtype}}") set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${current_buildtype}}") set(ENV{LDFLAGS} "${LDFLAGS_${current_buildtype}}") - + if(ARFLAGS_${current_buildtype} AND NOT (arg_USE_WRAPPERS AND VCPKG_TARGET_IS_WINDOWS)) + # Target windows with wrappers enabled cannot forward ARFLAGS since it breaks the wrapper + set(ENV{ARFLAGS} "${ARFLAGS_${current_buildtype}}") + endif() # https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html # -avoid-version is handled specially by libtool link mode, this flag is not forwarded to linker, # and libtool tries to avoid versioning for shared libraries and no symbolic links are created. diff --git a/versions/baseline.json b/versions/baseline.json index 793e03f608314f..d58a59e1c08640 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3101,8 +3101,8 @@ "port-version": 5 }, "jemalloc": { - "baseline": "4.3.1", - "port-version": 5 + "baseline": "5.3.0", + "port-version": 0 }, "jinja2cpplight": { "baseline": "2018-05-08", diff --git a/versions/j-/jemalloc.json b/versions/j-/jemalloc.json index a27e65c4c646a3..028888496829fa 100644 --- a/versions/j-/jemalloc.json +++ b/versions/j-/jemalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6baf5d3d5e323c49a4f91a2e67f778421af4a4c5", + "version": "5.3.0", + "port-version": 0 + }, { "git-tree": "0ced62e7a268f8442b2e808df7b094afe8998c38", "version-string": "4.3.1", From 9259a0719d94c402aae2ab7975bc096afdec15df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Sat, 20 Aug 2022 00:16:18 +0200 Subject: [PATCH 437/791] [opensp] minor fixes, new .pc file (#26382) * [opensp] Fix config.h not populating properly * [opensp] Add a opensp.pc.in * [opensp] license updates * [libopensp] update versions * [libopensp] update port-version * [libopensp] update versions --- ports/libopensp/opensp.pc.in | 12 ++++++++++++ ports/libopensp/portfile.cmake | 10 ++++++---- ports/libopensp/vcpkg.json | 2 ++ ports/libopensp/windows_cmake_build.diff | 15 +++------------ versions/baseline.json | 2 +- versions/l-/libopensp.json | 7 ++++++- 6 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 ports/libopensp/opensp.pc.in diff --git a/ports/libopensp/opensp.pc.in b/ports/libopensp/opensp.pc.in new file mode 100644 index 00000000000000..9ca06dce8d2255 --- /dev/null +++ b/ports/libopensp/opensp.pc.in @@ -0,0 +1,12 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include/OpenSP + +Name: opensp +Description: SGML parser algorithm library +Version: @OPENSP_VERSION@ +Libs: -L${libdir} -losp +Libs.private: @EXTRA_LIBS@ +Cflags: -I${includedir} +Cflags.private: \ No newline at end of file diff --git a/ports/libopensp/portfile.cmake b/ports/libopensp/portfile.cmake index aa7fdadfffb46d..cf92ff86f4c90e 100644 --- a/ports/libopensp/portfile.cmake +++ b/ports/libopensp/portfile.cmake @@ -28,9 +28,9 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_cmake_install() else() - set(EXTRA_OPTS "") if(VCPKG_TARGET_IS_OSX) - list(APPEND EXTRA_OPTS "LDFLAGS=-framework CoreFoundation \$LDFLAGS") # libintl links to it + # libintl links to those + set(EXTRA_LIBS "-framework CoreFoundation -lintl -liconv") endif() vcpkg_configure_make( @@ -38,12 +38,13 @@ else() SOURCE_PATH "${SOURCE_PATH}" OPTIONS --disable-doc-build - ${EXTRA_OPTS} + "LDFLAGS=${EXTRA_LIBS} \$LDFLAGS" ) vcpkg_install_make() endif() +configure_file("${CMAKE_CURRENT_LIST_DIR}/opensp.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/opensp.pc" @ONLY) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() @@ -53,4 +54,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libopensp/vcpkg.json b/ports/libopensp/vcpkg.json index b61ba7152520df..adf16ff17d1a55 100644 --- a/ports/libopensp/vcpkg.json +++ b/ports/libopensp/vcpkg.json @@ -1,8 +1,10 @@ { "name": "libopensp", "version": "1.5.2", + "port-version": 1, "description": "SGML parser algorithm", "homepage": "http://openjade.sourceforge.net", + "license": "MIT", "dependencies": [ { "name": "gettext", diff --git a/ports/libopensp/windows_cmake_build.diff b/ports/libopensp/windows_cmake_build.diff index 2c9e8253732993..bac0b152a3e699 100644 --- a/ports/libopensp/windows_cmake_build.diff +++ b/ports/libopensp/windows_cmake_build.diff @@ -1,13 +1,9 @@ diff -Nru -x '*~' OpenSP-1.5.2.orig/CMakeLists.txt OpenSP-1.5.2/CMakeLists.txt --- OpenSP-1.5.2.orig/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 +++ OpenSP-1.5.2/CMakeLists.txt 2014-08-24 17:23:19.941495700 +0300 -@@ -0,0 +1,24 @@ +@@ -0,0 +1,20 @@ +project(opensp) + -+set (VERSION_MAJOR 1) -+set (VERSION_MINOR 5) -+set (VERSION_PATH 2) -+ +cmake_minimum_required(VERSION 2.6) + +include_directories( @@ -54,7 +50,7 @@ diff -Nru -x '*~' OpenSP-1.5.2.orig/config.h OpenSP-1.5.2/config.h #define SP_HAVE_SETMODE #define SP_DLLEXPORT __declspec(dllexport) #define SP_DLLIMPORT __declspec(dllimport) -@@ -301,15 +312,8 @@ +@@ -301,12 +312,5 @@ #define PATH_SEPARATOR ':' #endif @@ -66,12 +62,7 @@ diff -Nru -x '*~' OpenSP-1.5.2.orig/config.h OpenSP-1.5.2/config.h -#endif - // NOTE: This is processed as a Makefile, not as a header by autoconf. --#define SP_PACKAGE "OpenSP" --#define SP_VERSION "1.5.2" -+#define SP_PACKAGE "@PACKAGE@" -+#define SP_VERSION "@VERSION@" - - #endif /* not config_INCLUDED */ + #define SP_PACKAGE "OpenSP" diff -Nru -x '*~' OpenSP-1.5.2.orig/generic/SGMLApplication.h OpenSP-1.5.2/generic/SGMLApplication.h --- OpenSP-1.5.2.orig/generic/SGMLApplication.h 2005-05-14 12:17:41.000000000 +0300 +++ OpenSP-1.5.2/generic/SGMLApplication.h 2014-08-24 17:23:19.957120700 +0300 diff --git a/versions/baseline.json b/versions/baseline.json index d58a59e1c08640..0714712d57da1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3930,7 +3930,7 @@ }, "libopensp": { "baseline": "1.5.2", - "port-version": 0 + "port-version": 1 }, "libopusenc": { "baseline": "0.2.1", diff --git a/versions/l-/libopensp.json b/versions/l-/libopensp.json index 168ab8b2513a97..4fc572cff82416 100644 --- a/versions/l-/libopensp.json +++ b/versions/l-/libopensp.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "c52391221569480b2e639b0e07a9e809e7711320", + "git-tree": "1c38530c26ffb1fc7fb2e0bd40f76ca8fa2bfb57", + "version": "1.5.2", + "port-version": 1 + }, + { + "git-tree": "4b7d728266ee8b4e03f27a619cbf9efc9484cbb6", "version": "1.5.2", "port-version": 0 } From c56324dddf803da2961224daef17031bd05045dc Mon Sep 17 00:00:00 2001 From: Tetsuya Hayashi Date: Tue, 23 Aug 2022 01:10:51 +0900 Subject: [PATCH 438/791] [quill] Update to 2.1.0 (#26447) * [quill] Update to 2.1.0 * [quill] Update version files --- ports/quill/portfile.cmake | 4 ++-- ports/quill/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 045df2c14fe7e0..2d5208e5f134e3 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v2.0.0 - SHA512 fed4362fcf32b20beeb44d1421fb58505f5fd0880518abc7c19e645beff9a1e2f83d79273404cd2c297a51c27555ce5fbd3bf96cc657268c7645b68e062e8c59 + REF v2.1.0 + SHA512 377e765d455cff729e8b5df6a1fcb28335c20259d8ff1b4ef3327f8640a7c69467147e39a9eab1c92097e04db3f732b9906e55167d5c9fd334e054b5eb5d320c HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index eed1937b17df47..88453614bc85d2 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "2.0.0", + "version": "2.1.0", "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 0714712d57da1f..ade0cd21c1a129 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6149,7 +6149,7 @@ "port-version": 7 }, "quill": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 923936392e0f2a..1f4d9814eef61c 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf93531e147436f75761409a5148fbd6cc1969f8", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "fb911c05f1ad501f9b87ea3918d4badef41d16e4", "version": "2.0.0", From 423df8c72d849057bd3c48317f36b357bcb450ba Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Mon, 22 Aug 2022 09:14:35 -0700 Subject: [PATCH 439/791] [z3] Update to 4.11.0 (#26429) * [z3] Update to 4.11.0 * Update version db --- ports/z3/portfile.cmake | 4 ++-- ports/z3/remove-flag-overrides.patch | 2 +- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 5 +++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 72300e5d099958..d9558d75a11210 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF z3-4.10.2 - SHA512 d0e54036d403d124a7bbf4cf8de9fd9159bab5151f875b546474563811dfb259bc46650df950802031a180375745fb589acbc79d0065944f0631df378dd6d0c3 + REF z3-4.11.0 + SHA512 a3fd7e013948de6683b16aca03641bb845d02187152bebdee8c62c2a3f80a7710a1d3b9aef9c1490c2340571bb225f457928ac57a2ed28c0084ced34bcf3e905 HEAD_REF master PATCHES fix-install-path.patch diff --git a/ports/z3/remove-flag-overrides.patch b/ports/z3/remove-flag-overrides.patch index ed4969f1941933..e7dbc81b0b6e31 100644 --- a/ports/z3/remove-flag-overrides.patch +++ b/ports/z3/remove-flag-overrides.patch @@ -7,6 +7,6 @@ index 477410ba8..fcca03917 100644 cmake_minimum_required(VERSION 3.4) -set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake") - project(Z3 VERSION 4.10.2.0 LANGUAGES CXX) + project(Z3 VERSION 4.11.0.0 LANGUAGES CXX) ################################################################################ diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 6709dea907cbbb..fad42df394250d 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version": "4.10.2", + "version": "4.11.0", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ade0cd21c1a129..eeed4aadbc1ca8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7845,7 +7845,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.10.2", + "baseline": "4.11.0", "port-version": 0 }, "z85": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 6abbd24502367e..a1cca9f3bc8f43 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c57981e593026824fe9bedff234a82c13765e29", + "version": "4.11.0", + "port-version": 0 + }, { "git-tree": "aa0794e55ef223e835ae4dd228e3986d83be4843", "version": "4.10.2", From 9ff91df90a536d5c07df3ae9ed2e8c5ad65cb494 Mon Sep 17 00:00:00 2001 From: Hiroshi Yoshioka <40815708+hyoshioka0128@users.noreply.github.com> Date: Tue, 23 Aug 2022 01:18:59 +0900 Subject: [PATCH 440/791] =?UTF-8?q?Typo=20"Github"=E2=86=92"GitHub"=20(#26?= =?UTF-8?q?441)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Typo "Github"→"GitHub" https://github.com/microsoft/vcpkg/blob/master/README.md #PingMSFTDocs * Typo "Github"→"GitHub" https://github.com/microsoft/vcpkg/blob/master/README_fr.md #PingMSFTDocs * Typo "Github"→"GitHub"(README_ko_KR.md) https://github.com/microsoft/vcpkg/blob/master/README_ko_KR.md #PingMSFTDocs * Typo "Github"→"GitHub" https://github.com/microsoft/vcpkg/blob/master/README_zh_CN.md #PingMSFTDocs --- README.md | 2 +- README_fr.md | 2 +- README_ko_KR.md | 2 +- README_zh_CN.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5032e9fb235bce..b29fe52d2f06a6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ check out our [Getting Started](#getting-started) section for how to start using For short description of available commands, once you've installed vcpkg, you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. -* Github: ports at [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), program at [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool) +* GitHub: ports at [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), program at [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel * Discord: [\#include \](https://www.includecpp.org), the #🌏vcpkg channel * Docs: [Documentation](docs/README.md) diff --git a/README_fr.md b/README_fr.md index 140e8435b6ba13..12052515d8c9ff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez jamais utilisé vcpkg, ou si vous essayez d'utiliser vcpkg, lisez Pour une description des commandes disponibles, quand vous avez installé vcpkg, vous pouvez lancer `vcpkg help` ou `vcpkg help [commande]` pour de l'aide spécifique à une commande. -* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel * Discord: [\#include \](https://www.includecpp.org), le canal #🌏vcpkg * Docs: [Documentation](docs/README.md) diff --git a/README_ko_KR.md b/README_ko_KR.md index 2b0a93997a7cdb..caea90f96f23d1 100644 --- a/README_ko_KR.md +++ b/README_ko_KR.md @@ -14,7 +14,7 @@ Vcpkg는 Windows, Linux 및 MacOS에서 C 및 C++ 라이브러리를 관리하 Vcpkg를 설치하였다면, `vcpkg help` 명령어로 사용 가능한 명령어에 대한 간단한 설명을 볼 수 있습니다. `vcpkg help [command]` 명령어로는 각 명령어별 도움말을 볼 수 있습니다. -* Github: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)에, 관련 프로그램은 [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)에 있습니다. +* GitHub: port는 [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg)에, 관련 프로그램은 [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool)에 있습니다. * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), #vcpkg 채널 * Discord: [\#include \](https://www.includecpp.org), #🌏vcpkg 채널 * 도움말: [Documentation](docs/README.md) diff --git a/README_zh_CN.md b/README_zh_CN.md index 87890daf52924d..a9c886dc74ed7a 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -9,7 +9,7 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 如需获取有关可用命令的简短描述，请在编译vcpkg后执行 `vcpkg help` 或执行 `vcpkg help [command]` 来获取具体的帮助信息。 -* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* GitHub: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/)， #vcpkg 频道 * Discord: [\#include \](https://www.includecpp.org)， #🌏vcpkg 频道 * 文档: [Documentation](docs/README.md) From 179dbd06277eb97d1740fb151de93300b9478709 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 22 Aug 2022 09:20:25 -0700 Subject: [PATCH 441/791] [docs] Fix TOCs, inline command (#26412) --- docs/README.md | 10 +++++++++- docs/commands/index.md | 16 ---------------- docs/examples/overlay-triplets-linux-dynamic.md | 2 +- docs/users/android.md | 2 +- docs/users/versioning.md | 6 ++++-- 5 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 docs/commands/index.md diff --git a/docs/README.md b/docs/README.md index 6914dcd54b4767..5eec48b7cd5b2e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -11,10 +11,18 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Packaging GitHub Repositories Example: libogg](examples/packaging-github-repos.md) - [Patching Example: Patching libpng to work for x64-uwp](examples/patching.md) - [Getting Started with Versioning](examples/versioning.getting-started.md) +- [Manifest Mode: CMake Example](examples/manifest-mode-cmake.md) +- [Pin old Boost Versions](examples/modify-baseline-to-pin-old-boost.md) +- [Using Overlay Triplets](examples/overlay-triplets-linux-dynamic.md) ### Command Line Reference -- [Command Line Reference](commands/index.md) +- [Common Options](commands/common-options.md) +- Commands + - [vcpkg install](commands/install.md) + - [vcpkg integrate](commands/integrate.md) + - [vcpkg remove](commands/remove.md) + - [vcpkg search](commands/search.md) ### User Help diff --git a/docs/commands/index.md b/docs/commands/index.md deleted file mode 100644 index 9e9af1a4731c8b..00000000000000 --- a/docs/commands/index.md +++ /dev/null @@ -1,16 +0,0 @@ -# vcpkg Command Line Reference - -**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/commands/index.md).** - -## Contents - -- [Common Options](common-options.md) -- Commands - - [vcpkg install](install.md) - - [vcpkg integrate](integrate.md) - - [vcpkg remove](remove.md) - - [vcpkg search](search.md) - -## Source - -The vcpkg command line is developed in a separate repository on GitHub: [microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool). Issues should be posted to [microsoft/vcpkg](https://github.com/microsoft/vcpkg/issues). diff --git a/docs/examples/overlay-triplets-linux-dynamic.md b/docs/examples/overlay-triplets-linux-dynamic.md index 5d79013377afb1..25872b724be5c0 100644 --- a/docs/examples/overlay-triplets-linux-dynamic.md +++ b/docs/examples/overlay-triplets-linux-dynamic.md @@ -1,4 +1,4 @@ -# Overlay triplets example +# Using Overlay Triplets ## Building dynamic libraries on Linux diff --git a/docs/users/android.md b/docs/users/android.md index b25099c1683629..25fa2745304045 100644 --- a/docs/users/android.md +++ b/docs/users/android.md @@ -216,6 +216,6 @@ endif() cmake .. -DVCPKG_TARGET_ANDROID=ON -DANDROID_ABI=armeabi-v7a ```` -## Consume libraries using vpckg, and Android prefab Archives (AAR files) +## Consume libraries using vcpkg, and Android prefab Archives (AAR files) See [prefab.md](../specifications/prefab.md) diff --git a/docs/users/versioning.md b/docs/users/versioning.md index 5f76b6ade239fd..d10c7ace69eec1 100644 --- a/docs/users/versioning.md +++ b/docs/users/versioning.md @@ -3,9 +3,9 @@ **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/versioning.md).** Versioning allows you to deterministically control the precise revisions of dependencies used by -your project from within your manifest file. +your project from within your manifest file. Versioning only applies to [Manifest Mode](manifests.md). -See our guide to [getting started with versioning](../examples/versioning.getting-started.md). +For an example with context, see our guide to [getting started with versioning](../examples/versioning.getting-started.md). ## Contents @@ -17,6 +17,7 @@ See our guide to [getting started with versioning](../examples/versioning.gettin * [Version constraints](#version-constraints) * [Baselines](#baselines) * [`version>=`](#version-gte) + * [`overrides`](#overrides) ## Version schemes Ports in vcpkg should attempt to follow the versioning conventions used by the package's authors. For that reason, when declaring a package's version the appropriate scheme should be used. @@ -141,6 +142,7 @@ Example: As part of a version constraint declaration, a port version can be specified by adding the suffix `#`, in the previous example `1.2.11#9` refers to version `1.2.11` port version `9`. + ### `overrides` Declaring an override forces vcpkg to ignore all other version constraints and use the version specified in the override. This is useful for pinning exact versions and for resolving version conflicts. From f4df5da028c2ab86f25a92542b3a0690eec6a8b2 Mon Sep 17 00:00:00 2001 From: Zirnc Date: Tue, 23 Aug 2022 00:25:00 +0800 Subject: [PATCH 442/791] Update README_zh_CN.md (#26456) --- README_zh_CN.md | 98 ++++++++++++++++++++++++------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/README_zh_CN.md b/README_zh_CN.md index a9c886dc74ed7a..e5b4dca3aa1a73 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -5,9 +5,9 @@ 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) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/)， #vcpkg 频道 @@ -39,19 +39,19 @@ Vcpkg 可帮助您在 Windows、 Linux 和 MacOS 上管理 C 和 C++ 库。 # 入门 首先，请阅读以下任一快速入门指南： -[Windows](#快速开始-windows) 或 [macOS和Linux](#快速开始-unix)， +[Windows](#快速开始-windows) 或 [macOS 和 Linux](#快速开始-unix)， 这取决于您使用的是什么平台。 有关更多信息，请参见 [安装和使用软件包][getting-started:using-a-package]。 -如果vcpkg目录中没有您需要的库， -您可以 [在GitHub上打开问题][contributing:submit-issue]。 -vcpkg团队和贡献者可以看到它的地方， -并可能将这个库添加到vcpkg。 +如果 vcpkg 目录中没有您需要的库， +您可以 [在 GitHub 上打开问题][contributing:submit-issue]。 +vcpkg 团队和贡献者可以看到它的地方， +并可能将这个库添加到 vcpkg。 -安装并运行vcpkg后， -您可能希望将 [TAB补全](#tab补全自动补全) 添加到您的Shell中。 +安装并运行 vcpkg 后， +您可能希望将 [TAB 补全](#tab补全自动补全) 添加到您的 Shell 中。 -最后，如果您对vcpkg的未来感兴趣，请查看 [清单][getting-started:manifest-spec]！ +最后，如果您对 vcpkg 的未来感兴趣，请查看 [清单][getting-started:manifest-spec]！ 这是一项实验性功能，可能会出现错误。 因此，请尝试一下并[打开所有问题][contributing:submit-issue]! @@ -62,8 +62,8 @@ vcpkg团队和贡献者可以看到它的地方， - [Git][getting-started:git] - [Visual Studio 2015 Update 3][getting-started:visual-studio] 或更新的版本（**包含英文语言包**） -首先，**请使用git clone vcpkg** 并执行 bootstrap.bat 脚本。 -您可以将vcpkg安装在任何地方，但是通常我们建议您使用 vcpkg 作为 CMake 项目的子模块，并将其全局安装到 Visual Studio 项目中。 +首先，**请使用 `git clone vcpkg`** 并执行 bootstrap.bat 脚本。 +您可以将 vcpkg 安装在任何地方，但是通常我们建议您使用 vcpkg 作为 CMake 项目的子模块，并将其全局安装到 Visual Studio 项目中。 我们建议您使用例如 `C:\src\vcpkg` 或 `C:\dev\vcpkg` 的安装目录，否则您可能遇到某些库构建系统的路径问题。 ```cmd @@ -77,7 +77,7 @@ vcpkg团队和贡献者可以看到它的地方， > .\vcpkg\vcpkg install [packages to install] ``` -请注意: vcpkg在Windows中默认编译并安装x86版本的库。 若要编译并安装x64版本，请执行: +请注意: vcpkg 在 Windows 中默认编译并安装 x86 版本的库。 若要编译并安装 x64 版本，请执行: ```cmd > .\vcpkg\vcpkg install [package name]:x64-windows @@ -89,34 +89,34 @@ vcpkg团队和贡献者可以看到它的地方， > .\vcpkg\vcpkg install [packages to install] --triplet=x64-windows ``` -您也可以使用 `search` 子命令来查找vcpkg中集成的库: +您也可以使用 `search` 子命令来查找 vcpkg 中集成的库: ```cmd > .\vcpkg\vcpkg search [search term] ``` -若您希望在 Visual Studio 中使用vcpkg，请运行以下命令 (可能需要管理员权限) +若您希望在 Visual Studio 中使用 vcpkg，请运行以下命令 (可能需要管理员权限) ```cmd > .\vcpkg\vcpkg integrate install ``` -在此之后，您可以创建一个非cmake项目 (或打开已有的项目)。 +在此之后，您可以创建一个非 CMake 项目 (或打开已有的项目)。 在您的项目中，所有已安装的库均可立即使用 `#include` 包含您需使用的库的头文件且无需额外配置。 -若您在 Visual Studio 中使用cmake工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。 +若您在 Visual Studio 中使用 CMake 工程，请查阅[这里](#visual-studio-cmake-工程中使用-vcpkg)。 -为了在IDE以外在cmake中使用vcpkg，您需要使用以下工具链文件: +为了在 IDE 以外在 CMake 中使用 vcpkg，您需要使用以下工具链文件: ```cmd > cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" > cmake --build [build directory] ``` -在cmake中，您仍需通过 `find_package` 来使用vcpkg中已安装的库。 -请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息，其中包含了在IDE中使用cmake的内容。 +在 CMake 中，您仍需通过 `find_package` 来使用 vcpkg 中已安装的库。 +请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息，其中包含了在 IDE 中使用 CMake 的内容。 -对于其他工具 (包括Visual Studio Code)，请查阅 [集成指南][getting-started:integration]。 +对于其他工具 (包括 Visual Studio Code)，请查阅 [集成指南][getting-started:integration]。 ## 快速开始: Unix @@ -124,11 +124,11 @@ Linux平台前置条件: - [Git][getting-started:git] - [g++][getting-started:linux-gcc] >= 6 -macOS平台前置条件: +macOS 平台前置条件: - [Apple Developer Tools][getting-started:macos-dev-tools] -首先，**请使用git clone vcpkg** 并执行 bootstrap.sh 脚本。 -我们建议您将vcpkg作为cmake项目的子模块使用。 +首先，**请使用 `git clone vcpkg`** 并执行 bootstrap.sh 脚本。 +我们建议您将 vcpkg 作为 CMake 项目的子模块使用。 ```sh $ git clone https://github.com/microsoft/vcpkg @@ -141,31 +141,31 @@ $ ./vcpkg/bootstrap-vcpkg.sh $ ./vcpkg/vcpkg install [packages to install] ``` -您也可以使用 `search` 子命令来查找vcpkg中已集成的库: +您也可以使用 `search` 子命令来查找 vcpkg 中已集成的库: ```sh $ ./vcpkg/vcpkg search [search term] ``` -为了在cmake中使用vcpkg，您需要使用以下工具链文件: +为了在 CMake 中使用 vcpkg，您需要使用以下工具链文件: ```sh $ cmake -B [build directory] -S . "-DCMAKE_TOOLCHAIN_FILE=[path to vcpkg]/scripts/buildsystems/vcpkg.cmake" $ cmake --build [build directory] ``` -在cmake中，您仍需通过 `find_package` 来使用vcpkg中已安装的库。 -为了您更好的在cmake或 VSCode CMake Tools 中使用vcpkg， +在 CMake 中，您仍需通过 `find_package` 来使用 vcpkg 中已安装的库。 +为了您更好的在 CMake 或 VSCode CMake Tools 中使用 vcpkg， 请查阅 [CMake 章节](#在-cmake-中使用-vcpkg) 获取更多信息， -其中包含了在IDE中使用cmake的内容。 +其中包含了在 IDE 中使用 CMake 的内容。 对于其他工具，请查阅 [集成指南][getting-started:integration]。 ## 安装 Linux Developer Tools -在Linux的不同发行版中，您需要安装不同的工具包: +在 Linux 的不同发行版中，您需要安装不同的工具包: -- Debian，Ubuntu，popOS或其他基于 Debian 的发行版: +- Debian，Ubuntu，popOS 或其他基于 Debian 的发行版: ```sh $ sudo apt-get update @@ -192,15 +192,15 @@ $ xcode-select --install ``` 然后按照出现的窗口中的提示进行操作。 -此时，您就可以使用 bootstrap.sh 编译vcpkg了。 请参阅 [快速开始](#快速开始-unix) +此时，您就可以使用 bootstrap.sh 编译 vcpkg 了。 请参阅 [快速开始](#快速开始-unix) ## 在 CMake 中使用 vcpkg -若您希望在CMake中使用vcpkg，以下内容可能帮助您： +若您希望在 CMake 中使用vcpkg，以下内容可能帮助您： ### Visual Studio Code 中的 CMake Tools -将以下内容添加到您的工作区的 `settings.json` 中将使CMake Tools自动使用vcpkg中的第三方库: +将以下内容添加到您的工作区的 `settings.json` 中将使 CMake Tools 自动使用 vcpkg 中的第三方库: ```json { @@ -212,7 +212,7 @@ $ xcode-select --install ### Visual Studio CMake 工程中使用 vcpkg -打开CMake设置选项，将 vcpkg toolchain 文件路径在 `CMake toolchain file` 中： +打开 CMake 设置选项，将 vcpkg toolchain 文件路径在 `CMake toolchain file` 中： ``` [vcpkg root]/scripts/buildsystems/vcpkg.cmake @@ -233,16 +233,16 @@ $ xcode-select --install ### 将 vcpkg 作为一个子模块 -当您希望将vcpkg作为一个子模块加入到您的工程中时， +当您希望将 vcpkg 作为一个子模块加入到您的工程中时， 您可以在第一个 `project()` 调用之前将以下内容添加到 CMakeLists.txt 中， -而无需将 `CMAKE_TOOLCHAIN_FILE` 传递给cmake调用。 +而无需将 `CMAKE_TOOLCHAIN_FILE` 传递给 CMake 调用。 ```cmake set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake" 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/buildsystems/integration.md @@ -255,10 +255,10 @@ set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems [getting-started:visual-studio]: https://visualstudio.microsoft.com/ [getting-started:manifest-spec]: docs/specifications/manifests.md -# Tab补全/自动补全 +# Tab 补全/自动补全 `vcpkg` 支持命令，包名称，以及 Powershell 和 Bash 中的选项。 -若您需要在指定的 shell 中启用Tab补全功能，请依据您使用的shell运行： +若您需要在指定的 shell 中启用 Tab 补全功能，请依据您使用的 shell 运行： ```pwsh > .\vcpkg integrate powershell @@ -277,25 +277,25 @@ $ ./vcpkg integrate bash # 或 zsh 请查看 [文档](docs/README.md) 获取具体示例， 其包含 [安装并使用包](docs/examples/installing-and-using-packages.md)， [使用压缩文件添加包](docs/examples/packaging-zipfiles.md) -和 [从GitHub源中添加一个包](docs/examples/packaging-github-repos.md)。 +和 [从 GitHub 源中添加一个包](docs/examples/packaging-github-repos.md)。 我们的文档现在也可以从 [vcpkg.io](https://vcpkg.io/) 在线获取。 -我们真诚的希望您向我们提出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 打开issue. +我们真诚的希望您向我们提出关于此网站的任何建议! 请在[这里](https://github.com/vcpkg/vcpkg.github.io/issues) 创建 issue. -观看4分钟 [demo视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。 +观看 4 分钟 [demo 视频](https://www.youtube.com/watch?v=y41WFKbQFTw)。 ## 贡献 Vcpkg是一个开源项目，并通过您的贡献不断发展。 下面是一些您可以贡献的方式: -* [提交一个关于vcpkg或已支持包的新issue][contributing:submit-issue] -* [提交修复PR和创建新包][contributing:submit-pr] +* [提交一个关于 vcpkg 或已支持包的新 issue][contributing:submit-issue] +* [提交修复 PR 和创建新包][contributing:submit-pr] 请参阅我们的 [贡献准则](CONTRIBUTING_zh.md) 了解更多详细信息。 -该项目采用了 [Microsoft开源行为准则][contributing:coc]。 -获取更多信息请查看 [行为准则FAQ][contributing:coc-faq] 或联系 [opencode@microsoft.com](mailto:opencode@microsoft.com) 提出其他问题或意见。 +该项目采用了 [Microsoft 开源行为准则][contributing:coc]。 +获取更多信息请查看 [行为准则 FAQ][contributing:coc-faq] 或联系 [opencode@microsoft.com](mailto:opencode@microsoft.com) 提出其他问题或意见。 [contributing:submit-issue]: https://github.com/microsoft/vcpkg/issues/new/choose [contributing:submit-pr]: https://github.com/microsoft/vcpkg/pulls @@ -308,8 +308,8 @@ Vcpkg是一个开源项目，并通过您的贡献不断发展。 # 数据收集 -vcpkg会收集使用情况数据，以帮助我们改善您的体验。 -Microsoft收集的数据是匿名的。 +vcpkg 会收集使用情况数据，以帮助我们改善您的体验。 +Microsoft 收集的数据是匿名的。 您也可以通过以下步骤禁用数据收集： - 将选项 `-disableMetrics` 传递给 bootstrap-vcpkg 脚本并重新运行此脚本 - 向 vcpkg 命令传递选项 `--disable-metrics` From 58df5a8bf7af678498ecc5f6e4465ce7996d0556 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 22 Aug 2022 09:29:53 -0700 Subject: [PATCH 443/791] [google-cloud-cpp] Fix wrong parameter "${FEATURES}" (#26459) * [google-cloud-cpp] Fix wrong parameter "${FEATURES}" * x-add-version --- ports/google-cloud-cpp/portfile.cmake | 10 +++++----- ports/google-cloud-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index d941ca12c92934..390dc160d66ad8 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -21,17 +21,17 @@ list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") # are invalid in `vcpkg` features, we use dashes (`-`) as a separator # for the `vcpkg` feature name, and convert it here to something that # `google-cloud-cpp` would like. -if ("dialogflow-cx" IN_LIST "${FEATURES}") +if ("dialogflow-cx" IN_LIST FEATURES) list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-cx") list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_cx") endif () -if ("dialogflow-es" IN_LIST "${FEATURES}") +if ("dialogflow-es" IN_LIST FEATURES) list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "dialogflow-es") list(APPEND GOOGLE_CLOUD_CPP_ENABLE "dialogflow_es") endif () vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS "-DGOOGLE_CLOUD_CPP_ENABLE=${GOOGLE_CLOUD_CPP_ENABLE}" @@ -44,7 +44,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") foreach(feature IN LISTS FEATURES) set(config_path "lib/cmake/google_cloud_cpp_${feature}") # Most features get their own package in `google-cloud-cpp`. @@ -72,6 +72,6 @@ endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 1b994cd9ae5567..426b15b482765b 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", "version": "2.1.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", diff --git a/versions/baseline.json b/versions/baseline.json index eeed4aadbc1ca8..7eb87d58f187e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2646,7 +2646,7 @@ }, "google-cloud-cpp": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index bd5692e5ed0a3b..b74c5088f6ea98 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a70cc631d25b110ce203a0f571689304fb0e8595", + "version": "2.1.0", + "port-version": 1 + }, { "git-tree": "a68fd18fa28b5bbe4807c7ed32ed45c0d4392dd1", "version": "2.1.0", From e8f9c3391d9aadc90c8ee0334e9deef02550061d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 22 Aug 2022 18:33:47 +0200 Subject: [PATCH 444/791] [gdal] Fix static windows builds, fix debug builds (#26457) * Fix static builds * Update versions * Fix Qhull usage * Update versions --- ports/gdal/cpl-disable-dll.patch | 45 ++++++++++++++++++++++++++++++++ ports/gdal/portfile.cmake | 6 +++++ ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 ++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 ports/gdal/cpl-disable-dll.patch diff --git a/ports/gdal/cpl-disable-dll.patch b/ports/gdal/cpl-disable-dll.patch new file mode 100644 index 00000000000000..fd1c81191d0de2 --- /dev/null +++ b/ports/gdal/cpl-disable-dll.patch @@ -0,0 +1,45 @@ +diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake +index 652edf1..0d1441b 100644 +--- a/cmake/helpers/configure.cmake ++++ b/cmake/helpers/configure.cmake +@@ -42,6 +42,10 @@ check_type_size("int" SIZEOF_INT) + check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) + check_type_size("void*" SIZEOF_VOIDP) + ++if(MSVC AND NOT BUILD_SHARED_LIBS) ++ set(CPL_DISABLE_DLL 1) ++endif() ++ + if (MSVC) + set(HAVE_VSNPRINTF 1) + +diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in +index c85d3b0..19d3f0a 100644 +--- a/cmake/template/cpl_config.h.in ++++ b/cmake/template/cpl_config.h.in +@@ -177,6 +177,9 @@ + /* Define to 1 if the compiler supports -Wzero-as-null-pointer-constant */ + #cmakedefine HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT @HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT@ + ++/* Define if building a static windows lib */ ++#cmakedefine CPL_DISABLE_DLL @CPL_DISABLE_DLL@ ++ + /* Define to 1 if you have the header file. */ + #cmakedefine HAVE_ATLBASE_H 1 + +diff --git a/gdal.cmake b/gdal.cmake +index ff1ca7e..7712f1d 100644 +--- a/gdal.cmake ++++ b/gdal.cmake +@@ -336,11 +336,6 @@ if (MINGW AND BUILD_SHARED_LIBS) + set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES SUFFIX "-${GDAL_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") + endif () + +- +-if (MSVC AND NOT BUILD_SHARED_LIBS) +- target_compile_definitions(${GDAL_LIB_TARGET_NAME} PUBLIC CPL_DISABLE_DLL=) +-endif () +- + if (MINGW) + if (TARGET_CPU MATCHES "x86_64") + add_definitions(-m64) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 39c9eda11956b3..a2657bb2b183d0 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES find-link-libraries.patch + cpl-disable-dll.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") @@ -64,6 +65,8 @@ if(VCPKG_TARGET_IS_ANDROID AND ANRDOID_PLATFORM VERSION_LESS 24 AND (VCPKG_TARGE list(APPEND FEATURE_OPTIONS -DBUILD_WITHOUT_64BIT_OFFSET=ON) endif() +string(REPLACE "dynamic" "" qhull_target "Qhull::qhull${VCPKG_LIBRARY_LINKAGE}_r") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -82,6 +85,9 @@ vcpkg_cmake_configure( -DOGR_BUILD_OPTIONAL_DRIVERS=ON -DGDAL_CHECK_PACKAGE_NetCDF_NAMES=netCDF -DGDAL_CHECK_PACKAGE_NetCDF_TARGETS=netCDF::netcdf + -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull + "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}" + "-DQHULL_LIBRARY=${qhull_target}" OPTIONS_RELEASE ${FEATURE_OPTIONS_RELEASE} OPTIONS_DEBUG diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index e50ff156635913..343bc1b2c151ad 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.5.1", - "port-version": 5, + "port-version": 6, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 7eb87d58f187e9..fcc75f3404dcd7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2482,7 +2482,7 @@ }, "gdal": { "baseline": "3.5.1", - "port-version": 5 + "port-version": 6 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index c2888c04850143..e067ef8e547c5d 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "548d8ee81b0b34493dc57b3610fb19db2403bb50", + "version-semver": "3.5.1", + "port-version": 6 + }, { "git-tree": "e875fbb6dc288ea2719e00a6b71b4834b8814640", "version-semver": "3.5.1", From 3a484e1e7f2d7e492bddf13fbbb2a80df22e452f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 22 Aug 2022 18:35:38 +0200 Subject: [PATCH 445/791] [json-c] Disable tests (#26450) * Disable json-c tests * Update versions --- ports/json-c/portfile.cmake | 2 ++ ports/json-c/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/json-c.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/json-c/portfile.cmake b/ports/json-c/portfile.cmake index 917d457a4f9300..582a1783cd2f4a 100644 --- a/ports/json-c/portfile.cmake +++ b/ports/json-c/portfile.cmake @@ -10,6 +10,8 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/json-c/vcpkg.json b/ports/json-c/vcpkg.json index 2ef772d401be07..8d6086e875ab32 100644 --- a/ports/json-c/vcpkg.json +++ b/ports/json-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "json-c", "version-date": "2022-06-26", - "port-version": 1, + "port-version": 2, "description": "A JSON implementation in C", "homepage": "https://github.com/json-c/json-c", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index fcc75f3404dcd7..908ed0dc093063 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3118,7 +3118,7 @@ }, "json-c": { "baseline": "2022-06-26", - "port-version": 1 + "port-version": 2 }, "json-dto": { "baseline": "0.3.1", diff --git a/versions/j-/json-c.json b/versions/j-/json-c.json index 799614a437f2f9..b08334fc8c40f2 100644 --- a/versions/j-/json-c.json +++ b/versions/j-/json-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2090ebb6a6e0be1d0f6331c266bd0bc6eef1cd57", + "version-date": "2022-06-26", + "port-version": 2 + }, { "git-tree": "c24e9a9cbc53b10a7235087cc58e89924415b281", "version-date": "2022-06-26", From 973fa17951a78226d7c9a64f08de060b3bebd02a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:37:28 +0200 Subject: [PATCH 446/791] [boost-context] fix arm64 builds (#26444) --- ports/boost-context/b2-options.cmake.in | 15 +++++++++++---- ports/boost-context/vcpkg.json | 1 + versions/b-/boost-context.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/boost-context/b2-options.cmake.in b/ports/boost-context/b2-options.cmake.in index a16d25fdbe95b7..c54e6b9f0c6aab 100644 --- a/ports/boost-context/b2-options.cmake.in +++ b/ports/boost-context/b2-options.cmake.in @@ -7,10 +7,17 @@ if(@VCPKG_TARGET_IS_WINDOWS@) endif() if(@VCPKG_TARGET_IS_OSX@) - list(APPEND B2_OPTIONS - abi=sysv - binary-format=mach-o - ) + if(@VCPKG_TARGET_ARCHITECTURE@ MATCHES "^(ARM|arm)64$") + list(APPEND B2_OPTIONS + abi=aapcs + binary-format=mach-o + ) + else() + list(APPEND B2_OPTIONS + abi=sysv + binary-format=mach-o + ) + endif() endif() if("@VCPKG_TARGET_IS_LINUX@" STREQUAL "ON" OR "@VCPKG_TARGET_IS_ANDROID@" STREQUAL "ON") diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index c77e45fe044404..987e59c364cfe7 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-context", "version": "1.79.0", + "port-version": 1, "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "license": "BSL-1.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index d809accb8c047a..5facde369e33cb 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24210ac19518ca74072938e9569a9e9f5b3476ba", + "version": "1.79.0", + "port-version": 1 + }, { "git-tree": "7abfa63f40d05e79743c416050ed97f8351d3c37", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 908ed0dc093063..93c66e2e8375da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -630,7 +630,7 @@ }, "boost-context": { "baseline": "1.79.0", - "port-version": 0 + "port-version": 1 }, "boost-contract": { "baseline": "1.79.0", From 3f7e013c4de72c7fd49eeba6e91b4a6cca7481ff Mon Sep 17 00:00:00 2001 From: Andrey Filipenkov Date: Mon, 22 Aug 2022 19:43:20 +0300 Subject: [PATCH 447/791] [sdl2-image] fix dynamic build on macOS (#26445) * [sdl2-image] fix dynamic build on macOS * update versions of sdl2-image --- ports/sdl2-image/CMakeLists.txt | 7 +++++++ ports/sdl2-image/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sdl2-image.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt index 45b2b57e64122d..70f2797542fd41 100644 --- a/ports/sdl2-image/CMakeLists.txt +++ b/ports/sdl2-image/CMakeLists.txt @@ -42,6 +42,13 @@ if (APPLE) target_compile_options(SDL2_image BEFORE PRIVATE "-x" "objective-c" ) + target_link_libraries(SDL2_image PRIVATE + "-framework CoreFoundation" + "-framework CoreGraphics" + "-framework CoreServices" + "-framework Foundation" + "-framework ImageIO" + ) endif() set_target_properties(SDL2_image PROPERTIES DEFINE_SYMBOL DLL_EXPORT) diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json index 0eb0da92b8ebf3..1d9b5ce7a4518f 100644 --- a/ports/sdl2-image/vcpkg.json +++ b/ports/sdl2-image/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-image", "version": "2.0.5", - "port-version": 6, + "port-version": 7, "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", "homepage": "https://www.libsdl.org/projects/SDL_image", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 93c66e2e8375da..531246778cd641 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6518,7 +6518,7 @@ }, "sdl2-image": { "baseline": "2.0.5", - "port-version": 6 + "port-version": 7 }, "sdl2-mixer": { "baseline": "2.6.1", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index cc213ea4553f72..67d171b01176a5 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4890f12d4639bf57d7eac19097b5903c06574184", + "version": "2.0.5", + "port-version": 7 + }, { "git-tree": "e1ed993b97bc76d5a8abdf4e9e8e148903078a70", "version": "2.0.5", From 0f089d02bbe88032c32a8084ff4a0fae2f7a64a3 Mon Sep 17 00:00:00 2001 From: Stephen Just Date: Mon, 22 Aug 2022 09:44:24 -0700 Subject: [PATCH 448/791] [openal-soft] Enable NEON on arm64 targets (#26452) * [openal] Enable NEON on arm64 targets * Add versions * Typo * Update version database --- ports/openal-soft/portfile.cmake | 6 +++++- ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index aa6c7b01b3af14..fa6fb6e3f34ad6 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -20,6 +20,7 @@ endif() set(ALSOFT_REQUIRE_LINUX OFF) set(ALSOFT_REQUIRE_WINDOWS OFF) set(ALSOFT_REQUIRE_APPLE OFF) +set(ALSOFT_CPUEXT_NEON OFF) if(VCPKG_TARGET_IS_LINUX) set(ALSOFT_REQUIRE_LINUX ON) @@ -30,6 +31,9 @@ endif() if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(ALSOFT_REQUIRE_APPLE ON) endif() +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(ALSOFT_CPUEXT_NEON ON) +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -54,7 +58,7 @@ vcpkg_cmake_configure( -DALSOFT_BACKEND_WINMM=OFF -DALSOFT_BACKEND_DSOUND=OFF -DALSOFT_REQUIRE_WASAPI=${ALSOFT_REQUIRE_WINDOWS} - -DALSOFT_CPUEXT_NEON=OFF + -DALSOFT_CPUEXT_NEON=${ALSOFT_CPUEXT_NEON} -DCMAKE_DISABLE_FIND_PACKAGE_WindowsSDK=ON MAYBE_UNUSED_VARIABLES ALSOFT_AMBDEC_PRESETS diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 38555819cea44c..b6a1a169a71e27 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.22.2", - "port-version": 2, + "port-version": 3, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 531246778cd641..a192863f9ddf9d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5154,7 +5154,7 @@ }, "openal-soft": { "baseline": "1.22.2", - "port-version": 2 + "port-version": 3 }, "openblas": { "baseline": "0.3.20", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 819a183d4e8bbb..fcc1028c6056e8 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0e8008cd2061bcaeaf0ed725438edae4386aac1", + "version-semver": "1.22.2", + "port-version": 3 + }, { "git-tree": "a964545a6c1ea12eb653de3d4739431ddf1cce85", "version-semver": "1.22.2", From 3fefadf6cbf2394af99522c1d5f74dc43fa6af9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 22 Aug 2022 16:46:21 +0000 Subject: [PATCH 449/791] [vcpkg baseline][readosm/jemalloc] Disable uwp build and cleanup (#26455) * [vcpkg baseline][readosm] Disable uwp build * version * Cleanup baseline --- ports/readosm/vcpkg.json | 4 +++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/r-/readosm.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/readosm/vcpkg.json b/ports/readosm/vcpkg.json index f93c643368c7c7..e2b35c6b9a753f 100644 --- a/ports/readosm/vcpkg.json +++ b/ports/readosm/vcpkg.json @@ -1,9 +1,11 @@ { "name": "readosm", "version-string": "1.1.0a", - "port-version": 2, + "port-version": 3, "description": "ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)", "homepage": "https://www.gaia-gis.it/gaia-sins/readosm-sources", + "license": "MPL-1.1", + "supports": "!uwp", "dependencies": [ "expat", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7c9c6e600250c5..40be3120417946 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -387,11 +387,9 @@ irrlicht:x64-uwp=fail isal:x64-linux=skip jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail -jemalloc:x64-linux=fail jemalloc:x64-osx=fail jemalloc:arm64-osx=fail jemalloc:x64-uwp=fail -jemalloc:x64-windows-static=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail kfr:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index a192863f9ddf9d..bfbcc3a58783d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6254,7 +6254,7 @@ }, "readosm": { "baseline": "1.1.0a", - "port-version": 2 + "port-version": 3 }, "realsense2": { "baseline": "2.50.0", diff --git a/versions/r-/readosm.json b/versions/r-/readosm.json index 79eeaa11694520..9275bf7eae8512 100644 --- a/versions/r-/readosm.json +++ b/versions/r-/readosm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e04328cccd78bf8d4ec57d70059d49501b361292", + "version-string": "1.1.0a", + "port-version": 3 + }, { "git-tree": "4a5f7efaec651bab56e95ba4db4e8d9316050b9c", "version-string": "1.1.0a", From 552f1ee5f83e370b9df9dc677181c2dd765b22ba Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 22 Aug 2022 21:26:13 +0200 Subject: [PATCH 450/791] [Part1|xwindow PR] Split up to dbus (#22642) * first batch of xwindow PR ports - up to dbus * first batch of xwindow PR ports - up to dbus * format manifest * version stuff * remove if block * version stuff * fix xcb hash * fix xproto dependency on meson blocking cross builds * adjust message * use X11_xcb_LIB * version stuff * put xlib arm64-windows on baseline * fix dbus on osx and linux * version stuff * forget to set the value * fix --export-dynamic on osx * version dbus * ci-retrigger * add license (needs tool update) * version adjustments * version update * remove unnecessary comments * v db * Apply suggestions from code review Co-authored-by: Billy O'Neal * nitpicks * rename xau to libxau * use vcpkg_install_copyright and silence usage * xtrans silence usage * format-manifest * v db * make license null for ports without exact match * xdmcp rename to libxdmcp * merge x11 wrapper into xlib rename xlib to libx11 to avoid a metaport * v db * missed dbus depending on x11. * v db * Update scripts/ci.baseline.txt Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Alexander Neumann Co-authored-by: JackBoosY Co-authored-by: Billy O'Neal --- ports/dbus/cmake.dep.patch | 15 +++ ports/dbus/getpeereid.patch | 26 ++++ ports/dbus/pkgconfig.patch | 17 +++ ports/dbus/portfile.cmake | 64 ++++++++++ ports/dbus/rdynamic.patch | 15 +++ ports/dbus/rt_pc_link.patch | 27 ++++ ports/dbus/vcpkg.json | 20 +++ ports/libx11/cl.build.patch | 147 ++++++++++++++++++++++ ports/libx11/dllimport.patch | 44 +++++++ ports/libx11/io_include.patch | 12 ++ ports/libx11/portfile.cmake | 80 ++++++++++++ ports/libx11/vcpkg-cmake-wrapper.cmake | 12 ++ ports/libx11/vcpkg.json | 17 +++ ports/libx11/vcxserver.patch | 138 ++++++++++++++++++++ ports/libxau/portfile.cmake | 31 +++++ ports/libxau/vcpkg.json | 12 ++ ports/libxdmcp/configure.ac.patch | 13 ++ ports/libxdmcp/portfile.cmake | 36 ++++++ ports/libxdmcp/vcpkg.json | 12 ++ ports/pthread-stubs/portfile.cmake | 51 ++++++++ ports/pthread-stubs/vcpkg.json | 10 ++ ports/xcb-proto/portfile.cmake | 49 ++++++++ ports/xcb-proto/vcpkg.json | 18 +++ ports/xcb-util-m4/portfile.cmake | 15 +++ ports/xcb-util-m4/vcpkg.json | 7 ++ ports/xcb/configure.patch | 47 +++++++ ports/xcb/getpid_include.patch | 14 +++ ports/xcb/makefile.patch | 13 ++ ports/xcb/portfile.cmake | 107 ++++++++++++++++ ports/xcb/use_xwindows_includes.patch | 21 ++++ ports/xcb/vcpkg.json | 22 ++++ ports/xorg-macros/portfile.cmake | 67 ++++++++++ ports/xorg-macros/skip_rawcpp.patch | 43 +++++++ ports/xorg-macros/vcpkg.json | 8 ++ ports/xproto/portfile.cmake | 51 ++++++++ ports/xproto/upstream-1.patch | 12 ++ ports/xproto/vcpkg.json | 15 +++ ports/xproto/vcxserver-xw32defs.patch | 22 ++++ ports/xproto/windows-include-guards.patch | 41 ++++++ ports/xproto/windows-io.patch | 12 ++ ports/xproto/windows-long64.patch | 48 +++++++ ports/xproto/windows-none.patch | 85 +++++++++++++ ports/xproto/windows_mean_and_lean.patch | 13 ++ ports/xtrans/portfile.cmake | 64 ++++++++++ ports/xtrans/symbols.patch | 15 +++ ports/xtrans/vcpkg.json | 10 ++ ports/xtrans/win32.patch | 58 +++++++++ scripts/ci.baseline.txt | 2 + versions/baseline.json | 44 +++++++ versions/d-/dbus.json | 9 ++ versions/l-/libx11.json | 9 ++ versions/l-/libxau.json | 9 ++ versions/l-/libxdmcp.json | 9 ++ versions/p-/pthread-stubs.json | 9 ++ versions/x-/xcb-proto.json | 9 ++ versions/x-/xcb-util-m4.json | 9 ++ versions/x-/xcb.json | 9 ++ versions/x-/xorg-macros.json | 9 ++ versions/x-/xproto.json | 9 ++ versions/x-/xtrans.json | 9 ++ 60 files changed, 1821 insertions(+) create mode 100644 ports/dbus/cmake.dep.patch create mode 100644 ports/dbus/getpeereid.patch create mode 100644 ports/dbus/pkgconfig.patch create mode 100644 ports/dbus/portfile.cmake create mode 100644 ports/dbus/rdynamic.patch create mode 100644 ports/dbus/rt_pc_link.patch create mode 100644 ports/dbus/vcpkg.json create mode 100644 ports/libx11/cl.build.patch create mode 100644 ports/libx11/dllimport.patch create mode 100644 ports/libx11/io_include.patch create mode 100644 ports/libx11/portfile.cmake create mode 100644 ports/libx11/vcpkg-cmake-wrapper.cmake create mode 100644 ports/libx11/vcpkg.json create mode 100644 ports/libx11/vcxserver.patch create mode 100644 ports/libxau/portfile.cmake create mode 100644 ports/libxau/vcpkg.json create mode 100644 ports/libxdmcp/configure.ac.patch create mode 100644 ports/libxdmcp/portfile.cmake create mode 100644 ports/libxdmcp/vcpkg.json create mode 100644 ports/pthread-stubs/portfile.cmake create mode 100644 ports/pthread-stubs/vcpkg.json create mode 100644 ports/xcb-proto/portfile.cmake create mode 100644 ports/xcb-proto/vcpkg.json create mode 100644 ports/xcb-util-m4/portfile.cmake create mode 100644 ports/xcb-util-m4/vcpkg.json create mode 100644 ports/xcb/configure.patch create mode 100644 ports/xcb/getpid_include.patch create mode 100644 ports/xcb/makefile.patch create mode 100644 ports/xcb/portfile.cmake create mode 100644 ports/xcb/use_xwindows_includes.patch create mode 100644 ports/xcb/vcpkg.json create mode 100644 ports/xorg-macros/portfile.cmake create mode 100644 ports/xorg-macros/skip_rawcpp.patch create mode 100644 ports/xorg-macros/vcpkg.json create mode 100644 ports/xproto/portfile.cmake create mode 100644 ports/xproto/upstream-1.patch create mode 100644 ports/xproto/vcpkg.json create mode 100644 ports/xproto/vcxserver-xw32defs.patch create mode 100644 ports/xproto/windows-include-guards.patch create mode 100644 ports/xproto/windows-io.patch create mode 100644 ports/xproto/windows-long64.patch create mode 100644 ports/xproto/windows-none.patch create mode 100644 ports/xproto/windows_mean_and_lean.patch create mode 100644 ports/xtrans/portfile.cmake create mode 100644 ports/xtrans/symbols.patch create mode 100644 ports/xtrans/vcpkg.json create mode 100644 ports/xtrans/win32.patch create mode 100644 versions/d-/dbus.json create mode 100644 versions/l-/libx11.json create mode 100644 versions/l-/libxau.json create mode 100644 versions/l-/libxdmcp.json create mode 100644 versions/p-/pthread-stubs.json create mode 100644 versions/x-/xcb-proto.json create mode 100644 versions/x-/xcb-util-m4.json create mode 100644 versions/x-/xcb.json create mode 100644 versions/x-/xorg-macros.json create mode 100644 versions/x-/xproto.json create mode 100644 versions/x-/xtrans.json diff --git a/ports/dbus/cmake.dep.patch b/ports/dbus/cmake.dep.patch new file mode 100644 index 00000000000000..ac827f0c27f18e --- /dev/null +++ b/ports/dbus/cmake.dep.patch @@ -0,0 +1,15 @@ +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 8cde1ffe0..d4d09f223 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -91,7 +91,9 @@ endif() + add_executable(dbus-launch ${dbus_launch_SOURCES}) + target_link_libraries(dbus-launch ${DBUS_LIBRARIES}) + if(DBUS_BUILD_X11) +- target_link_libraries(dbus-launch ${X11_LIBRARIES} ) ++ find_package(Threads REQUIRED) ++ target_link_libraries(dbus-launch ${X11_LIBRARIES} ${X11_xcb_LIB} ${X11_Xau_LIB} ${X11_Xdmcp_LIB} Threads::Threads) ++ target_include_directories(dbus-launch PRIVATE ${X11_INCLUDE_DIR}) + endif() + install(TARGETS dbus-launch ${INSTALL_TARGETS_DEFAULT_ARGS}) + diff --git a/ports/dbus/getpeereid.patch b/ports/dbus/getpeereid.patch new file mode 100644 index 00000000000000..d94600208342d8 --- /dev/null +++ b/ports/dbus/getpeereid.patch @@ -0,0 +1,26 @@ +diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake +index 7bc789f0e..ec476d9ed 100644 +--- a/cmake/ConfigureChecks.cmake ++++ b/cmake/ConfigureChecks.cmake +@@ -44,6 +44,7 @@ check_include_file(sys/inotify.h DBUS_BUS_ENABLE_INOTIFY) + + check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) # dbus-sysdeps.c, dbus-sysdeps-win.c + check_symbol_exists(getgrouplist "grp.h" HAVE_GETGROUPLIST) # dbus-sysdeps.c ++check_symbol_exists(getpeereid "sys/types.h;unistd.h" HAVE_GETPEEREID) # dbus-sysdeps.c, + check_symbol_exists(getpeerucred "ucred.h" HAVE_GETPEERUCRED) # dbus-sysdeps.c, dbus-sysdeps-win.c + check_symbol_exists(nanosleep "time.h" HAVE_NANOSLEEP) # dbus-sysdeps.c + check_symbol_exists(getpwnam_r "errno.h;pwd.h" HAVE_GETPWNAM_R) # dbus-sysdeps-util-unix.c +diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake +index cbffcfa91..1f055ddb9 100644 +--- a/cmake/config.h.cmake ++++ b/cmake/config.h.cmake +@@ -169,6 +169,9 @@ + /* Define to 1 if you have getgrouplist */ + #cmakedefine HAVE_GETGROUPLIST 1 + ++/* Define to 1 if you have getpeereid */ ++#cmakedefine HAVE_GETPEEREID 1 ++ + /* Define to 1 if you have getpeerucred */ + #cmakedefine HAVE_GETPEERUCRED 1 + diff --git a/ports/dbus/pkgconfig.patch b/ports/dbus/pkgconfig.patch new file mode 100644 index 00000000000000..be83adb779e26e --- /dev/null +++ b/ports/dbus/pkgconfig.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c2f6ba5b..a5f7fe222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -723,8 +723,10 @@ add_custom_target(help-options + # create pkgconfig file + # + if(DBUS_ENABLE_PKGCONFIG) +- set(PLATFORM_LIBS pthread ${LIBRT}) +- if(PKG_CONFIG_FOUND) ++ if(NOT WIN32) ++ set(PLATFORM_LIBS pthread ${LIBRT}) ++ endif() ++ if(1) + # convert lists of link libraries into -lstdc++ -lm etc.. + foreach(LIB ${PLATFORM_LIBS}) + set(LIBDBUS_LIBS "${LIBDBUS_LIBS} -l${LIB}") diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake new file mode 100644 index 00000000000000..a4be54ff661fb3 --- /dev/null +++ b/ports/dbus/portfile.cmake @@ -0,0 +1,64 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + OUT_SOURCE_PATH SOURCE_PATH + REPO dbus/dbus + REF c91ca6edad658274607323a438eea7c7c6c5e392 #1.13.18 + SHA512 4dd4d369152591040ebe9f474a0ba8911d8a91546d64b1d6f7335b7fd8026bd99a8a4fe1c78b80eb2e31e9e58324d432857e2a7af1d1cb950d22b4430cc0f7ac + HEAD_REF master + PATCHES + cmake.dep.patch + rt_pc_link.patch + pkgconfig.patch + getpeereid.patch # missing check from configure.ac + rdynamic.patch # OSX doesn't like '-Wl,--export-dynamic' +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDBUS_BUILD_TESTS=OFF + -DDBUS_ENABLE_XML_DOCS=OFF + -DDBUS_INSTALL_SYSTEM_LIBS=OFF + -DDBUS_ENABLE_PKGCONFIG=ON + #-DDBUS_SERVICE=ON + -DDBUS_WITH_GLIB=ON + -DXSLTPROC_EXECUTABLE=FALSE + -DENABLE_SYSTEMD=ON + -DDBUS_ENABLE_PKGCONFIG=ON + -DPKG_CONFIG_FOUND=TRUE + "-DCMAKE_INSTALL_SYSCONFDIR=${CURRENT_PACKAGES_DIR}/etc/${PORT}" + "-DWITH_SYSTEMD_SYSTEMUNITDIR=lib/systemd/system" + "-DWITH_SYSTEMD_USERUNITDIR=lib/systemd/user" +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME "DBus1" CONFIG_PATH "lib/cmake/DBus1") +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var/" + "${CURRENT_PACKAGES_DIR}/var" + "${CURRENT_PACKAGES_DIR}/share/dbus-1/services" + "${CURRENT_PACKAGES_DIR}/share/dbus-1/session.d" + "${CURRENT_PACKAGES_DIR}/share/dbus-1/system-services" + "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.d") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +set(TOOLS daemon launch monitor run-session send test-tool update-activation-environment) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/dbus-env.bat" "${CURRENT_PACKAGES_DIR}" "%~dp0/..") +else() + list(APPEND TOOLS cleanup-sockets uuidgen) +endif() +list(TRANSFORM TOOLS PREPEND "dbus-" ) +vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN) + + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/dbus/rdynamic.patch b/ports/dbus/rdynamic.patch new file mode 100644 index 00000000000000..34096a3ddf9cbc --- /dev/null +++ b/ports/dbus/rdynamic.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1c2f6ba5b..6a4c5410b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -277,8 +277,8 @@ endif() + + if(UNIX AND NOT DBUS_DISABLE_ASSERT) + # required for backtrace +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wl,--export-dynamic") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wl,--export-dynamic") ++ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -rdynamic") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -rdynamic") + add_definitions(-DDBUS_BUILT_R_DYNAMIC) + endif() + diff --git a/ports/dbus/rt_pc_link.patch b/ports/dbus/rt_pc_link.patch new file mode 100644 index 00000000000000..ad2bcd0b4b1650 --- /dev/null +++ b/ports/dbus/rt_pc_link.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index caef73840..caf7e61bf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -726,7 +726,7 @@ if(DBUS_ENABLE_PKGCONFIG) + set(PLATFORM_LIBS pthread ${LIBRT}) + if(PKG_CONFIG_FOUND) + # convert lists of link libraries into -lstdc++ -lm etc.. +- foreach(LIB ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) ++ foreach(LIB ${PLATFORM_LIBS}) + set(LIBDBUS_LIBS "${LIBDBUS_LIBS} -l${LIB}") + endforeach() + set(original_prefix "${CMAKE_INSTALL_PREFIX}") +diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt +index 63070b69b..5752b7492 100644 +--- a/dbus/CMakeLists.txt ++++ b/dbus/CMakeLists.txt +@@ -253,6 +253,9 @@ endif() + + # for clock_getres() on e.g. GNU/Linux (but not Android) + find_library(LIBRT rt) ++get_filename_component(LIBRT "${LIBRT}" NAME_WLE) ++string(REPLACE "lib" "" LIBRT "${LIBRT}") ++set(LIBRT "${LIBRT}" CACHE STRING "" FORCE) + + # for socket() on QNX + find_library(LIBSOCKET socket) diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json new file mode 100644 index 00000000000000..97c67d4c46d9f0 --- /dev/null +++ b/ports/dbus/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "dbus", + "version": "1.13.18", + "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon", + "homepage": "https://gitlab.freedesktop.org/dbus/dbus", + "license": "AFL-2.1 OR GPL-2.0-or-later", + "dependencies": [ + "expat", + "glib", + "libx11", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libx11/cl.build.patch b/ports/libx11/cl.build.patch new file mode 100644 index 00000000000000..2845f1d3192268 --- /dev/null +++ b/ports/libx11/cl.build.patch @@ -0,0 +1,147 @@ +diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h +index 844571688..e46c4ec5d 100644 +--- a/include/X11/Xlibint.h ++++ b/include/X11/Xlibint.h +@@ -1351,11 +1351,14 @@ extern int _XOpenFile( + int /* flags */ + ); + ++#if defined(_MSC_VER) && !defined(mode_t) ++typedef int mode_t; ++#endif + extern int _XOpenFileMode( + _Xconst char* /* path */, + int /* flags */, + mode_t /* mode */ + ); + + extern void* _XFopenFile( + _Xconst char* /* path */, +diff --git a/modules/im/ximcp/imLcLkup.c b/modules/im/ximcp/imLcLkup.c +index 56dba9673..d10de825e 100644 +--- a/modules/im/ximcp/imLcLkup.c ++++ b/modules/im/ximcp/imLcLkup.c +@@ -61,27 +61,37 @@ _XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes, + ||(ic->private.local.brl_committed != 0))) { + if (ic->private.local.brl_committed != 0) { /* Braille Event */ + unsigned char pattern = ic->private.local.brl_committed; ++#ifndef _MSC_VER + char mb2[XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max)]; ++#else ++ char *mb2 = (char*)malloc(XLC_PUBLIC(ic->core.im->core.lcd, mb_cur_max)*sizeof(char)); ++#endif + ret = _Xlcwctomb(ic->core.im->core.lcd, mb2, BRL_UC_ROW | pattern); + if(ret > bytes) { + if(status) *status = XBufferOverflow; ++#ifdef _MSC_VER ++ free(mb2); ++#endif + return(ret); + } + if(keysym) *keysym = XK_braille_blank | pattern; + if(ret > 0) { + if (keysym) { + if(status) *status = XLookupBoth; + } else { + if(status) *status = XLookupChars; + } + memcpy(buffer, mb2, ret); + } else { + if(keysym) { + if(status) *status = XLookupKeySym; + } else { + if(status) *status = XLookupNone; + } + } ++#ifdef _MSC_VER ++ free(mb2); ++#endif + } else { /* Composed Event */ + ret = strlen(&mb[b[ic->private.local.composed].mb]); + if(ret > bytes) { +diff --git a/src/XlibInt.c b/src/XlibInt.c +index e4fb4e5f2..4cfa1aeab 100644 +--- a/src/XlibInt.c ++++ b/src/XlibInt.c +@@ -60,6 +60,8 @@ from The Open Group. + /* Needed for ioctl() on Solaris */ + #ifdef HAVE_UNISTD_H + #include ++#else ++ #define F_OK 0 + #endif + + #ifdef XTHREADS +@@ -985,7 +987,7 @@ _XWireToEvent( + case KeymapNotify: + { + register XKeymapEvent *ev = (XKeymapEvent *) re; +- ev->window = None; ++ ev->window = 0; + memcpy(&ev->key_vector[1], + (char *)((xKeymapEvent *) event)->map, + sizeof (((xKeymapEvent *) event)->map)); +@@ -1919,7 +1925,11 @@ int _XOpenFileMode(path, flags, mode) + UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS); + + if (AccessFile (path, buf, MAX_PATH, &bufp)) ++#ifndef _MSC_VER + ret = open (bufp, flags, mode); ++#else ++ ret = _open (bufp, flags, mode); ++#endif + + (void) SetErrorMode (olderror); + +diff --git a/src/xlibi18n/XDefaultOMIF.c b/src/xlibi18n/XDefaultOMIF.c +index 9345547c3..77d914fe1 100644 +--- a/src/xlibi18n/XDefaultOMIF.c ++++ b/src/xlibi18n/XDefaultOMIF.c +@@ -70,6 +70,14 @@ Sun Microsystems, Inc. or its licensors is granted. + #include + #include + ++#if !defined(ssize_t) ++ #ifdef _WIN64 ++ #define ssize_t long long ++ #else ++ #define ssize_t long ++ #endif ++#endif ++ + #define MAXFONTS 100 + + #define XOM_GENERIC(om) (&((XOMGeneric) om)->gen) +diff --git a/src/xlibi18n/lcDB.c b/src/xlibi18n/lcDB.c +index e04a5d89f..fa46f8ecc 100644 +--- a/src/xlibi18n/lcDB.c ++++ b/src/xlibi18n/lcDB.c +@@ -65,6 +65,14 @@ + + #include + ++#if !defined(ssize_t) ++ #ifdef _WIN64 ++ #define ssize_t long long ++ #else ++ #define ssize_t long ++ #endif ++#endif ++ + typedef struct _DatabaseRec { + char *category; + char *name; +diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c +index e43ac2c0e..d9f49b725 100644 +--- a/src/xlibi18n/lcFile.c ++++ b/src/xlibi18n/lcFile.c +@@ -32,7 +32,9 @@ + #include "Xlibint.h" + #include "XlcPubI.h" + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + /************************************************************************/ + diff --git a/ports/libx11/dllimport.patch b/ports/libx11/dllimport.patch new file mode 100644 index 00000000000000..a06adc0d59f4d2 --- /dev/null +++ b/ports/libx11/dllimport.patch @@ -0,0 +1,44 @@ +diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h +index 603d05669..8596cb434 100644 +--- a/include/X11/Xlibint.h ++++ b/include/X11/Xlibint.h +@@ -389,23 +389,26 @@ struct _XLockPtrs { + #define _XLockMutex_fn (*_XLockMutex_fn_p) + #define _XUnlockMutex_fn (*_XUnlockMutex_fn_p) + #define _Xglobal_lock (*_Xglobal_lock_p) ++#define X_LOCK_EXTERN __declspec(dllimport) extern ++#else ++#define X_LOCK_EXTERN extern + #endif + + /* in XlibInt.c */ +-extern void (*_XCreateMutex_fn)( ++X_LOCK_EXTERN void (*_XCreateMutex_fn)( + LockInfoPtr /* lock */ + ); +-extern void (*_XFreeMutex_fn)( ++X_LOCK_EXTERN void (*_XFreeMutex_fn)( + LockInfoPtr /* lock */ + ); +-extern void (*_XLockMutex_fn)( ++X_LOCK_EXTERN void (*_XLockMutex_fn)( + LockInfoPtr /* lock */ + #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + , char * /* file */ + , int /* line */ + #endif + ); +-extern void (*_XUnlockMutex_fn)( ++X_LOCK_EXTERN void (*_XUnlockMutex_fn)( + LockInfoPtr /* lock */ + #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + , char * /* file */ +@@ -413,7 +416,7 @@ extern void (*_XUnlockMutex_fn)( + #endif + ); + +-extern LockInfoPtr _Xglobal_lock; ++X_LOCK_EXTERN LockInfoPtr _Xglobal_lock; + + #if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE) + #define LockDisplay(d) if ((d)->lock_fns) (*(d)->lock_fns->lock_display)((d),__FILE__,__LINE__) diff --git a/ports/libx11/io_include.patch b/ports/libx11/io_include.patch new file mode 100644 index 00000000000000..184b8d556a4eca --- /dev/null +++ b/ports/libx11/io_include.patch @@ -0,0 +1,12 @@ +diff --git a/src/XlibInt.c b/src/XlibInt.c +index bab39bc00..31b6511cb 100644 +--- a/src/XlibInt.c ++++ b/src/XlibInt.c +@@ -45,6 +45,7 @@ from The Open Group. + #include + #ifdef WIN32 + #include ++#include + #endif + + /* Needed for FIONREAD on Solaris */ diff --git a/ports/libx11/portfile.cmake b/ports/libx11/portfile.cmake new file mode 100644 index 00000000000000..52449bbe530993 --- /dev/null +++ b/ports/libx11/portfile.cmake @@ -0,0 +1,80 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(PATCHES dllimport.patch) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libx11 + REF 4c96f3567a8d045ee57b886fddc9618b71282530 #x11 v 1.7.3.1 + SHA512 15c55b6283aec363f6af5b549584d487ec5a8c0f74b95dc44674ff50764abe5b9fa216e2af3c5408faf12d17b04e9433f0ad66da6e32a0dfef0427ca131ef23b + HEAD_REF master + PATCHES cl.build.patch + io_include.patch + ${PATCHES} + vcxserver.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if(VCPKG_TARGET_IS_WINDOWS) + set(ENV{CPP} "cl_cpp_wrapper") +endif() + +set(OPTIONS "") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS + --enable-malloc0returnsnull=yes #Configure fails to run the test for some reason + --enable-loadable-i18n=no #Pointer conversion errors + --enable-ipv6 + --enable-hyperv + --enable-tcp-transport + --with-launchd=no + --with-lint=no + --disable-selective-werror + --enable-unix-transport=no) +endif() +if(NOT XLSTPROC) + find_program(XLSTPROC NAMES "xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt" PATH_SUFFIXES "bin") +endif() +if(NOT XLSTPROC) + message(FATAL_ERROR "${PORT} requires xlstproc for the host system. Please install libxslt within vcpkg or your system package manager!") +endif() +get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) +file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) +vcpkg_add_to_path("${XLSTPROC_DIR}") +set(ENV{XLSTPROC} "${XLSTPROC}") + +if(VCPKG_TARGET_IS_OSX) + set(ENV{LC_ALL} C) +endif() +vcpkg_find_acquire_program(PERL) +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +if(EXISTS "${CURRENT_INSTALLED_DIR}/include/X11/extensions/XKBgeom.h") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/X11/extensions/") #XKBgeom.h should be the only file in there +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() + + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/x11/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file diff --git a/ports/libx11/vcpkg-cmake-wrapper.cmake b/ports/libx11/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..9d0d3e2270f9f3 --- /dev/null +++ b/ports/libx11/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,12 @@ +_find_package(${ARGS}) +if(TARGET X11::xcb) + if(TARGET X11:X11) + target_link_libraries(X11::X11 INTERFACE X11:xcb) + endif() + if(TARGET X11:xdmcp) + target_link_libraries(X11::xcb INTERFACE X11:xdmcp) + endif() + if(TARGET X11:xau) + target_link_libraries(X11::xcb INTERFACE X11:xau) + endif() +endif() diff --git a/ports/libx11/vcpkg.json b/ports/libx11/vcpkg.json new file mode 100644 index 00000000000000..4f68d076b46e20 --- /dev/null +++ b/ports/libx11/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libx11", + "version": "1.7.3.1", + "description": "The X Window System is a network-transparent window system that was designed at MIT.", + "homepage": "https://www.x.org/wiki/", + "license": "MIT", + "dependencies": [ + "bzip2", + { + "name": "libxslt", + "host": true + }, + "xcb", + "xproto", + "xtrans" + ] +} diff --git a/ports/libx11/vcxserver.patch b/ports/libx11/vcxserver.patch new file mode 100644 index 00000000000000..10a6312f927c66 --- /dev/null +++ b/ports/libx11/vcxserver.patch @@ -0,0 +1,138 @@ +diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h +index 5faf83b..c6c63a3 100644 +--- a/include/X11/Xlib.h ++++ b/include/X11/Xlib.h +@@ -79,7 +79,7 @@ _Xmblen( + + typedef char *XPointer; + +-#define Bool int +-#define Status int ++typedef int Bool; ++typedef int Status; + #define True 1 + #define False 0 +diff --git a/src/CrGlCur.c b/src/CrGlCur.c +index 460660f..510ff5d 100644 +--- a/src/CrGlCur.c ++++ b/src/CrGlCur.c +@@ -51,8 +51,14 @@ in this Software without prior written authorization from The Open Group. + #if defined(hpux) + typedef shl_t XModuleType; + #else ++#ifdef _MSC_VER ++#include ++typedef HANDLE XModuleType; ++#define dlsym GetProcAddress ++#else + typedef void *XModuleType; + #endif ++#endif + + #ifndef LIBXCURSOR + #define LIBXCURSOR "libXcursor.so.1" +@@ -70,8 +76,12 @@ open_library (void) + { + #if defined(hpux) + module = shl_load(library, BIND_DEFERRED, 0L); ++#else ++#ifdef _MSC_VER ++ module = LoadLibrary(library); + #else + module = dlopen(library, RTLD_LAZY); ++#endif + #endif + if (module) + return module; +diff --git a/src/GetDflt.c b/src/GetDflt.c +index c9222a2..c6e1b25 100644 +--- a/src/GetDflt.c ++++ b/src/GetDflt.c +@@ -137,9 +138,13 @@ InitDefaults( + * ~/.Xdefaults. Next, if there is an XENVIRONMENT environment variable, + * then load that file. + */ +- ++ + if (dpy->xdefaults == NULL) { ++ #ifdef _MSC_VER ++ const char *slashDotXdefaults = ".Xdefaults"; ++ #else + const char *slashDotXdefaults = "/.Xdefaults"; ++ #endif + + (void) GetHomeDir (fname, (int) (PATH_MAX - strlen (slashDotXdefaults) - 1)); + (void) strcat (fname, slashDotXdefaults); +@@ -149,7 +154,11 @@ InitDefaults( + } + + if (!(xenv = getenv ("XENVIRONMENT"))) { ++ #ifdef _MSC_VER ++ const char *slashDotXdefaultsDash = ".Xdefaults-"; ++ #else + const char *slashDotXdefaultsDash = "/.Xdefaults-"; ++ #endif + int len; + + (void) GetHomeDir (fname, (int) (PATH_MAX - strlen (slashDotXdefaultsDash) - 1)); + diff --git a/src/SetLocale.c b/src/SetLocale.c +index 81f4a7c..cb52f11 100644 +--- a/src/SetLocale.c ++++ b/src/SetLocale.c +@@ -63,11 +63,11 @@ from The Open Group. + #include + #include + #include "XlcPubI.h" + + #define MAXLOCALE 64 /* buffer size of locale name */ + + +-#if defined(__APPLE__) || defined(__CYGWIN__) ++#if defined(__APPLE__) || defined(__CYGWIN__) || defined(_MSC_VER) + char * + _Xsetlocale( + int category, +diff --git a/src/StrKeysym.c b/src/StrKeysym.c +index be77a93..6967bcc 100644 +--- a/src/StrKeysym.c ++++ b/src/StrKeysym.c +@@ -39,12 +39,12 @@ in this Software without prior written authorization from The Open Group. + + #ifndef KEYSYMDB + #ifndef XKEYSYMDB +-#define KEYSYMDB "/usr/lib/X11/XKeysymDB" ++#define KEYSYMDB "XKeysymDB" + #else + #define KEYSYMDB XKEYSYMDB + #endif + #endif + + static Bool initialized; + static XrmDatabase keysymdb; + static XrmQuark Qkeysym[2]; +diff --git a/src/xlibi18n/lcDynamic.c b/src/xlibi18n/lcDynamic.c +index 3821bff..a50aa70 100644 +--- a/src/xlibi18n/lcDynamic.c ++++ b/src/xlibi18n/lcDynamic.c +@@ -51,7 +51,7 @@ from The Open Group. + #include "Xlcint.h" + + #ifndef XLOCALEDIR +-#define XLOCALEDIR "/usr/lib/X11/locale" ++#define XLOCALEDIR "locale" + #endif + + #define LCLIBNAME "xi18n.so" +diff --git a/src/xlibi18n/lcFile.c b/src/xlibi18n/lcFile.c +index 25cabd5..819ac89 100644 +--- a/src/xlibi18n/lcFile.c ++++ b/src/xlibi18n/lcFile.c +@@ -195,7 +192,7 @@ _XlcParsePath( + } + + #ifndef XLOCALEDIR +-#define XLOCALEDIR "/usr/lib/X11/locale" ++#define XLOCALEDIR "locale" + #endif + + void diff --git a/ports/libxau/portfile.cmake b/ports/libxau/portfile.cmake new file mode 100644 index 00000000000000..e745eb6b60876b --- /dev/null +++ b/ports/libxau/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxau + REF d9443b2c57b512cfb250b35707378654d86c7dea # 1.0.9 + SHA512 d46d2be838b8ea7116ee0e312adafa80f6551762b5f7b5e503bd40e74fc0b43b45255e8135d03f831d5c483b98aac992fcd91a7e22119261e76778571a72ef07 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS "${OPTIONS}" +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxau/vcpkg.json b/ports/libxau/vcpkg.json new file mode 100644 index 00000000000000..f1cbde68d71731 --- /dev/null +++ b/ports/libxau/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxau", + "version": "1.0.9", + "description": "Functions for handling Xauthority files and entries.", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxau", + "license": "MIT-open-group", + "dependencies": [ + "bzip2", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/libxdmcp/configure.ac.patch b/ports/libxdmcp/configure.ac.patch new file mode 100644 index 00000000000000..8a8f474c8ca992 --- /dev/null +++ b/ports/libxdmcp/configure.ac.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 7aedf3424..43ab8dbaf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_PROG_LN_S + AC_SEARCH_LIBS([recvfrom],[socket]) + + case $host_os in +- *mingw*) ++ *mingw* | *msys* ) + AC_CHECK_LIB([ws2_32],[main]) + ;; + *) diff --git a/ports/libxdmcp/portfile.cmake b/ports/libxdmcp/portfile.cmake new file mode 100644 index 00000000000000..a48b84dee3aaed --- /dev/null +++ b/ports/libxdmcp/portfile.cmake @@ -0,0 +1,36 @@ +#SET(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) # this is a lie but the lib has a different name than the dll +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxdmcp + REF 618b3ba5f826d930df2ca6a6a0ce212fa75cef42 # 1.1.3 + SHA512 f8b035fa95f6948cc6bac69bfcc33498cd65db73c62aadee714bce371d61c50f283c45d1a3f43397a96b3c956b41dfe94355e94e33764760b29bf98ba8dfebe2 + HEAD_REF master + PATCHES configure.ac.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --disable-dependency-tracking) + string(APPEND VCPKG_C_FLAGS "/showIncludes ") + string(APPEND VCPKG_CXX_FLAGS "/showIncludes ") +endif() +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + OPTIONS ${OPTIONS} --enable-unit-tests=no +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxdmcp/vcpkg.json b/ports/libxdmcp/vcpkg.json new file mode 100644 index 00000000000000..a2a977cbe16853 --- /dev/null +++ b/ports/libxdmcp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxdmcp", + "version": "1.1.3", + "description": "X Display Manager Control Protocol library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxdmcp", + "license": "MIT-open-group", + "dependencies": [ + "bzip2", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/pthread-stubs/portfile.cmake b/ports/pthread-stubs/portfile.cmake new file mode 100644 index 00000000000000..10f0df6955f621 --- /dev/null +++ b/ports/pthread-stubs/portfile.cmake @@ -0,0 +1,51 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/pthread-stubs + REF 50f0755a7f894acae168f19c66e52a3f139ca4ec # 0.4.0 + SHA512 15fcb2144a8abb7b9b1b8f6d9732759351268fb440c7a59380b0ca6ddf48b74a37ce5afbf777ce58fc1993df0c8d6ffb82e452800ce2fcaf16edcbcc1750e338 + HEAD_REF master +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/pthread-stubs.pc") +file(READ "${_file}" _contents) +string(REPLACE "Cflags: -pthread" "Cflags: " _contents "${_contents}") +if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/pthreadGC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3" _contents "${_contents}") +endif() +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/pthread-stubs.pc") +file(READ "${_file}" _contents) +string(REPLACE "Cflags: -pthread" "Cflags: " _contents "${_contents}") +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadVC3d" _contents "${_contents}") +endif() +if(EXISTS "${CURRENT_INSTALLED_DIR}/debug/lib/pthreadGC3d.lib") + string(REPLACE "Libs: -pthread" "Libs: -lpthreadGC3d" _contents "${_contents}") +endif() +file(WRITE "${_file}" "${_contents}") diff --git a/ports/pthread-stubs/vcpkg.json b/ports/pthread-stubs/vcpkg.json new file mode 100644 index 00000000000000..f72f2ae2ec0df0 --- /dev/null +++ b/ports/pthread-stubs/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "pthread-stubs", + "version": "0.4", + "description": "Stub replacements for POSIX Threads functions.", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/pthread-stubs", + "license": "X11-distribute-modifications-variant", + "dependencies": [ + "pthread" + ] +} diff --git a/ports/xcb-proto/portfile.cmake b/ports/xcb-proto/portfile.cmake new file mode 100644 index 00000000000000..8927d2a8d4caf6 --- /dev/null +++ b/ports/xcb-proto/portfile.cmake @@ -0,0 +1,49 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +find_program(XMLLINT_PATH NAMES xmllint PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxml2") +if(NOT XMLLINT_PATH) + message(FATAL_ERROR "${PORT} requires xmllint which was not found!") +endif() + +string(REGEX REPLACE "/[^/]+$" "" XMLLINT_DIR "${XMLLINT_PATH}") +file(TO_NATIVE_PATH "${XMLLINT_DIR}" XMLLINT_DIR_NATIVE) +message(STATUS "Using xmlling at: ${XMLLINT_PATH}") +vcpkg_add_to_path("${XMLLINT_DIR_NATIVE}") + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON3_DIR}") +set(ENV{PYTHON} "${PYTHON3}") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO proto/xcbproto + REF 70ca65fa35c3760661b090bc4b2601daa7a099b8 #v1.14.1 + patches + SHA512 9e08e1d2ab1fe7a8d3985568918a858ddfb31b8016ccac8ea2447631e7cede3bcc7b1ed86491d497ab871674c9b55d94fab25ee13ff6de9a44590b91d9166fda + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ac_cv_path_PYTHON='${PYTHON3}' + am_cv_python_pyexecdir=\\\${prefix}/tools/python3/site-packages + am_cv_python_pythondir=\\\${prefix}/tools/python3/site-packages + ) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/xcb-proto/vcpkg.json b/ports/xcb-proto/vcpkg.json new file mode 100644 index 00000000000000..0f285d781eeaf9 --- /dev/null +++ b/ports/xcb-proto/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xcb-proto", + "version": "1.14.1", + "description": "XML-XCB protocol descriptions used by libxcb for the X11 protocol & extensions", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "bzip2", + { + "name": "libxml2", + "host": true, + "features": [ + "tools" + ] + }, + "xorg-macros" + ] +} diff --git a/ports/xcb-util-m4/portfile.cmake b/ports/xcb-util-m4/portfile.cmake new file mode 100644 index 00000000000000..f38f1027eb228e --- /dev/null +++ b/ports/xcb-util-m4/portfile.cmake @@ -0,0 +1,15 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO util/xcb-util-m4 + REF f662e3a93ebdec3d1c9374382dcc070093a42fed #v1.19.2 + SHA512 29840da449a434f169437fd2cef78273e0cba00a7f76d48790c838dc8f40fe55cb0932d96b649e1bd066c6c5e257dd2d9d71c663ce100aa5ca25a2ccec1b7e77 + HEAD_REF master +) + +file(GLOB_RECURSE M4_FILES "${SOURCE_PATH}/*.m4") +file(INSTALL ${M4_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(TOUCH "${CURRENT_PACKAGES_DIR}/share/xcb-util-m4/copyright") diff --git a/ports/xcb-util-m4/vcpkg.json b/ports/xcb-util-m4/vcpkg.json new file mode 100644 index 00000000000000..e2d7d051e4719f --- /dev/null +++ b/ports/xcb-util-m4/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "xcb-util-m4", + "version-date": "2022-01-24", + "description": "GNU autoconf macros shared across XCB projects", + "homepage": "https://gitlab.freedesktop.org/xorg/util/xcb-util-m4", + "license": null +} diff --git a/ports/xcb/configure.patch b/ports/xcb/configure.patch new file mode 100644 index 00000000000000..94c33225b1d0be --- /dev/null +++ b/ports/xcb/configure.patch @@ -0,0 +1,47 @@ +diff --git a/configure.ac b/configure.ac +index 8a05bf1aa..1f57cc688 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -22,6 +22,7 @@ AC_USE_SYSTEM_EXTENSIONS + # Initialize libtool + LT_PREREQ([2.2]) + LT_INIT([win32-dll]) ++AC_LIBTOOL_WIN32_DLL + + # Require xorg-macros minimum of 1.18 - Initial version + m4_ifndef([XORG_MACROS_VERSION], +@@ -88,11 +88,11 @@ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) + AC_SUBST(XCBPROTO_XCBPYTHONDIR) + + AC_HEADER_STDC +-AC_SEARCH_LIBS(getaddrinfo, socket) +-AC_SEARCH_LIBS(connect, socket) ++AC_SEARCH_LIBS(getaddrinfo, [socket Ws2_32]) ++AC_SEARCH_LIBS(connect, [socket Ws2_32]) + + # Find support for sending a message from a socket +-AC_SEARCH_LIBS(sendmsg, socket, [have_sendmsg="yes"], [have_sendmsg="no"]) ++AC_SEARCH_LIBS(sendmsg, [socket Ws2_32], [have_sendmsg="yes"], [have_sendmsg="no"]) + + # XPG4v2/UNIX95 added msg_control - check to see if we need to define + # _XOPEN_SOURCE to get it (such as on Solaris) +@@ -140,6 +141,10 @@ mingw*) + have_win32="yes" + lt_enable_auto_import="-Wl,--enable-auto-import" + ;; ++msys*) ++ have_win32="yes" ++ lt_enable_auto_import="-Wl,--enable-auto-import" ++ ;; + linux*) + AC_DEFINE([HAVE_ABSTRACT_SOCKETS], 1, [Define if your platform supports abstract sockets]) + ;; +@@ -208,7 +213,7 @@ esac + + dnl Link with winsock for socket functions on MinGW + case $host_os in +- *mingw*) ++ *mingw*| *msys* ) + AC_CHECK_LIB([ws2_32],[main]) + ;; + *) diff --git a/ports/xcb/getpid_include.patch b/ports/xcb/getpid_include.patch new file mode 100644 index 00000000000000..755cd3e3f4e84b --- /dev/null +++ b/ports/xcb/getpid_include.patch @@ -0,0 +1,14 @@ +diff --git a/src/xcb_auth.c b/src/xcb_auth.c +index 8ebe9a437..9a1e459fc 100644 +--- a/src/xcb_auth.c ++++ b/src/xcb_auth.c +@@ -46,6 +46,9 @@ + #include + #endif + #include "xcb_windefs.h" ++#ifdef _MSC_VER ++#include ++#endif + #else + #include + #include diff --git a/ports/xcb/makefile.patch b/ports/xcb/makefile.patch new file mode 100644 index 00000000000000..9171fcf03705db --- /dev/null +++ b/ports/xcb/makefile.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 17b64a80e..f45d9d0fe 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -260,7 +260,7 @@ if XCB_SERVERSIDE_SUPPORT + C_CLIENT_PY_EXTRA_ARGS += --server-side + endif + +-$(EXTSOURCES): c_client.py $(XCBPROTO_XCBINCLUDEDIR)/$(@:.c=.xml) ++$(EXTSOURCES): c_client.py /$(@:.c=.xml) + $(AM_V_GEN)$(PYTHON) $(srcdir)/c_client.py -c "$(PACKAGE_STRING)" -l "$(XORG_MAN_PAGE)" \ + -s "$(LIB_MAN_SUFFIX)" -p $(XCBPROTO_XCBPYTHONDIR) \ + $(C_CLIENT_PY_EXTRA_ARGS) \ diff --git a/ports/xcb/portfile.cmake b/ports/xcb/portfile.cmake new file mode 100644 index 00000000000000..a8fcbd51311e38 --- /dev/null +++ b/ports/xcb/portfile.cmake @@ -0,0 +1,107 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb + REF ddafdba11f6919e6fcf977c09c78b06f94de47aa #v1.14 + some patches + SHA512 d8382b04f2b00671cded9e22d6066164511ee4c08e2cf5de4ec28d09e41228e30d3ba7d0e6b5141abf4e4bc777aa662fe9d1d04f3e1e26e0b323549e845c8072 + HEAD_REF master + PATCHES makefile.patch # without the patch target xproto.c is missing target XCBPROTO_XCBINCLUDEDIR + configure.patch + use_xwindows_includes.patch # use the X11 include wrappers for windows headers + getpid_include.patch # add include for getpid on windows +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS --disable-dependency-tracking) +endif() + +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +file(TO_NATIVE_PATH "${PYTHON3_DIR}" PYTHON3_DIR_NATIVE) +vcpkg_add_to_path("${PYTHON3_DIR}") + +if(NOT XLSTPROC) + find_program(XLSTPROC NAMES "xsltproc${VCPKG_HOST_EXECUTABLE_SUFFIX}" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/libxslt" PATH_SUFFIXES "bin") +endif() +if(NOT XLSTPROC) + message(FATAL_ERROR "${PORT} requires xlstproc for the host system. Please install libxslt within vcpkg or your system package manager!") +endif() +get_filename_component(XLSTPROC_DIR "${XLSTPROC}" DIRECTORY) +file(TO_NATIVE_PATH "${XLSTPROC_DIR}" XLSTPROC_DIR_NATIVE) +vcpkg_add_to_path("${XLSTPROC_DIR}") +set(ENV{XLSTPROC} "${XLSTPROC}") + +if(DEFINED ENV{PYTHONPATH}) + set(ENV{PYTHONPATH} "${CURRENT_INSTALLED_DIR}/tools/python3/site-packages/${VCPKG_HOST_PATH_SEPARATOR}$ENV{PYTHONPATH}") +else() + set(ENV{PYTHONPATH} "${CURRENT_INSTALLED_DIR}/tools/python3/site-packages/") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() + +set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xcb.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: xau xdmcp ") +endif() +set(pcfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xcb.pc") +if(EXISTS "${pcfile}") + vcpkg_replace_string("${pcfile}" "Requires: " "Requires: xau xdmcp ") +endif() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND NOT VCPKG_TARGET_IS_MINGW) + set(extensions + bigreq + composite + damage + dpms + dri2 + dri3 + ge + glx + present + randr + record + render + res + screensaver + shape + shm + sync + xc_misc + xevie + xf86dri + xfixes + xinerama + xinput + xkb + xprint + xtest + xv + xvmc) + foreach(ext IN LISTS extensions) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/xcb/${ext}.h" + "extern xcb_extension_t" + "__declspec(dllimport) extern xcb_extension_t") + endforeach() +endif() +endif() diff --git a/ports/xcb/use_xwindows_includes.patch b/ports/xcb/use_xwindows_includes.patch new file mode 100644 index 00000000000000..23177fc77ed852 --- /dev/null +++ b/ports/xcb/use_xwindows_includes.patch @@ -0,0 +1,21 @@ +diff --git a/src/xcb_windefs.h b/src/xcb_windefs.h +index df6026da3..7591c61e7 100644 +--- a/src/xcb_windefs.h ++++ b/src/xcb_windefs.h +@@ -31,10 +31,13 @@ + #define WINVER 0x0501 /* required for getaddrinfo/freeaddrinfo defined only for WinXP and above */ + #endif + +-#include ++#include ++#include ++#include ++typedef unsigned char BYTE; +-#include +-#include + ++#define STDERR_FILENO _fileno( stderr ) ++ + struct iovec { + void *iov_base; /* Pointer to data. */ + int iov_len; /* Length of data. */ diff --git a/ports/xcb/vcpkg.json b/ports/xcb/vcpkg.json new file mode 100644 index 00000000000000..cc87d4357fe5fd --- /dev/null +++ b/ports/xcb/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "xcb", + "version": "1.14", + "description": "C interface to the X Window System protocol, which replaces the traditional Xlib interface.", + "homepage": "https://xcb.freedesktop.org/", + "license": "X11-distribute-modifications-variant", + "dependencies": [ + "bzip2", + "libxau", + "libxdmcp", + { + "name": "libxslt", + "host": true + }, + "pthread", + "pthread-stubs", + "xcb-proto", + "xcb-util-m4", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/xorg-macros/portfile.cmake b/ports/xorg-macros/portfile.cmake new file mode 100644 index 00000000000000..75bdc7e35d753d --- /dev/null +++ b/ports/xorg-macros/portfile.cmake @@ -0,0 +1,67 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES skip_rawcpp.patch) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO util/macros + REF b8766308d2f78bc572abe5198007cf7aeec9b761 #v1.19.3 + SHA512 dc7383b1579dc6ef0473161764096c8161f23a4c4ba2182e7abd7f73f443eb0520e02f1dfaaba2f8ebb43e0ed93c1e6e5e7cf517561476b858d2471a8ecaf907 + HEAD_REF master + PATCHES ${PATCHES} +) + +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_install_make() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal/") +endif() + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/util-macros/" "${CURRENT_PACKAGES_DIR}/share/xorg/util-macros") + +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/xorg-macros.pc" _contents) +string(REPLACE "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" _contents "${_contents}") +string(REPLACE "datarootdir=\${prefix}/share" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}") +string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/include" "includedir=\${prefix}/include" _contents "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/pkgconfig/xorg-macros.pc" "${_contents}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/xorg-macros.pc") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig/xorg-macros.pc") + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig/xorg-macros.pc" _contents) + string(REPLACE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_INSTALLED_DIR}/debug" _contents "${_contents}") + string(REPLACE "datarootdir=\${prefix}/share}" "datarootdir=\${prefix}/share/xorg/debug}" _contents "${_contents}") + string(REPLACE "includedir=${CURRENT_INSTALLED_DIR}/debug/include" "includedir=\${prefix}/../include" _contents "${_contents}") + file(WRITE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/xorg-macros.pc" "${_contents}") + if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") + endif() + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig/xorg-macros.pc") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug/") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/xorg/debug/${PORT}/pkgconfig" "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig") +vcpkg_fixup_pkgconfig() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/xorg-macros/skip_rawcpp.patch b/ports/xorg-macros/skip_rawcpp.patch new file mode 100644 index 00000000000000..3e5ce9a7e77141 --- /dev/null +++ b/ports/xorg-macros/skip_rawcpp.patch @@ -0,0 +1,43 @@ +diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in +index f0a16da3a..e1c0ff1ed 100644 +--- a/xorg-macros.m4.in ++++ b/xorg-macros.m4.in +@@ -63,38 +63,6 @@ AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], + # Check for flag to avoid builtin definitions - assumes unix is predefined, + # which is not the best choice for supporting other OS'es, but covers most + # of the ones we need for now. +-AC_MSG_CHECKING([if $RAWCPP requires -undef]) +-AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) +-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- AC_MSG_RESULT([no]) +-else +- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- RAWCPPFLAGS=-undef +- AC_MSG_RESULT([yes]) +- # under Cygwin unix is still defined even with -undef +- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then +- RAWCPPFLAGS="-undef -ansi" +- AC_MSG_RESULT([yes, with -ansi]) +- else +- AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.]) +- fi +-fi +-rm -f conftest.$ac_ext +- +-AC_MSG_CHECKING([if $RAWCPP requires -traditional]) +-AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) +-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +- AC_MSG_RESULT([no]) +-else +- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +- TRADITIONALCPPFLAGS="-traditional" +- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" +- AC_MSG_RESULT([yes]) +- else +- AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.]) +- fi +-fi +-rm -f conftest.$ac_ext + AC_SUBST(RAWCPPFLAGS) + AC_SUBST(TRADITIONALCPPFLAGS) + ]) # XORG_PROG_RAWCPP diff --git a/ports/xorg-macros/vcpkg.json b/ports/xorg-macros/vcpkg.json new file mode 100644 index 00000000000000..4da7766849e00d --- /dev/null +++ b/ports/xorg-macros/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "xorg-macros", + "version": "1.19.3", + "description": "X.org macros utilities.", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "supports": "!uwp" +} diff --git a/ports/xproto/portfile.cmake b/ports/xproto/portfile.cmake new file mode 100644 index 00000000000000..87380da9aee29c --- /dev/null +++ b/ports/xproto/portfile.cmake @@ -0,0 +1,51 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(PATCHES + vcxserver-xw32defs.patch + windows-long64.patch + windows-io.patch + windows_mean_and_lean.patch + windows-none.patch + windows-include-guards.patch + ) +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO proto/xorgproto + REF 57acac1d4c7967f4661fb1c9f86f48f34a46c48d # 2021.5 + SHA512 5d2b6096e7f6ec6a3414f4370da583f6660fbd287474e8b4cd3e51ccc35514181352d3b0b9cd4b8d6e30de7b54f4ce01a9fbf17be75cf8de18aa28e9f774b8c4 + HEAD_REF master + PATCHES + upstream-1.patch + ${PATCHES} +) + +vcpkg_configure_meson(SOURCE_PATH "${SOURCE_PATH}" + OPTIONS "-Dlegacy=true") +vcpkg_install_meson() + +# To make CMake consumption easier. +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/pkgconfig/") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() + +vcpkg_fixup_pkgconfig(SKIP_CHECK) # pc files requiring Xau Xt xt SM ICE X11 xcb Xdmcp are installed before they can be used. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(GLOB_RECURSE _files "${SOURCE_PATH}/COPYING*") +file(INSTALL ${_files} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST ${_files}) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "") +endif() diff --git a/ports/xproto/upstream-1.patch b/ports/xproto/upstream-1.patch new file mode 100644 index 00000000000000..55f283f6382024 --- /dev/null +++ b/ports/xproto/upstream-1.patch @@ -0,0 +1,12 @@ +diff --git a/include/X11/XF86keysym.h b/include/X11/XF86keysym.h +index c242e42f5fee2e28da11df2d33b005e9bb4b5441..59ba54d1a13fabdded6920ce946c1e20594f49ff 100644 +--- a/include/X11/XF86keysym.h ++++ b/include/X11/XF86keysym.h +@@ -394,6 +394,7 @@ + #define XF86XK_VoiceCommand _EVDEVK(0x246) /* v3.16 KEY_VOICECOMMAND */ + #define XF86XK_Assistant _EVDEVK(0x247) /* v4.13 KEY_ASSISTANT */ + /* Use: XK_ISO_Next_Group _EVDEVK(0x248) v5.2 KEY_KBD_LAYOUT_NEXT */ ++#define XF86XK_EmojiPicker _EVDEVK(0x249) /* v5.13 KEY_EMOJI_PICKER */ + #define XF86XK_BrightnessMin _EVDEVK(0x250) /* v3.16 KEY_BRIGHTNESS_MIN */ + #define XF86XK_BrightnessMax _EVDEVK(0x251) /* v3.16 KEY_BRIGHTNESS_MAX */ + #define XF86XK_KbdInputAssistPrev _EVDEVK(0x260) /* v3.18 KEY_KBDINPUTASSIST_PREV */ diff --git a/ports/xproto/vcpkg.json b/ports/xproto/vcpkg.json new file mode 100644 index 00000000000000..43a4509c3698c3 --- /dev/null +++ b/ports/xproto/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "xproto", + "version": "2021.5", + "description": "X Window System unified protocol definitions", + "homepage": "https://gitlab.freedesktop.org/xorg/proto/xorgproto", + "license": null, + "dependencies": [ + "libxslt", + { + "name": "vcpkg-tool-meson", + "host": true + }, + "xorg-macros" + ] +} diff --git a/ports/xproto/vcxserver-xw32defs.patch b/ports/xproto/vcxserver-xw32defs.patch new file mode 100644 index 00000000000000..03b84a4cf5a910 --- /dev/null +++ b/ports/xproto/vcxserver-xw32defs.patch @@ -0,0 +1,22 @@ +diff --git a/include/X11/Xw32defs.h b/include/X11/Xw32defs.h +index 683b588..db1eabd 100644 +--- a/include/X11/Xw32defs.h ++++ b/include/X11/Xw32defs.h +@@ -27,7 +27,6 @@ typedef char *caddr_t; + # define execve _execve + # define execvp _execvp + # define execvpe _execvpe +-# define fdopen _fdopen + # define fileno _fileno + # define fstat _fstat + # define getcwd _getcwd +@@ -72,8 +71,8 @@ typedef char *caddr_t; + # define S_IEXEC _S_IEXEC + + # define F_OK 0 +-# define X_OK 1 + # define W_OK 2 + # define R_OK 4 ++# define X_OK R_OK + # endif /* __GNUC__ */ + #endif diff --git a/ports/xproto/windows-include-guards.patch b/ports/xproto/windows-include-guards.patch new file mode 100644 index 00000000000000..7e252aacdff4b6 --- /dev/null +++ b/ports/xproto/windows-include-guards.patch @@ -0,0 +1,41 @@ +diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h +index 900257928..666ee6515 100644 +--- a/include/X11/Xwindows.h ++++ b/include/X11/Xwindows.h +@@ -41,6 +41,11 @@ The Open Group. + * do as it's no help at all to X11 clients which also need to use the + * Win32 API) + */ ++#pragma once ++ ++#ifndef _X11_XWINDOWS_H_ ++#define _X11_XWINDOWS_H_ ++ + #undef _XFree86Server + #ifdef XFree86Server + # define _XFree86Server +@@ -130,3 +135,4 @@ typedef int Status; + # undef _XFree86Server + #endif + ++#endif +diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h +index 92e0d2a33..1e3e8671b 100644 +--- a/include/X11/Xwinsock.h ++++ b/include/X11/Xwinsock.h +@@ -32,6 +32,10 @@ The Open Group. + * Conflicts come from the fact that including winsock.h actually pulls + * in the whole Windows API... + */ ++#pragma once ++ ++#ifndef _X11_XWINSOCK_H_ ++#define _X11_XWINSOCK_H_ + + #undef _XFree86Server + #ifdef XFree86Server +@@ -100,3 +104,4 @@ typedef int Status; + # undef _XFree86Server + #endif + ++#endif diff --git a/ports/xproto/windows-io.patch b/ports/xproto/windows-io.patch new file mode 100644 index 00000000000000..159d1217d73e18 --- /dev/null +++ b/ports/xproto/windows-io.patch @@ -0,0 +1,12 @@ +diff --git a/include/X11/Xos.h b/include/X11/Xos.h +index 28dfc673a..37d268f27 100644 +--- a/include/X11/Xos.h ++++ b/include/X11/Xos.h +@@ -80,6 +80,7 @@ in this Software without prior written authorization from The Open Group. + # include + # endif + # ifdef WIN32 ++# include // For open() + # include + # else + # include diff --git a/ports/xproto/windows-long64.patch b/ports/xproto/windows-long64.patch new file mode 100644 index 00000000000000..5d8b74396bddfa --- /dev/null +++ b/ports/xproto/windows-long64.patch @@ -0,0 +1,48 @@ +diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h +index 624047d..e8d5653 100644 +--- a/include/X11/Xwinsock.h ++++ b/include/X11/Xwinsock.h +@@ -47,6 +47,10 @@ The Open Group. + #define _NO_BOOL_TYPEDEF + #define BOOL WINBOOL + #define INT32 wINT32 ++#ifdef __x86_64__ ++#define INT64 wINT64 ++#define LONG64 wLONG64 ++#endif + #undef Status + #define Status wStatus + #define ATOM wATOM +@@ -58,6 +62,8 @@ The Open Group. + #undef BYTE + #undef BOOL + #undef INT32 ++#undef INT64 ++#undef LONG64 + #undef ATOM + #undef FreeResource + #undef CreateWindowA +diff --git a/include/X11/meson.build b/include/X11/meson.build +index 1c33c64..703ab19 100644 +--- a/include/X11/meson.build ++++ b/include/X11/meson.build +@@ -1,7 +1,8 @@ + fd_set_maybe_headers = [ 'sys/param.h', + 'sys/types.h', + 'sys/time.h', +- 'sys/select.h' ++ 'sys/select.h', ++ 'winsock2.h' + ] + fd_set_headers = '' + foreach h : fd_set_maybe_headers +@@ -15,6 +16,8 @@ if cc.has_member('fd_set', 'fds_bits', prefix: fd_set_headers) + fds_bits = 'fds_bits' + elif cc.has_member('fd_set', '__fds_bits', prefix: fd_set_headers) + fds_bits = '__fds_bits' ++elif cc.has_member('fd_set', 'fd_count', prefix: fd_set_headers) ++ fds_bits = 'fd_count' + else + error('Your fd_set is too weird.') + endif +-- \ No newline at end of file diff --git a/ports/xproto/windows-none.patch b/ports/xproto/windows-none.patch new file mode 100644 index 00000000000000..87764c88b42b51 --- /dev/null +++ b/ports/xproto/windows-none.patch @@ -0,0 +1,85 @@ +diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h +index 70e1debd5..236ec96a7 100644 +--- a/include/X11/Xwindows.h ++++ b/include/X11/Xwindows.h +@@ -69,6 +69,16 @@ The Open Group. + #endif + #undef Status + #define Status wStatus ++#ifdef None // FS.h defines None which is used in winnt.h ++#pragma push_macro("None") ++#define NoneDefined ++#undef None ++#endif ++#ifdef ControlMask // X.h defines ControlMask which is used in processthreadapi.h ++#pragma push_macro("ControlMask") ++#define ControlMaskDefined ++#undef ControlMask ++#endif + #define ATOM wATOM + #define BYTE wBYTE + #define FreeResource wFreeResource +@@ -76,6 +77,14 @@ The Open Group. + #undef NOMINMAX + #undef Status +-#define Status int ++typedef int Status; ++#ifdef NoneDefined ++#pragma pop_macro("None") ++#undef NoneDefined ++#endif ++#ifdef ControlMaskDefined ++#pragma pop_macro("ControlMask") ++#undef ControlMaskDefined ++#endif + #undef BYTE + #undef BOOL + #undef INT32 +diff --git a/include/X11/Xwinsock.h b/include/X11/Xwinsock.h +index 624047d..e8d5653 100644 +--- a/include/X11/Xwinsock.h ++++ b/include/X11/Xwinsock.h +@@ -47,23 +47,42 @@ The Open Group. + #define _NO_BOOL_TYPEDEF + #define BOOL WINBOOL + #define INT32 wINT32 + #ifdef __x86_64__ + #define INT64 wINT64 + #define LONG64 wLONG64 + #endif + #undef Status + #define Status wStatus ++#ifdef None ++#pragma push_macro("None") ++#define NoneDefined ++#undef None ++#endif ++#ifdef ControlMask ++#pragma push_macro("ControlMask") ++#define ControlMaskDefined ++#undef ControlMask ++#endif + #define ATOM wATOM + #define BYTE wBYTE + #define FreeResource wFreeResource + #include ++#include + #undef Status +-#define Status int ++typedef int Status; ++#ifdef NoneDefined ++#pragma pop_macro("None") ++#undef NoneDefined ++#endif ++#ifdef ControlMaskDefined ++#pragma pop_macro("ControlMask") ++#undef ControlMaskDefined ++#endif + #undef BYTE + #undef BOOL + #undef INT32 + #undef INT64 + #undef LONG64 + #undef ATOM + #undef FreeResource + #undef CreateWindowA diff --git a/ports/xproto/windows_mean_and_lean.patch b/ports/xproto/windows_mean_and_lean.patch new file mode 100644 index 00000000000000..f50e4c8806f941 --- /dev/null +++ b/ports/xproto/windows_mean_and_lean.patch @@ -0,0 +1,13 @@ +diff --git a/include/X11/Xwindows.h b/include/X11/Xwindows.h +index 70e1debd5..236ec96a7 100644 +--- a/include/X11/Xwindows.h ++++ b/include/X11/Xwindows.h +@@ -54,7 +54,7 @@ The Open Group. + * + */ + #define NOMINMAX +- ++#define WIN32_LEAN_AND_MEAN // Otherwise this will include winsock.h! + /* + * mingw-w64 headers define BOOL as a typedef, protecting against macros + * mingw.org headers define BOOL in terms of WINBOOL diff --git a/ports/xtrans/portfile.cmake b/ports/xtrans/portfile.cmake new file mode 100644 index 00000000000000..e7e726e0628f10 --- /dev/null +++ b/ports/xtrans/portfile.cmake @@ -0,0 +1,64 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxtrans + REF 3b5df889f58a99980a35a7b4a18eb4e7d2abeac4 #v1.4 + SHA512 d1a1ecd8aa07d19a8b4936a37109cecd0c965b859a17ea838835230f9326c1a353feef388052df03173562cbf0f3e3764146c3669b1928698cd55ccc4f92992c + HEAD_REF master + PATCHES win32.patch + symbols.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG +) + +vcpkg_install_make() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +if(NOT WIN32) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/include") +endif() +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/" "${CURRENT_PACKAGES_DIR}/share/${PORT}/include/") +# the include folder is moved since it contains source files. It is not meant as a traditional include folder but as a shared files folder for different x libraries. +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/${PORT}/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/" "${CURRENT_PACKAGES_DIR}/share/xorg/debug") +endif() + +vcpkg_fixup_pkgconfig() # must be called after files have been moved + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/xtrans.pc" ) +file(READ "${_file}" _contents) +string(REPLACE "includedir=\${prefix}/include" "includedir=\${prefix}/share/xtrans/include" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xtrans.pc" ) +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "includedir=\${prefix}/../include" "includedir=\${prefix}/../share/xtrans/include" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" "") +endif() diff --git a/ports/xtrans/symbols.patch b/ports/xtrans/symbols.patch new file mode 100644 index 00000000000000..2110d31b120b74 --- /dev/null +++ b/ports/xtrans/symbols.patch @@ -0,0 +1,15 @@ +diff --git a/Xtransutil.c b/Xtransutil.c +index 413a02376..2f8af0efc 100644 +--- a/Xtransutil.c ++++ b/Xtransutil.c +@@ -64,6 +64,10 @@ from The Open Group. + #ifdef WIN32 + #include + #include ++#ifdef _MSC_VER ++# include ++# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) ++#endif + #endif + + #ifdef X11_t diff --git a/ports/xtrans/vcpkg.json b/ports/xtrans/vcpkg.json new file mode 100644 index 00000000000000..151d527b8c138c --- /dev/null +++ b/ports/xtrans/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "xtrans", + "version": "1.4.0", + "description": "xtrans - X Network Transport layer shared code", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxtrans", + "license": null, + "dependencies": [ + "xorg-macros" + ] +} diff --git a/ports/xtrans/win32.patch b/ports/xtrans/win32.patch new file mode 100644 index 00000000000000..dee4c79d7329da --- /dev/null +++ b/ports/xtrans/win32.patch @@ -0,0 +1,58 @@ +diff --git a/Xtrans.h b/Xtrans.h +index fbf385e01..e52e7cba2 100644 +--- a/Xtrans.h ++++ b/Xtrans.h +@@ -50,6 +50,10 @@ from The Open Group. + #ifndef _XTRANS_H_ + #define _XTRANS_H_ + ++#if defined(_WIN32) && !defined(WIN32) ++# define WIN32 _WIN32 ++#endif ++ + #include + #include + #include +diff --git a/Xtransint.h b/Xtransint.h +index 2156bd52f..735b54301 100644 +--- a/Xtransint.h ++++ b/Xtransint.h +@@ -72,7 +72,7 @@ from The Open Group. + # define XTRANSDEBUG 1 + #endif + +-#ifdef WIN32 ++#if defined(WIN32) || defined(_WIN32) + # define _WILLWINSOCK_ + #endif + +diff --git a/Xtranssock.c b/Xtranssock.c +index c29390eaa..f2ef365cc 100644 +--- a/Xtranssock.c ++++ b/Xtranssock.c +@@ -74,6 +74,10 @@ from the copyright holders. + #include + #endif + ++#if defined(_WIN32) && !defined(WIN32) ++# define WIN32 _WIN32 ++#endif ++ + #ifndef WIN32 + + #if defined(TCPCONN) || defined(UNIXCONN) +diff --git a/Xtransutil.c b/Xtransutil.c +index f15be243c..cc67315e6 100644 +--- a/Xtransutil.c ++++ b/Xtransutil.c +@@ -54,6 +54,10 @@ from The Open Group. + * the internal implementation. + */ + ++#if defined(_WIN32) && !defined(WIN32) ++# define WIN32 _WIN32 ++#endif ++ + #ifdef XTHREADS + #include + #endif diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 40be3120417946..35c7103040bea2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1194,6 +1194,8 @@ xalan-c:x64-windows-static=fail xalan-c:arm64-windows=fail xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail +# Crosscompiling libx11 requires additional steps and patches to the Makefiles. +libx11:arm64-windows=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail yara:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index bfbcc3a58783d6..80346e0d37c063 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1856,6 +1856,10 @@ "baseline": "1.0.0", "port-version": 2 }, + "dbus": { + "baseline": "1.13.18", + "port-version": 0 + }, "dcmtk": { "baseline": "3.6.7", "port-version": 2 @@ -4260,10 +4264,22 @@ "baseline": "4.3.0", "port-version": 3 }, + "libx11": { + "baseline": "1.7.3.1", + "port-version": 0 + }, + "libxau": { + "baseline": "1.0.9", + "port-version": 0 + }, "libxdiff": { "baseline": "0.23", "port-version": 2 }, + "libxdmcp": { + "baseline": "1.1.3", + "port-version": 0 + }, "libxlsxwriter": { "baseline": "1.1.4", "port-version": 0 @@ -5720,6 +5736,10 @@ "baseline": "3.0.0", "port-version": 1 }, + "pthread-stubs": { + "baseline": "0.4", + "port-version": 0 + }, "pthreadpool": { "baseline": "2020-04-10", "port-version": 2 @@ -7732,6 +7752,18 @@ "baseline": "6.60", "port-version": 0 }, + "xcb": { + "baseline": "1.14", + "port-version": 0 + }, + "xcb-proto": { + "baseline": "1.14.1", + "port-version": 0 + }, + "xcb-util-m4": { + "baseline": "2022-01-24", + "port-version": 0 + }, "xerces-c": { "baseline": "3.2.3", "port-version": 4 @@ -7760,6 +7792,10 @@ "baseline": "2021-05-17", "port-version": 2 }, + "xorg-macros": { + "baseline": "1.19.3", + "port-version": 0 + }, "xorstr": { "baseline": "2021-10-23", "port-version": 0 @@ -7768,6 +7804,10 @@ "baseline": "0.8.1", "port-version": 1 }, + "xproto": { + "baseline": "2021.5", + "port-version": 0 + }, "xqilla": { "baseline": "2.3.4", "port-version": 1 @@ -7796,6 +7836,10 @@ "baseline": "0.7.2", "port-version": 0 }, + "xtrans": { + "baseline": "1.4.0", + "port-version": 0 + }, "xxhash": { "baseline": "0.8.1", "port-version": 1 diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json new file mode 100644 index 00000000000000..4e7b50aa84ba80 --- /dev/null +++ b/versions/d-/dbus.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dc3215916b8e610dcf6c0777b5ae7a04ed78873b", + "version": "1.13.18", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libx11.json b/versions/l-/libx11.json new file mode 100644 index 00000000000000..fe64a753250d6b --- /dev/null +++ b/versions/l-/libx11.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1347521fb39c2ccfd11521a3e641854537799ca4", + "version": "1.7.3.1", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxau.json b/versions/l-/libxau.json new file mode 100644 index 00000000000000..85719192bd6fa1 --- /dev/null +++ b/versions/l-/libxau.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d82d4195d09a023e7a7fbc1c3a726a2f9f917a33", + "version": "1.0.9", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxdmcp.json b/versions/l-/libxdmcp.json new file mode 100644 index 00000000000000..2121b322ba7522 --- /dev/null +++ b/versions/l-/libxdmcp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "eddca1f6d162a3947f167d35c21ca40de9904307", + "version": "1.1.3", + "port-version": 0 + } + ] +} diff --git a/versions/p-/pthread-stubs.json b/versions/p-/pthread-stubs.json new file mode 100644 index 00000000000000..395c6164ded630 --- /dev/null +++ b/versions/p-/pthread-stubs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4d74216d737ed231dafb8c53f2617ce7836d96fa", + "version": "0.4", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-proto.json b/versions/x-/xcb-proto.json new file mode 100644 index 00000000000000..20e240c6086729 --- /dev/null +++ b/versions/x-/xcb-proto.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e5933d2463549d6d3b00a8aa1f0279f2a974ec1c", + "version": "1.14.1", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-util-m4.json b/versions/x-/xcb-util-m4.json new file mode 100644 index 00000000000000..45f1929e4e911e --- /dev/null +++ b/versions/x-/xcb-util-m4.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3d9a0f48392c4845b152c9dfdfa702f9f0a932d9", + "version-date": "2022-01-24", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb.json b/versions/x-/xcb.json new file mode 100644 index 00000000000000..29168c9ce98dbd --- /dev/null +++ b/versions/x-/xcb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7af3e0f5bc8377ca950f83d3a0bdbb8cc40026aa", + "version": "1.14", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xorg-macros.json b/versions/x-/xorg-macros.json new file mode 100644 index 00000000000000..66137c08e43631 --- /dev/null +++ b/versions/x-/xorg-macros.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "76db60fb182a4c33faabfb411e1842428ae4c8ad", + "version": "1.19.3", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xproto.json b/versions/x-/xproto.json new file mode 100644 index 00000000000000..e4e8d7daf383cd --- /dev/null +++ b/versions/x-/xproto.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "707be677dc8929167ad434402cd6ae8678e2bffc", + "version": "2021.5", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xtrans.json b/versions/x-/xtrans.json new file mode 100644 index 00000000000000..5c6c6557a2b3e4 --- /dev/null +++ b/versions/x-/xtrans.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ef94e0330a53876e074a09a3cd9c311c4ca0aa28", + "version": "1.4.0", + "port-version": 0 + } + ] +} From 1b0252ca70ca2244a711535462c7f981eb439e83 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 22 Aug 2022 22:02:53 +0200 Subject: [PATCH 451/791] [isal] Update port to 2.30.0 (#26198) * CI test isal, not spdk-isal * Update to 2.30.0 * The nmake build uses only nasm The autotools build chooses the tool by feature level. It even requires yasm for mingw. * Relax platform restriction * Fix mingw builds * Fixup pkgconfig * Rewrite CMake config, move to unofficial namespace * Update versions --- ports/isal/fix-nmake.patch | 13 ---- ports/isal/isalConfig.cmake | 84 ++++--------------------- ports/isal/osx-asm-sysroot.patch | 32 ++++++++++ ports/isal/portfile.cmake | 50 ++++++++++----- ports/isal/unofficial-isal-config.cmake | 18 ++++++ ports/isal/usage | 6 +- ports/isal/vcpkg.json | 5 +- scripts/ci.baseline.txt | 4 +- versions/baseline.json | 4 +- versions/i-/isal.json | 5 ++ 10 files changed, 112 insertions(+), 109 deletions(-) delete mode 100644 ports/isal/fix-nmake.patch create mode 100644 ports/isal/osx-asm-sysroot.patch create mode 100644 ports/isal/unofficial-isal-config.cmake diff --git a/ports/isal/fix-nmake.patch b/ports/isal/fix-nmake.patch deleted file mode 100644 index ba10a66e7a6211..00000000000000 --- a/ports/isal/fix-nmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.nmake b/Makefile.nmake -index 56ae888..7260785 100644 ---- a/Makefile.nmake -+++ b/Makefile.nmake -@@ -143,7 +143,7 @@ objs = \ - - INCLUDES = -I./ -Ierasure_code/ -Iraid/ -Icrc/ -Iigzip/ -Iinclude/ -Imem/ - LINKFLAGS = /nologo --CFLAGS = -O2 -D NDEBUG /nologo -D_USE_MATH_DEFINES -Qstd=c99 $(INCLUDES) $(D) -+CFLAGS = /nologo -D_USE_MATH_DEFINES -Qstd=c99 $(INCLUDES) $(D) - AFLAGS = -f win64 $(INCLUDES) $(D) - CC = icl - AS = yasm diff --git a/ports/isal/isalConfig.cmake b/ports/isal/isalConfig.cmake index 465bbea88f40ad..78b47f223d7d35 100644 --- a/ports/isal/isalConfig.cmake +++ b/ports/isal/isalConfig.cmake @@ -1,73 +1,15 @@ - -function(set_library_target) - cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAMESPACE;LIB_NAME;DEBUG_STATIC;RELEASE_STATIC;DEBUG_DYNAMIC;RELEASE_DYNAMIC;INCLUDE_DIR;TYPE" "") - - if (arg_DEBUG_DYNAMIC) - set(ISAL_PROPERTIES IMPORTED_LOCATION_DEBUG "${arg_DEBUG_DYNAMIC}" IMPORTED_IMPLIB_DEBUG "${arg_DEBUG_STATIC}") - else() - set(ISAL_PROPERTIES IMPORTED_LOCATION_DEBUG "${arg_DEBUG_STATIC}") - endif() - - if (arg_RELEASE_DYNAMIC) - set(ISAL_PROPERTIES IMPORTED_LOCATION_RELEASE "${arg_RELEASE_DYNAMIC}" IMPORTED_IMPLIB_DEBUG "${arg_RELEASE_STATIC}") - else() - set(ISAL_PROPERTIES IMPORTED_LOCATION_RELEASE "${arg_RELEASE_STATIC}") - endif() - - add_library(${arg_NAMESPACE}::${arg_LIB_NAME} ${arg_TYPE} IMPORTED) - set_target_properties(${arg_NAMESPACE}::${arg_LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - ${ISAL_PROPERTIES} - INTERFACE_INCLUDE_DIRECTORIES "${arg_INCLUDE_DIR}" - ) - - set(${NAMESPACE}_${LIB_NAME}_FOUND 1) -endfunction() - -get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) - -if (WIN32) - if ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - set_library_target( - NAMESPACE "ISAL" - LIB_NAME "isa-l" - DEBUG_STATIC "${_IMPORT_PREFIX}/debug/lib/isa-l_static.lib" - RELEASE_STATIC "${_IMPORT_PREFIX}/lib/isa-l_static.lib" - INCLUDE_DIR "${_IMPORT_PREFIX}/include/isal" - TYPE STATIC - ) - else() - set_library_target( - NAMESPACE "ISAL" - LIB_NAME "isal" - DEBUG_DYNAMIC "${_IMPORT_PREFIX}/debug/bin/isa-l.dll" - RELEASE_DYNAMIC "${_IMPORT_PREFIX}/bin/isa-l.dll" - DEBUG_STATIC "${_IMPORT_PREFIX}/debug/lib/isa-l.lib" - RELEASE_STATIC "${_IMPORT_PREFIX}/lib/isa-l.lib" - INCLUDE_DIR "${_IMPORT_PREFIX}/include/isal" - TYPE SHARED - ) - endif() +message(WARNING "'find_package(isal CONFIG)' is deprecated. Please use 'find_package(unofficial-isal CONFIG)' instead.") + +include(CMakeFindDependencyMacro) +find_dependency(unofficial-isal) +if(NOT TARGET unofficial::isal::isal) + set(isal_FOUND FALSE) +elseif(TARGET ISAL::isa-l OR TARGET ISAL::isal) + # done +elseif ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + add_library(ISAL::isa-l INTERFACE IMPORTED) + set_target_properties(ISAL::isa-l PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::isal::isal) else() - if ("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - set_library_target( - NAMESPACE "ISAL" - LIB_NAME "isa-l" - DEBUG_STATIC "${_IMPORT_PREFIX}/debug/lib/libisal.a" - RELEASE_STATIC "${_IMPORT_PREFIX}/lib/libisal.a" - INCLUDE_DIR "${_IMPORT_PREFIX}/include" - TYPE STATIC - ) - else() - set_library_target( - NAMESPACE "ISAL" - LIB_NAME "isal" - DEBUG_DYNAMIC "${_IMPORT_PREFIX}/debug/lib/libisal.so" - RELEASE_DYNAMIC "${_IMPORT_PREFIX}/lib/libisal.so" - INCLUDE_DIR "${_IMPORT_PREFIX}/include" - TYPE SHARED - ) - endif() + add_library(ISAL::isal INTERFACE IMPORTED) + set_target_properties(ISAL::isal PROPERTIES INTERFACE_LINK_LIBRARIES unofficial::isal::isal) endif() diff --git a/ports/isal/osx-asm-sysroot.patch b/ports/isal/osx-asm-sysroot.patch new file mode 100644 index 00000000000000..ece55e80cdac67 --- /dev/null +++ b/ports/isal/osx-asm-sysroot.patch @@ -0,0 +1,32 @@ +diff --git a/tools/nasm-filter.sh b/tools/nasm-filter.sh +index 5ec9ba3..fcc4971 100755 +--- a/tools/nasm-filter.sh ++++ b/tools/nasm-filter.sh +@@ -15,6 +15,11 @@ while [ -n "$*" ]; do + shift + shift + ;; ++ -isysroot ) ++ # Unsupported options with arg ++ shift ++ shift ++ ;; + --prefix* ) + # Supported options without arg + options="$options $1" +diff --git a/tools/yasm-filter.sh b/tools/yasm-filter.sh +index c33952a..b99bfc3 100755 +--- a/tools/yasm-filter.sh ++++ b/tools/yasm-filter.sh +@@ -10,6 +10,11 @@ while [ -n "$*" ]; do + shift + shift + ;; ++ -isysroot ) ++ # Unsupported options with arg ++ shift ++ shift ++ ;; + -I* | -i* | --prefix* ) + # Supported options without arg + options="$options $1" diff --git a/ports/isal/portfile.cmake b/ports/isal/portfile.cmake index 1b786f6c938a46..9a9a1ef3470c07 100644 --- a/ports/isal/portfile.cmake +++ b/ports/isal/portfile.cmake @@ -4,22 +4,21 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO 01org/isa-l - REF v2.25.0 - SHA512 aa556c8ba26b4637493b3de50a23636668bcfd71249029c52fe6983d0bcf120d1b91f39aaa259cb58e59448d401366f3bfaaee24609db7e6a1cd3fdf1a953efe + REPO intel/isa-l + REF v2.30.0 + SHA512 d3ecfb7326097534b06a74b584100336509525ae7cadc6112d0c27e3d8704f3810e18f583d3cc33fa266bfec96db023607622b22ddbf17988ec4bf1bb3b3b9b2 HEAD_REF master - PATCHES fix-nmake.patch + PATCHES + osx-asm-sysroot.patch ) -vcpkg_find_acquire_program(YASM) -get_filename_component(YASM_PATH ${YASM} DIRECTORY) -vcpkg_add_to_path("${YASM_PATH}") - -vcpkg_find_acquire_program(NASM) -get_filename_component(NASM_PATH ${NASM} DIRECTORY) -vcpkg_add_to_path("${NASM_PATH}") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_PATH "${NASM}" DIRECTORY) + vcpkg_add_to_path("${NASM_PATH}") +endif() -if (VCPKG_TARGET_IS_WINDOWS) +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(NMAKE_TARGET dll) else() @@ -30,7 +29,8 @@ if (VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH "${SOURCE_PATH}" PROJECT_NAME Makefile.nmake TARGET ${NMAKE_TARGET} - OPTIONS CC=cl + OPTIONS + CFLAGS_REL= ) if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") @@ -56,16 +56,36 @@ if (VCPKG_TARGET_IS_WINDOWS) file(GLOB ISAL_HDRS "${SOURCE_PATH}/include/*") file(INSTALL ${ISAL_HDRS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/isal") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/isa-l.def" DESTINATION "${CURRENT_PACKAGES_DIR}/include/isal") + else() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + vcpkg_find_acquire_program(YASM) + get_filename_component(YASM_PATH "${NASM}" DIRECTORY) + vcpkg_add_to_path("${YASM_PATH}") + endif() + + vcpkg_list(SET options) + if(VCPKG_TARGET_IS_MINGW) + # There is only a .def file used by nmake, no declspec(...) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + # isal forces yasm for mingw, but stumbles over feature level detection + vcpkg_list(APPEND options AS=) + endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${options} + # No rpl_malloc provided, and probably not depending on ‘malloc (0)’ returning a valid pointer + ac_cv_func_malloc_0_nonnull=yes ) - vcpkg_install_make() + vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() -configure_file("${CMAKE_CURRENT_LIST_DIR}/isalConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/isalConfig.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-isal-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-isal/unofficial-isal-config.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/isalConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/isalConfig.cmake" @ONLY) # legacy file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/isal/unofficial-isal-config.cmake b/ports/isal/unofficial-isal-config.cmake new file mode 100644 index 00000000000000..6d38fe8215944c --- /dev/null +++ b/ports/isal/unofficial-isal-config.cmake @@ -0,0 +1,18 @@ +if(NOT TARGET unofficial::isal::isal) + add_library(unofficial::isal::isal UNKNOWN IMPORTED) + get_filename_component(z_vcpkg_isal_prefix "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(z_vcpkg_isal_prefix "${z_vcpkg_isal_prefix}" PATH) + get_filename_component(z_vcpkg_isal_prefix "${z_vcpkg_isal_prefix}" PATH) + find_library(Z_VCPKG_ISAL_LIBRARY_RELEASE NAMES isal isa-l_static isa-l PATHS "${z_vcpkg_isal_prefix}/lib" NO_DEFAULT_PATH REQUIRED) + set_target_properties(unofficial::isal::isal PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${z_vcpkg_isal_prefix}/include" + IMPORTED_CONFIGURATIONS RELEASE + IMPORTED_LOCATION_RELEASE "${Z_VCPKG_ISAL_LIBRARY_RELEASE}" + ) + if("@VCPKG_BUILD_TYPE@" STREQUAL "") + find_library(Z_VCPKG_ISAL_LIBRARY_DEBUG NAMES isal isa-l_static isa-l PATHS "${z_vcpkg_isal_prefix}/debug/lib" NO_DEFAULT_PATH REQUIRED) + set_property(TARGET unofficial::isal::isal APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(unofficial::isal::isal PROPERTIES IMPORTED_LOCATION_DEBUG "${Z_VCPKG_ISAL_LIBRARY_DEBUG}") + endif() + unset(z_vcpkg_isal_prefix) +endif() diff --git a/ports/isal/usage b/ports/isal/usage index befe62e9f0dfa0..1bcbccccd22f53 100644 --- a/ports/isal/usage +++ b/ports/isal/usage @@ -1,4 +1,4 @@ -The package isal is compatible with built-in CMake targets: +The package isal provides CMake targets: - find_package(isal CONFIG REQUIRED) - target_link_libraries(main PRIVATE $,ISAL::isa-l,ISAL::isal>) + find_package(unofficial-isal CONFIG REQUIRED) + target_link_libraries(main unofficial::isal::isal) diff --git a/ports/isal/vcpkg.json b/ports/isal/vcpkg.json index 24e322b5f6211e..8052408e44ffd5 100644 --- a/ports/isal/vcpkg.json +++ b/ports/isal/vcpkg.json @@ -1,9 +1,8 @@ { "name": "isal", - "version": "2.25.0", - "port-version": 3, + "version": "2.30.0", "description": "Intel(R) Intelligent Storage Acceleration Library", "homepage": "https://github.com/intel/isa-l", "license": "BSD-3-Clause", - "supports": "!(x86 | arm | uwp | osx)" + "supports": "!uwp & (x64 | (arm64 & linux))" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 35c7103040bea2..dfbf59cf95061c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -383,8 +383,6 @@ intel-mkl:x86-windows=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail irrlicht:x64-uwp=fail -# Conflict with spdk-isal -isal:x64-linux=skip jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail jemalloc:x64-osx=fail @@ -1076,6 +1074,8 @@ spdk-ipsec:x64-windows=fail spdk-ipsec:x64-windows-static=fail spdk-ipsec:x64-windows-static-md=fail spdk-ipsec:x86-windows=fail +# Conflict with isal, and "internal" dep of spdk:x64-linux=fail +spdk-isal:x64-linux=skip spirv-tools:arm-uwp=fail spirv-tools:x64-uwp=fail stormlib:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 80346e0d37c063..1e456d238ab5e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3061,8 +3061,8 @@ "port-version": 0 }, "isal": { - "baseline": "2.25.0", - "port-version": 3 + "baseline": "2.30.0", + "port-version": 0 }, "ismrmrd": { "baseline": "1.5.0", diff --git a/versions/i-/isal.json b/versions/i-/isal.json index f6337b0b97af0e..978fd2dc33223c 100644 --- a/versions/i-/isal.json +++ b/versions/i-/isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "182dacba1a91116c56c83ede14decd8879b86cf7", + "version": "2.30.0", + "port-version": 0 + }, { "git-tree": "7fa8499c557c19920d80318d9a1999922cd28663", "version": "2.25.0", From 8563627bf17c6b76460a35c0e668557be2f8bbdc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 22 Aug 2022 23:32:29 +0200 Subject: [PATCH 452/791] [dpdk] no absolute paths (#26437) --- ports/dpdk/no-absolute-driver-path.patch | 13 +++++++++++++ ports/dpdk/portfile.cmake | 4 +++- ports/dpdk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpdk.json | 5 +++++ 5 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 ports/dpdk/no-absolute-driver-path.patch diff --git a/ports/dpdk/no-absolute-driver-path.patch b/ports/dpdk/no-absolute-driver-path.patch new file mode 100644 index 00000000000000..5c54a9734dcf9d --- /dev/null +++ b/ports/dpdk/no-absolute-driver-path.patch @@ -0,0 +1,13 @@ +diff --git a/config/meson.build b/config/meson.build +index 7f7b6c92fd..51c3572793 100644 +--- a/config/meson.build ++++ b/config/meson.build +@@ -375,7 +375,7 @@ if not dpdk_conf.has('RTE_MAX_NUMA_NODES') + endif + + # set the install path for the drivers +-dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) ++dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', '') + + install_headers(['rte_config.h'], + subdir: get_option('include_subdir_arch')) diff --git a/ports/dpdk/portfile.cmake b/ports/dpdk/portfile.cmake index 61ceb70a1b1365..736cb4eb004800 100644 --- a/ports/dpdk/portfile.cmake +++ b/ports/dpdk/portfile.cmake @@ -35,7 +35,9 @@ vcpkg_from_github( enable-either-static-or-shared-build.patch fix-dependencies.patch remove-examples-src-from-datadir.patch - stop-building-apps.patch) + stop-building-apps.patch + no-absolute-driver-path.patch +) macro(append_bool_option feature_name option_name) if("${feature_name}" IN_LIST FEATURES) diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json index 6de61c61388150..7a7acd549250ed 100644 --- a/ports/dpdk/vcpkg.json +++ b/ports/dpdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dpdk", "version-string": "22.03", - "port-version": 2, + "port-version": 3, "description": "A set of libraries and drivers for fast packet processing", "homepage": "https://www.dpdk.org/", "documentation": "https://doc.dpdk.org/guides/index.html", diff --git a/versions/baseline.json b/versions/baseline.json index 1e456d238ab5e1..9b5c5aac7ddd74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1974,7 +1974,7 @@ }, "dpdk": { "baseline": "22.03", - "port-version": 2 + "port-version": 3 }, "dpp": { "baseline": "10.0.16", diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json index 54132f21308365..aab7eff1e3f546 100644 --- a/versions/d-/dpdk.json +++ b/versions/d-/dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b097f29e77f314135bad880b342548826bb99108", + "version-string": "22.03", + "port-version": 3 + }, { "git-tree": "f6b3f2c2e194013731669b4b6996026bd5611c15", "version-string": "22.03", From e71ce102945eb6541f8b7f96007bdb2ee5651c67 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 23 Aug 2022 19:12:03 +0200 Subject: [PATCH 453/791] [vectorclass] Update to 2.02.00 (#26474) --- ports/vectorclass/portfile.cmake | 14 ++++++-------- ports/vectorclass/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/v-/vectorclass.json | 5 +++++ 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ports/vectorclass/portfile.cmake b/ports/vectorclass/portfile.cmake index ae582388996cfa..dd4311d5fd96c0 100644 --- a/ports/vectorclass/portfile.cmake +++ b/ports/vectorclass/portfile.cmake @@ -1,22 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vectorclass/version2 - REF v2.00.01 - SHA512 2e1f714cf0e23cf7986f0e78b4c1eeab4da6434ac92449b81990931e19ae189df6fbbef50f11e9532a41dc6eaff0a4fea840349a3747621ff537bbd7519f2c3d + REF v2.02.00 + SHA512 758cf12309ba9d5b1cc22db197d024880f62778de939af80f575dad9a3a2c3f256bc3228ee3dbd41a9da6e88835318f362b8255ff32bc8cadfe12bd2be4c36b5 HEAD_REF master ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/vectorclass/vcpkg.json b/ports/vectorclass/vcpkg.json index 40b26d7546c956..1be19e61a1ceac 100644 --- a/ports/vectorclass/vcpkg.json +++ b/ports/vectorclass/vcpkg.json @@ -1,8 +1,18 @@ { "name": "vectorclass", - "version-string": "2.00.01", - "port-version": 2, + "version-string": "2.02.00", "description": "C++ class library for using the Single Instruction Multiple Data (SIMD) instructions in modern Microprocessors", "homepage": "https://github.com/vectorclass/version2", - "supports": "!(arm | arm64)" + "license": "Apache-2.0", + "supports": "!(arm | arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 9b5c5aac7ddd74..8821f3c1b9965f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7541,8 +7541,8 @@ "port-version": 0 }, "vectorclass": { - "baseline": "2.00.01", - "port-version": 2 + "baseline": "2.02.00", + "port-version": 0 }, "visit-struct": { "baseline": "1.0", diff --git a/versions/v-/vectorclass.json b/versions/v-/vectorclass.json index dc472b4a17439d..41c725d8fab3bd 100644 --- a/versions/v-/vectorclass.json +++ b/versions/v-/vectorclass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd0c5a8f550d59e8a92becd672d9d0a029faf4ac", + "version-string": "2.02.00", + "port-version": 0 + }, { "git-tree": "a1c1b1ca0e0ddb9d5c27129234b2c22c9b73bd16", "version-string": "2.00.01", From 3e0abbde125b79fd4f7085f4c9ef5e5b86253720 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 23 Aug 2022 19:13:33 +0200 Subject: [PATCH 454/791] [rapidcsv] Update to 8.64 (#26473) --- ports/rapidcsv/portfile.cmake | 4 ++-- ports/rapidcsv/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/r-/rapidcsv.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/rapidcsv/portfile.cmake b/ports/rapidcsv/portfile.cmake index 94ebf914ad6620..a2e34640cda388 100644 --- a/ports/rapidcsv/portfile.cmake +++ b/ports/rapidcsv/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO d99kris/rapidcsv - REF v8.53 - SHA512 64a6100f1adf90eeaa4a513fbcf4ffd611a40b1f41b6e88eeda6c73c360e26c5a7cc6fc68a65bb2dff5f72ba663a976d2922e3114468dbd8c291c7eef211ae1f + REF v8.64 + SHA512 37424fda3b706a1ba3c29d836f240b0a2c3335095da629cfe79bb58a78fc7d8b172e0309447e9ec75f7dd21925a55b5ca96b673a9fff36f0078b948330a42801 HEAD_REF master ) diff --git a/ports/rapidcsv/vcpkg.json b/ports/rapidcsv/vcpkg.json index 79268aa9819683..5e12b08f448036 100644 --- a/ports/rapidcsv/vcpkg.json +++ b/ports/rapidcsv/vcpkg.json @@ -1,8 +1,9 @@ { "name": "rapidcsv", - "version": "8.53", + "version": "8.64", "description": "Rapidcsv is a C++ header-only library for CSV parsing.", "homepage": "https://github.com/d99kris/rapidcsv/", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 8821f3c1b9965f..bcaff36dbafcba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6217,7 +6217,7 @@ "port-version": 0 }, "rapidcsv": { - "baseline": "8.53", + "baseline": "8.64", "port-version": 0 }, "rapidjson": { diff --git a/versions/r-/rapidcsv.json b/versions/r-/rapidcsv.json index 4785f328cec6fc..a018f1a7e3db1a 100644 --- a/versions/r-/rapidcsv.json +++ b/versions/r-/rapidcsv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1842f5ea6077feea4ef5d07bb43e2fd648763718", + "version": "8.64", + "port-version": 0 + }, { "git-tree": "712023c784b983f8f85088dedc94c0d6fa53907e", "version": "8.53", From 42c70cd0f0950491fb2b592fbdcf82cbd6c252e0 Mon Sep 17 00:00:00 2001 From: eao197 Date: Tue, 23 Aug 2022 20:14:41 +0300 Subject: [PATCH 455/791] [sobjectizer] Update to 5.7.4.2 (#26461) * SObjectizer updated to v.5.7.4.2. * SObjectizer-5.7.4.2 added to the baseline. --- ports/sobjectizer/portfile.cmake | 4 ++-- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sobjectizer.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 2fca780f5bdbff..282bc713401523 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer - REF 646ac5891c15af766181d8ed7061b4fa9fa43e9f # v.5.7.4 - SHA512 c2ed2e0f41b31e56865469ddfa6f67cc41af8b154f73b8d431aad75f7af5033bddae5445e64454e17fd9c8a207a19415c7dd33102205687c4937cf92bcfb3fa2 + REF df7c3ee91b29079ae4e3525c34ad83a0d4e83d77 # v.5.7.4.2 + SHA512 4caee3a95723c9564fbd5430492cc82513885ca17003e18b31378fc347ed8ad1b0859bd1693ecaaf514e8f82b86c07d1913a86f007250e2f28a77adfa03918b1 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 984741690d1ded..995f4865f1966a 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.7.4", + "version": "5.7.4.2", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index bcaff36dbafcba..72173ff3692bc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6729,7 +6729,7 @@ "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.4", + "baseline": "5.7.4.2", "port-version": 0 }, "soci": { diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 971916b7d67369..246303007d44b1 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a77d86943e98697db670f9ee10fd24e8d19f08ce", + "version": "5.7.4.2", + "port-version": 0 + }, { "git-tree": "0434420bf7122407a1efe2ae663f5d09d70ce775", "version": "5.7.4", From 7bd1ddfe861e65085e5158a84c377e5dd0cc97a5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 23 Aug 2022 19:20:48 +0200 Subject: [PATCH 456/791] [pdal] Update to 2.4.3 (#26435) * Update to 2.4.3 * Update versions --- ports/pdal/portfile.cmake | 13 +++---------- ports/pdal/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/pdal.json | 5 +++++ 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index c06472fb705cd9..cb507baa1000d4 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PDAL/PDAL - REF 2.4.0 - SHA512 fd1314058404a1d15e308cee5682dcf3f1c6277884f200069b293b929ddfcd1d0d29bc74353bb08b1d163d3e776c8b036ba62d7c8599470b755128dacfe2f032 + REF 2.4.3 + SHA512 0293760c778be88e98e9c056730674c4e25bdba9094ff590e439a1ed1f61c880b7c03449b9cbc92190e12b3c0894cb337d93b2534c954f91277a0ee5cde5c78a HEAD_REF master PATCHES fix-dependency.patch @@ -97,8 +97,6 @@ file(READ "${SOURCE_PATH}/vendor/kazhdan/PoissonRecon.h" kazhdan_license) string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" kazhdan_license "${kazhdan_license}") file(READ "${SOURCE_PATH}/vendor/lazperf/lazperf.hpp" lazperf_license) string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" lazperf_license "${lazperf_license}") -file(READ "${SOURCE_PATH}/vendor/lazperf/detail/field_xyz.hpp" lazperf_detail_license) -string(REGEX REPLACE "^/\\*\n|\\*/.*\$" "" lazperf_detail_license "${lazperf_detail_license}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${pdal_license} --- @@ -118,17 +116,12 @@ Files in vendor/lazperf/: ${lazperf_license} --- -Files in vendor/lazperf/detail/: - -${lazperf_detail_license} ---- - Files in vendor/eigen: Most Eigen source code is subject to the terms of the Mozilla Public License v. 2.0. You can obtain a copy the MPL 2.0 at http://mozilla.org/MPL/2.0/. -Some files included in Eigen are under of the following licenses: +Some files included in Eigen are under one of the following licenses: - Apache License, Version 2.0 - BSD 3-Clause \"New\" or \"Revised\" License ") diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index 42ce602696a25c..39333896591fba 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pdal", - "version": "2.4.0", - "port-version": 1, + "version": "2.4.3", "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "homepage": "https://pdal.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 72173ff3692bc4..45c865e8937d6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5469,8 +5469,8 @@ "port-version": 0 }, "pdal": { - "baseline": "2.4.0", - "port-version": 1 + "baseline": "2.4.3", + "port-version": 0 }, "pdal-c": { "baseline": "2.1", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index a47ab6d0720c95..c7495c99c0f3de 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b72a995f43fed0287dca94b7f45bc1855b8fa43", + "version": "2.4.3", + "port-version": 0 + }, { "git-tree": "0c5321217b19b80c58854e9cd2141633e00c0fc7", "version": "2.4.0", From 8ab78df4b59904299f2df43fcccefd404bc63edb Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 24 Aug 2022 01:33:57 +0800 Subject: [PATCH 457/791] [poppler] update to version 22.8.0 and Add glib support (#25578) * [poppler] Add glib support * format vcpkg.json * update version * update version * update version * Add cairo dependency * update version * update dependcies * update version --- ports/poppler/portfile.cmake | 6 +++--- ports/poppler/vcpkg.json | 19 +++++++++++++++++-- versions/baseline.json | 4 ++-- versions/p-/poppler.json | 5 +++++ 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 3ae105866a8a82..e0d3db59a8d3de 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO poppler/poppler - REF poppler-22.03.0 - SHA512 0229e50bbf21154f398480730649fd15ca37c7edae5abd63ed41ab722852d09e4dc2b9df66b13b1cfe3e7a0da945916e1bd39c75c4879ded2759eb465f69424a + REF 12853d22e9d0527c10ada02666aef629db3e5e7c #poppler-22.08.0 + SHA512 d181bc8a521e216f163096e8baad7e73c898c24b18a5a4ab3b687bff4c29333c8c19961adaef54e684c1bdf26dab90183c3553fadb963b7a664e063bd3abcfcf HEAD_REF master PATCHES export-unofficial-poppler.patch @@ -18,6 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS curl ENABLE_LIBCURL private-api ENABLE_UNSTABLE_API_ABI_HEADERS zlib ENABLE_ZLIB + glib ENABLE_GLIB ) if("fontconfig" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS "-DFONT_CONFIGURATION=fontconfig") @@ -50,7 +51,6 @@ vcpkg_cmake_configure( -DBUILD_CPP_TESTS=OFF -DBUILD_MANUAL_TESTS=OFF -DENABLE_UTILS=OFF - -DENABLE_GLIB=OFF -DENABLE_GOBJECT_INTROSPECTION=OFF -DENABLE_QT5=OFF -DENABLE_QT6=OFF diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index f1a3be54c088b3..441d29f13cc507 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,6 @@ { "name": "poppler", - "version": "22.3.0", - "port-version": 1, + "version": "22.8.0", "description": "A PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "license": "GPL-2.0-or-later", @@ -67,6 +66,22 @@ "fontconfig" ] }, + "glib": { + "description": "glib for poppler", + "dependencies": [ + { + "name": "glib", + "default-features": false + }, + { + "name": "poppler", + "default-features": false, + "features": [ + "cairo" + ] + } + ] + }, "private-api": { "description": "Install headers for private API (aka unstable API/ABI headers)" }, diff --git a/versions/baseline.json b/versions/baseline.json index 45c865e8937d6d..e94ca4f5435ad2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5641,8 +5641,8 @@ "port-version": 4 }, "poppler": { - "baseline": "22.3.0", - "port-version": 1 + "baseline": "22.8.0", + "port-version": 0 }, "popsift": { "baseline": "0.9", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 275069c77acbb0..06566150854a0d 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8551fcec6635c82fba6fc51d817e788dfae0a387", + "version": "22.8.0", + "port-version": 0 + }, { "git-tree": "2d14bc508abd0861bda1a16290ad65b061a82b7c", "version": "22.3.0", From d044f527070604f22e0b525b1123bb784cc6daad Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 23 Aug 2022 10:36:54 -0700 Subject: [PATCH 458/791] [google-cloud-cpp] Fix features dialogflow-* CMake export (#26480) * [google-cloud-cpp] Fix feature dialogflow-* CMake export * x-add-version --- ports/google-cloud-cpp/portfile.cmake | 2 +- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 390dc160d66ad8..8d76f74e033f5f 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -59,7 +59,7 @@ foreach(feature IN LISTS FEATURES) endforeach() # These packages are automatically installed depending on what features are # enabled. -foreach(suffix common googleapis grpc_utils rest_internal) +foreach(suffix common googleapis grpc_utils rest_internal dialogflow_cx dialogflow_es) set(config_path "lib/cmake/google_cloud_cpp_${suffix}") if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") continue() diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 426b15b482765b..1a52b2a2e02bb6 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "google-cloud-cpp", "version": "2.1.0", - "port-version": 1, + "port-version": 2, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index e94ca4f5435ad2..54fea596e6b6d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2650,7 +2650,7 @@ }, "google-cloud-cpp": { "baseline": "2.1.0", - "port-version": 1 + "port-version": 2 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index b74c5088f6ea98..be5201221abc80 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e675db53dae8b88be806ecd93411810ee8048d7", + "version": "2.1.0", + "port-version": 2 + }, { "git-tree": "a70cc631d25b110ce203a0f571689304fb0e8595", "version": "2.1.0", From 5cae88e33e23d012c75c3a52d1de3f6ec9be75fe Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 23 Aug 2022 19:37:35 +0200 Subject: [PATCH 459/791] [gklib] Fix mingw build (#26468) * Fix mingw build * Update versions --- ports/gklib/fix-mingw.patch | 32 ++++++++++++++++++++++++++++++++ ports/gklib/portfile.cmake | 1 + ports/gklib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gklib.json | 5 +++++ 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 ports/gklib/fix-mingw.patch diff --git a/ports/gklib/fix-mingw.patch b/ports/gklib/fix-mingw.patch new file mode 100644 index 00000000000000..6cb6136df00103 --- /dev/null +++ b/ports/gklib/fix-mingw.patch @@ -0,0 +1,32 @@ +diff --git a/gk_arch.h b/gk_arch.h +index 122e087..c8a322f 100644 +--- a/gk_arch.h ++++ b/gk_arch.h +@@ -42,7 +42,9 @@ + #endif + #include + #include ++#ifndef _WIN32 # MinGW + #include ++#endif + #include + #include + #endif +diff --git a/gk_getopt.h b/gk_getopt.h +index 4bb8611..cc416ab 100644 +--- a/gk_getopt.h ++++ b/gk_getopt.h +@@ -52,10 +52,10 @@ struct gk_option { + + + /* Function prototypes */ +-extern int gk_getopt(int __argc, char **__argv, char *__shortopts); +-extern int gk_getopt_long(int __argc, char **__argv, char *__shortopts, ++extern int gk_getopt(int argc, char ** argv, char *__shortopts); ++extern int gk_getopt_long(int argc, char ** argv, char *__shortopts, + struct gk_option *__longopts, int *__longind); +-extern int gk_getopt_long_only (int __argc, char **__argv, ++extern int gk_getopt_long_only (int argc, char ** argv, + char *__shortopts, struct gk_option *__longopts, int *__longind); + + diff --git a/ports/gklib/portfile.cmake b/ports/gklib/portfile.cmake index 9c50870f0072d7..9eb4867321d489 100644 --- a/ports/gklib/portfile.cmake +++ b/ports/gklib/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( SHA512 e906c7af8b40ce1c4c4ea43cbfca3e3970e5595686333ac9ac80c6cbc558feb0e833f530f034161927030edac5272234c6ac9cad5287cb6edab0c0671ba3644c PATCHES build-fixes.patch + fix-mingw.patch ) # Delete files that are workarounds for very old copies of msvc. diff --git a/ports/gklib/vcpkg.json b/ports/gklib/vcpkg.json index f5f0a44ddadd0f..c31e6f6e45f640 100644 --- a/ports/gklib/vcpkg.json +++ b/ports/gklib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gklib", "version-date": "2022-07-27", - "port-version": 1, + "port-version": 2, "description": "General helper libraries for KarypisLab.", "homepage": "https://github.com/KarypisLab/GKlib/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 54fea596e6b6d6..bcbcb568d79a1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2566,7 +2566,7 @@ }, "gklib": { "baseline": "2022-07-27", - "port-version": 1 + "port-version": 2 }, "gl2ps": { "baseline": "1.4.2", diff --git a/versions/g-/gklib.json b/versions/g-/gklib.json index 5ba439c555508b..a0af42d2b28d89 100644 --- a/versions/g-/gklib.json +++ b/versions/g-/gklib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f9c6f0e711860da19899fbe78e027d0a5e8cfc1", + "version-date": "2022-07-27", + "port-version": 2 + }, { "git-tree": "be7b5aca0025910c7dbbc260564bf7d56ada1a3c", "version-date": "2022-07-27", From 698ca0211d697b16f81c0040003c19f992d82604 Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Tue, 23 Aug 2022 20:04:52 +0200 Subject: [PATCH 460/791] [freetype] Add feature to include error strings. (#26427) * [freetype] Add feature to add error string. * [freetype] Update baseline. * [freetype] Fix typo. * [freetype] Update baseline. --- ports/freetype/error-strings.patch | 37 ++++++++++++++++++++++++++++++ ports/freetype/portfile.cmake | 18 ++++++++------- ports/freetype/vcpkg.json | 5 +++- versions/baseline.json | 2 +- versions/f-/freetype.json | 5 ++++ 5 files changed, 57 insertions(+), 10 deletions(-) create mode 100644 ports/freetype/error-strings.patch diff --git a/ports/freetype/error-strings.patch b/ports/freetype/error-strings.patch new file mode 100644 index 00000000000000..422e7e696c95ca --- /dev/null +++ b/ports/freetype/error-strings.patch @@ -0,0 +1,37 @@ +From 5672a353682a68cb76a03179739bdec0a2f5cf0e Mon Sep 17 00:00:00 2001 +From: Sean Farrell +Date: Fri, 19 Aug 2022 15:32:19 +0200 +Subject: [PATCH] Adds config support for error strings. + +--- + CMakeLists.txt | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index feb4be39a..4eea860e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,6 +215,8 @@ cmake_dependent_option(FT_REQUIRE_BROTLI + "Require support of compressed WOFF2 fonts." OFF + "NOT FT_DISABLE_BROTLI" OFF) + ++option(FT_ENABLE_ERROR_STRINGS ++ "Enable support for meaningful error descriptions" OFF) + + # Disallow in-source builds + if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}") +@@ -353,6 +355,11 @@ if (BROTLIDEC_FOUND) + "/\\* +(#define +FT_CONFIG_OPTION_USE_BROTLI) +\\*/" "\\1" + FTOPTION_H "${FTOPTION_H}") + endif () ++if (FT_ENABLE_ERROR_STRINGS) ++ string(REGEX REPLACE ++ "/\\* +(#define +FT_CONFIG_OPTION_ERROR_STRINGS) +\\*/" "\\1" ++ FTOPTION_H "${FTOPTION_H}") ++endif () + + set(FTOPTION_H_NAME "${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h") + if (EXISTS "${FTOPTION_H_NAME}") +-- +2.33.0.windows.2 + diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 40f410d5bfa6d1..f43790ddb11016 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -11,19 +11,21 @@ vcpkg_from_sourceforge( brotli-static.patch bzip2.patch fix-exports.patch + error-strings.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - zlib FT_REQUIRE_ZLIB - bzip2 FT_REQUIRE_BZIP2 - png FT_REQUIRE_PNG - brotli FT_REQUIRE_BROTLI + zlib FT_REQUIRE_ZLIB + bzip2 FT_REQUIRE_BZIP2 + error-strings FT_ENABLE_ERROR_STRINGS + png FT_REQUIRE_PNG + brotli FT_REQUIRE_BROTLI INVERTED_FEATURES - zlib FT_DISABLE_ZLIB - bzip2 FT_DISABLE_BZIP2 - png FT_DISABLE_PNG - brotli FT_DISABLE_BROTLI + zlib FT_DISABLE_ZLIB + bzip2 FT_DISABLE_BZIP2 + png FT_DISABLE_PNG + brotli FT_DISABLE_BROTLI ) vcpkg_cmake_configure( diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index b7e60b21389451..b129d8715b5908 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype", "version": "2.12.1", - "port-version": 1, + "port-version": 2, "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "license": "FTL OR GPL-2.0-or-later", @@ -34,6 +34,9 @@ "bzip2" ] }, + "error-strings": { + "description": "Enable support for meaningful error descriptions." + }, "png": { "description": "Support PNG compressed OpenType embedded bitmaps.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index bcbcb568d79a1c..ec88fb92c9f04f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2394,7 +2394,7 @@ }, "freetype": { "baseline": "2.12.1", - "port-version": 1 + "port-version": 2 }, "freetype-gl": { "baseline": "2022-01-17", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index 2a2bc3317bdf26..1c7ad157ca2090 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1d6772ea2cb8cd74146b263b5dab534a10dd641", + "version": "2.12.1", + "port-version": 2 + }, { "git-tree": "f62a602dce6f188e2e4324b46995b2c79a97759a", "version": "2.12.1", From 02fcf92f48abfee2d75845f6cc74a0544c2a005e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 23 Aug 2022 21:07:33 +0200 Subject: [PATCH 461/791] Deprecated VCPKG_PREFER_SYSTEM_LIBS (#26449) --- docs/users/buildsystems/cmake-integration.md | 2 ++ scripts/buildsystems/vcpkg.cmake | 3 +++ scripts/test_ports/cmake-user/portfile.cmake | 4 ---- .../test_ports/cmake-user/project/CMakeLists.txt | 15 --------------- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/docs/users/buildsystems/cmake-integration.md b/docs/users/buildsystems/cmake-integration.md index ad3c7d565d5e53..2f467124590c18 100644 --- a/docs/users/buildsystems/cmake-integration.md +++ b/docs/users/buildsystems/cmake-integration.md @@ -213,6 +213,8 @@ This variable can be set to a list of additional command line parameters to pass ### `VCPKG_PREFER_SYSTEM_LIBS` +**This feature has been deprecated. Use empty overlay ports instead.** + This variable controls whether vcpkg will append instead of prepend its paths to `CMAKE_PREFIX_PATH`, `CMAKE_LIBRARY_PATH` and `CMAKE_FIND_ROOT_PATH` so that vcpkg libraries/packages are found after toolchain/system libraries/packages. Defaults to `OFF`. diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index f7823e72b57408..73588faa908c80 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -51,6 +51,9 @@ option(X_VCPKG_APPLOCAL_DEPS_SERIALIZED "(experimental) Add USES_TERMINAL to VCP # requires CMake 3.14 option(X_VCPKG_APPLOCAL_DEPS_INSTALL "(experimental) Automatically copy dependencies into the install target directory for executables. Requires CMake 3.14." OFF) option(VCPKG_PREFER_SYSTEM_LIBS "Appends the vcpkg paths to CMAKE_PREFIX_PATH, CMAKE_LIBRARY_PATH and CMAKE_FIND_ROOT_PATH so that vcpkg libraries/packages are found after toolchain/system libraries/packages." OFF) +if(VCPKG_PREFER_SYSTEM_LIBS) + message(WARNING "VCPKG_PREFER_SYSTEM_LIBS has been deprecated. Use empty overlay ports instead.") +endif() # Manifest options and settings if(NOT DEFINED VCPKG_MANIFEST_DIR) diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index b3b93419fc4725..96e204b2bd50df 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -221,14 +221,10 @@ foreach(executable IN LISTS cmake_commands) CMAKE_COMMAND "${executable}" OPTIONS "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=OFF" ) test_cmake_project(NAME "debug" CMAKE_COMMAND "${executable}" OPTIONS "-DCMAKE_BUILD_TYPE=Debug" - "-DCMAKE_PREFIX_PATH=SYSTEM_LIBS" # for testing VCPKG_PREFER_SYSTEM_LIBS - "-DVCPKG_PREFER_SYSTEM_LIBS=ON" ) endforeach() diff --git a/scripts/test_ports/cmake-user/project/CMakeLists.txt b/scripts/test_ports/cmake-user/project/CMakeLists.txt index 5ce488701f4e8c..fdb213e5a54607 100644 --- a/scripts/test_ports/cmake-user/project/CMakeLists.txt +++ b/scripts/test_ports/cmake-user/project/CMakeLists.txt @@ -11,21 +11,6 @@ else() message(STATUS "CMake version check: success (actual: ${CMAKE_VERSION})") endif() -message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") -list(FIND CMAKE_PREFIX_PATH "SYSTEM_LIBS" system_libs) -list(FIND CMAKE_PREFIX_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" vcpkg) -if(system_libs LESS 0) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (Cannot find SYSTEM_LIBS in CMAKE_PREFIX_PATH.)") -elseif(vcpkg LESS 0) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (Cannot find vcpkg path in CMAKE_PREFIX_PATH.") -elseif(VCPKG_PREFER_SYSTEM_LIBS AND system_libs GREATER vcpkg) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (actual: ${VCPKG_PREFER_SYSTEM_LIBS}, but vcpkg paths are before system paths in CMAKE_PREFIX_PATH.)") -elseif(NOT VCPKG_PREFER_SYSTEM_LIBS AND system_libs LESS vcpkg) - message(SEND_ERROR "VCPKG_PREFER_SYSTEM_LIBS check: failed (actual: ${VCPKG_PREFER_SYSTEM_LIBS}, but vcpkg paths are after system paths in CMAKE_PREFIX_PATH.)") -else() - message(STATUS "VCPKG_PREFER_SYSTEM_LIBS check: success (actual: ${VCPKG_PREFER_SYSTEM_LIBS})") -endif() - # add_library overload file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lib.c" "int lib_unused() { return 1; }") add_library(lib "${CMAKE_CURRENT_BINARY_DIR}/lib.c") From 5bb60c0580b95a9b870f53bd72cea37b85bdbf67 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Tue, 23 Aug 2022 14:11:44 -0500 Subject: [PATCH 462/791] [libsrt] Produce correct library kind (#26471) * [libsrt] respect VCPKG_LIBRARY_LINKAGE * ./vcpkg x-add-version --all --- ports/libsrt/portfile.cmake | 4 ++-- ports/libsrt/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libsrt.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index e033691d71d777..d7ea5a9e563b8f 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -20,8 +20,8 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DENABLE_CXX11=ON - -DENABLE_SHARED=${KEYSTONE_BUILD_STATIC} - -DENABLE_STATIC=${KEYSTONE_BUILD_SHARED} + -DENABLE_STATIC=${KEYSTONE_BUILD_STATIC} + -DENABLE_SHARED=${KEYSTONE_BUILD_SHARED} -DENABLE_UNITTESTS=OFF -DUSE_OPENSSL_PC=OFF ) diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index e152d4a0ba26c1..e7c80c480105e9 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsrt", "version": "1.5.0", + "port-version": 1, "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ec88fb92c9f04f..89882b5f12da8d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4122,7 +4122,7 @@ }, "libsrt": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "libsrtp": { "baseline": "2.4.2", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index b1e7e233b10bd2..e2f20035824515 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67081a32f9ebb0639c8cdf50daf0da4db33dfd37", + "version": "1.5.0", + "port-version": 1 + }, { "git-tree": "eb7fad3230d33ce43f4e008d3ec92cb286fe01e5", "version": "1.5.0", From e5eb2da7fb508571f99c69a0f96386e815a90c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 23 Aug 2022 21:36:24 +0200 Subject: [PATCH 463/791] [windres-rc] support --define, --include-dir (#26454) * [windres-rc] support --define, --include-dir * [windres-rc] treat --include-dir with func_file_conv() --- scripts/buildsystems/make_wrapper/windres-rc | 11 +++++++++++ 1 file changed, 11 insertions(+) mode change 100644 => 100755 scripts/buildsystems/make_wrapper/windres-rc diff --git a/scripts/buildsystems/make_wrapper/windres-rc b/scripts/buildsystems/make_wrapper/windres-rc old mode 100644 new mode 100755 index bb2aac0d8790f0..b695744fcca7ba --- a/scripts/buildsystems/make_wrapper/windres-rc +++ b/scripts/buildsystems/make_wrapper/windres-rc @@ -68,6 +68,17 @@ func_windres_wrapper () eat= else case $1 in + --define*) + eat=1 + set x "$@" "-d $2" + shift + ;; + --include-dir*) + eat=1 + func_file_conv "$2" + set x "$@" "-I $file" + shift + ;; -o) eat=1 func_file_conv "$2" From 88b1071e39f13b632644d9d953738d345a4ac055 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 24 Aug 2022 03:43:10 +0800 Subject: [PATCH 464/791] [edflib] Add new port (#25738) * [edflib] Add new port * [edflib] Add version * [edflib] Fix PDB installation * [edflib] Overwrite version * [edflib] No need to call vcpkg_copy_pdbs * [edflib] Overwrite version * [vcpkg] Drop dynamic build support * [edflib] Update version * [edflib] Fix linux build * [edflib] Overwrite version * [edflib] Remove test_edflib and test_generator * [edflib] Overwrite version * [edflib] Cleanup * [edflib] Overwrite version --- ports/edflib/CMakeLists.txt | 64 +++++++++++++++++++++++++++++++++++++ ports/edflib/portfile.cmake | 41 ++++++++++++++++++++++++ ports/edflib/vcpkg.json | 22 +++++++++++++ versions/baseline.json | 4 +++ versions/e-/edflib.json | 9 ++++++ 5 files changed, 140 insertions(+) create mode 100644 ports/edflib/CMakeLists.txt create mode 100644 ports/edflib/portfile.cmake create mode 100644 ports/edflib/vcpkg.json create mode 100644 versions/e-/edflib.json diff --git a/ports/edflib/CMakeLists.txt b/ports/edflib/CMakeLists.txt new file mode 100644 index 00000000000000..6a60fa5104968b --- /dev/null +++ b/ports/edflib/CMakeLists.txt @@ -0,0 +1,64 @@ +cmake_minimum_required(VERSION 3.5) + +project(EDFlib VERSION 1.21 LANGUAGES C) + +option(BUILD_TOOLS "Build EDFlib tools." OFF) + +include(GNUInstallDirs) + +set(sources edflib.h edflib.c) + +add_library(EDFlib ${sources}) + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_definitions(EDFlib PRIVATE _LARGEFILE64_SOURCE _LARGEFILE_SOURCE) + target_compile_options(EDFlib PRIVATE -Wall -Wextra -Wshadow -Wformat-nonliteral -Wformat-security) +endif() + +set_target_properties(EDFlib PROPERTIES PUBLIC_HEADER edflib.h) + +install(TARGETS EDFlib + EXPORT EDFlibTargets + PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +install(EXPORT EDFlibTargets + FILE unofficial-EDFlibConfig.cmake + DESTINATION "share/unofficial-EDFlib" +) + +if(BUILD_TOOLS) + include(CheckSymbolExists) + + # https://stackoverflow.com/questions/32816646/can-cmake-detect-if-i-need-to-link-to-libm-when-using-pow-in-c + if(NOT POW_FUNCTION_EXISTS AND NOT NEED_LINKING_AGAINST_LIBM) + check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) + if(NOT POW_FUNCTION_EXISTS) + unset(POW_FUNCTION_EXISTS CACHE) + list(APPEND CMAKE_REQUIRED_LIBRARIES m) + check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) + if(POW_FUNCTION_EXISTS) + set(NEED_LINKING_AGAINST_LIBM True CACHE BOOL "" FORCE) + else() + message(FATAL_ERROR "Failed making the pow() function available") + endif() + endif() + endif() + + add_executable(sine_generator sine_generator.c) + target_link_libraries(sine_generator PRIVATE EDFlib) + + add_executable(sweep_generator sweep_generator.c) + target_link_libraries(sweep_generator PRIVATE EDFlib) + + if(NEED_LINKING_AGAINST_LIBM) + target_link_libraries(sine_generator PRIVATE m) + target_link_libraries(sweep_generator PRIVATE m) + endif() + + install(TARGETS sine_generator sweep_generator + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ) +endif() diff --git a/ports/edflib/portfile.cmake b/ports/edflib/portfile.cmake new file mode 100644 index 00000000000000..2987b5919abe83 --- /dev/null +++ b/ports/edflib/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO Teuniz/EDFlib + REF v1.21 + SHA512 6153cec44e26c0b9cd2f7e00d014f38ee7bdc444015eaf6169fecaf4aa16b04a552d3755ac83d48728de8dac7fe22cb2d0c9566f0fdc967e15bc3f000f456106 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-EDFlib) + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES + sine_generator + sweep_generator + AUTO_CLEAN + ) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/edflib/vcpkg.json b/ports/edflib/vcpkg.json new file mode 100644 index 00000000000000..e13eccddb10c4d --- /dev/null +++ b/ports/edflib/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "edflib", + "version": "1.21", + "description": "A C library to read/write EDF/EDF+/BDF/BDF+ files", + "homepage": "https://www.teuniz.net/edflib/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 89882b5f12da8d..ae7869dc347ef6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2072,6 +2072,10 @@ "baseline": "1.0.7.15", "port-version": 2 }, + "edflib": { + "baseline": "1.21", + "port-version": 0 + }, "edlib": { "baseline": "1.2.7", "port-version": 1 diff --git a/versions/e-/edflib.json b/versions/e-/edflib.json new file mode 100644 index 00000000000000..03caf49f1e1b6c --- /dev/null +++ b/versions/e-/edflib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "161f6ffc0519e0944bce2573bbfb7ed800899690", + "version": "1.21", + "port-version": 0 + } + ] +} From 1ccf92726f82abc657933eecce02d0745cf18bb5 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 24 Aug 2022 17:51:57 +0200 Subject: [PATCH 465/791] [nghttp2]: update to v1.49.0 (#26425) * [nghttp2]: update to v1.48.0 * nghttp2(vcpkg): Add License (MIT) * nghttp2(.json), fix git hash after update licence * nghttp2: update to 1.49.0 * nghttp2.json: remove v1.48.0 Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/nghttp2/portfile.cmake | 4 ++-- ports/nghttp2/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index ef14b80ad6c35d..48ee86ca2e4e64 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF 7af0c508be9cbec407268e2f546f597d268c104e # v1.46.0 - SHA512 e25e8a43d0f9523f654d9136c2b9db30cfa5e8086da3fe3e9bcf68ff8c034383550ca17d89d31cd14e23b5886a0a948d777b4e182d0a042ccfe9a8083410de93 + REF v1.49.0 + SHA512 bdfd0547e5094acf3784ee6ec46a024e7afd7ba9727f91142be83e5f7ddc12db30935fd25ebd12d69b0f2286af1bb4ee96ab13e160ee6243168f66e4507c1f09 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index 9b5ce8969be7ce..484319ebb5b82c 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,8 +1,9 @@ { "name": "nghttp2", - "version": "1.46.0", + "version": "1.49.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index ae7869dc347ef6..1888a98e0fe347 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4949,7 +4949,7 @@ "port-version": 3 }, "nghttp2": { - "baseline": "1.46.0", + "baseline": "1.49.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index fe89531acd03d9..0ca6003ad8813b 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2c6faba492d188ec0f72078720084f6a4dc00c3", + "version": "1.49.0", + "port-version": 0 + }, { "git-tree": "b7477580246c8547d75abc176295b832544cb132", "version": "1.46.0", From 6511a6f0d53a9e586cb0963dd5bb683330fd2d29 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 24 Aug 2022 08:54:40 -0700 Subject: [PATCH 466/791] [dartsim] Enable dart-gui (#26493) --- ports/dartsim/portfile.cmake | 1 - ports/dartsim/vcpkg.json | 3 +++ versions/baseline.json | 2 +- versions/d-/dartsim.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake index d250a27764d880..7059ac1d96976b 100644 --- a/ports/dartsim/portfile.cmake +++ b/ports/dartsim/portfile.cmake @@ -20,7 +20,6 @@ vcpkg_cmake_configure( -DDART_SKIP_FLANN=ON -DDART_SKIP_IPOPT=ON -DDART_SKIP_NLOPT=ON - -DDART_SKIP_OPENGL=ON -DDART_SKIP_pagmo=ON -Durdfdom_headers_VERSION_MAJOR=1 # urdfdom-headers does not expose a header macro for its version. -Durdfdom_headers_VERSION_MINOR=0 # versions of at least 1.0.0 use std:: constructs in their ABI instead of boost:: ones. diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index 2b3b3aa2ecb85a..d410210ae9fb42 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dartsim", "version": "6.12.2", + "port-version": 1, "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", "license": "BSD-2-Clause", @@ -20,8 +21,10 @@ "eigen3", "fcl", "fmt", + "freeglut", "octomap", "ode", + "opengl", "tinyxml2", "urdfdom", { diff --git a/versions/baseline.json b/versions/baseline.json index 1888a98e0fe347..dcedb8eb87866c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1814,7 +1814,7 @@ }, "dartsim": { "baseline": "6.12.2", - "port-version": 0 + "port-version": 1 }, "dataframe": { "baseline": "1.19.0", diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index 00c5eb62d7a377..478eef48be23d5 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "746ffa24744bf10e2ce9b04332c8dcde2222ba39", + "version": "6.12.2", + "port-version": 1 + }, { "git-tree": "887126d7800fe033a8e70bfa369e0b990434c921", "version": "6.12.2", From 9eb19776b0443461f6f124eb1e9ea6d334b6a80b Mon Sep 17 00:00:00 2001 From: Adolfo Solis Date: Wed, 24 Aug 2022 10:59:33 -0500 Subject: [PATCH 467/791] [ceres] Use ceres without gflags for [arm-uwp] build (#26434) * Use Cmake without gflash for UWP-ARM64 build * Merge branch 'master' of https://github.com/Microsoft/vcpkg * Update version database * Added glog dependencie for not uwp platforms * Formatted vcpkg.json * Updated version * Added MINIGLOG Feature in uwp * Update version database * Changed platform support for glog * Update version database Co-authored-by: Adolfo Solis --- ports/ceres/portfile.cmake | 7 +++++++ ports/ceres/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/c-/ceres.json | 5 +++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index c3aad82243ccf6..8cb18127366958 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -35,6 +35,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tools" GFLAGS "cuda" CUDA ) +if(VCPKG_TARGET_IS_UWP) + list(APPEND FEATURE_OPTIONS -DMINIGLOG=ON) +endif() + +foreach (FEATURE ${FEATURE_OPTIONS}) + message(STATUS "${FEATURE}") +endforeach() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index 6b1e2e7b421d4b..a37a30760f380d 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,13 +1,16 @@ { "name": "ceres", "version": "2.1.0", - "port-version": 1, + "port-version": 2, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "license": "Apache-2.0", "dependencies": [ "eigen3", - "glog", + { + "name": "glog", + "platform": "!(arm & uwp)" + }, { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index dcedb8eb87866c..6a7f8719abe08d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1330,7 +1330,7 @@ }, "ceres": { "baseline": "2.1.0", - "port-version": 1 + "port-version": 2 }, "cfitsio": { "baseline": "3.49", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index 9697d19bef5a7c..ded354d8532ac1 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4baf16216d2d50574964ba5795a501bb89193042", + "version": "2.1.0", + "port-version": 2 + }, { "git-tree": "85a5ff9f8727124ce91655f2d37b9a6c77f367e1", "version": "2.1.0", From c350275db48403d9e30dcae23b99d264e620f1c2 Mon Sep 17 00:00:00 2001 From: Tim Miller <86238857+verifiedtm@users.noreply.github.com> Date: Wed, 24 Aug 2022 12:04:34 -0400 Subject: [PATCH 468/791] [guile] Added guile port (#26336) --- ports/guile/portfile.cmake | 25 +++++++++++++++++++++++++ ports/guile/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/guile.json | 9 +++++++++ 4 files changed, 60 insertions(+) create mode 100644 ports/guile/portfile.cmake create mode 100644 ports/guile/vcpkg.json create mode 100644 versions/g-/guile.json diff --git a/ports/guile/portfile.cmake b/ports/guile/portfile.cmake new file mode 100644 index 00000000000000..c41acdf4537812 --- /dev/null +++ b/ports/guile/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_download_distfile(GUILE_ARCHIVE + URLS https://ftp.gnu.org/gnu/guile/guile-3.0.8.tar.gz + FILENAME guile-3.0.8.tar.gz + SHA512 7b2728e849a3ee482fe9a167dd76cc4835e911cc94ca0724dd51e8a813a240c6b5d2de84de16b46469ab24305b5b153a3c812fec942e007d3310bba4d1cf947d + ) + +vcpkg_extract_source_archive(GUILE_SOURCES ARCHIVE ${GUILE_ARCHIVE}) + +vcpkg_configure_make( + SOURCE_PATH "${GUILE_SOURCES}" + ADD_BIN_TO_PATH + AUTOCONFIG + ) +vcpkg_install_make() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() + +file( + INSTALL "${GUILE_SOURCES}/COPYING.LESSER" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright + ) diff --git a/ports/guile/vcpkg.json b/ports/guile/vcpkg.json new file mode 100644 index 00000000000000..59c7e4163523f7 --- /dev/null +++ b/ports/guile/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "guile", + "version": "3.0.8", + "description": "GNU's programming and extension language", + "homepage": "https://www.gnu.org/software/guile/", + "documentation": "https://www.gnu.org/software/guile/manual/", + "license": "LGPL-3.0-or-later", + "supports": "linux", + "dependencies": [ + "bdwgc", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "gmp", + "libffi", + "libunistring" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6a7f8719abe08d..37655799270961 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2764,6 +2764,10 @@ "baseline": "2020-09-14", "port-version": 2 }, + "guile": { + "baseline": "3.0.8", + "port-version": 0 + }, "guilite": { "baseline": "2022-05-05", "port-version": 0 diff --git a/versions/g-/guile.json b/versions/g-/guile.json new file mode 100644 index 00000000000000..bed043b1452f13 --- /dev/null +++ b/versions/g-/guile.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1c74041cde8519afb26d9fa588b8d24877d35514", + "version": "3.0.8", + "port-version": 0 + } + ] +} From 55112eb54a1c4cfaec5dd2592a39cea72f78ed56 Mon Sep 17 00:00:00 2001 From: Ulysses1337 <2980728+Ulysses1337@users.noreply.github.com> Date: Wed, 24 Aug 2022 17:08:34 +0100 Subject: [PATCH 469/791] [mchehab-zbar] Add new port (#16113) * Add mchehab/zbar * Quote all paths Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Update to 0.23.90 * Flip name * Update version registry Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/mchehab-zbar/c99.patch | 89 ++++++++++++++++++++ ports/mchehab-zbar/issue219.patch | 13 +++ ports/mchehab-zbar/portfile.cmake | 48 +++++++++++ ports/mchehab-zbar/vcpkg.json | 11 +++ ports/mchehab-zbar/windows.patch | 68 +++++++++++++++ ports/mchehab-zbar/x64.patch | 21 +++++ scripts/buildsystems/make_wrapper/windres-rc | 48 +++++------ versions/baseline.json | 4 + versions/m-/mchehab-zbar.json | 9 ++ 9 files changed, 284 insertions(+), 27 deletions(-) create mode 100644 ports/mchehab-zbar/c99.patch create mode 100644 ports/mchehab-zbar/issue219.patch create mode 100644 ports/mchehab-zbar/portfile.cmake create mode 100644 ports/mchehab-zbar/vcpkg.json create mode 100644 ports/mchehab-zbar/windows.patch create mode 100644 ports/mchehab-zbar/x64.patch create mode 100644 versions/m-/mchehab-zbar.json diff --git a/ports/mchehab-zbar/c99.patch b/ports/mchehab-zbar/c99.patch new file mode 100644 index 00000000000000..8b906fcaa99a39 --- /dev/null +++ b/ports/mchehab-zbar/c99.patch @@ -0,0 +1,89 @@ +diff --git a/zbar/symbol.c b/zbar/symbol.c +index 27dbc87..1059a72 100644 +--- a/zbar/symbol.c ++++ b/zbar/symbol.c +@@ -100,40 +100,29 @@ const char *zbar_get_orientation_name (zbar_orientation_t orient) + + int _zbar_get_symbol_hash (zbar_symbol_type_t sym) + { +- static const signed char hash[ZBAR_CODE128 + 1] = { +- [0 ... ZBAR_CODE128] = -1, +- +- /* [ZBAR_FOO] = 0, is empty */ +- [ZBAR_SQCODE] = 1, +- [ZBAR_CODE128] = 2, +- [ZBAR_EAN13] = 3, +- [ZBAR_UPCA] = 4, +- [ZBAR_EAN8] = 5, +- [ZBAR_UPCE] = 6, +- [ZBAR_ISBN13] = 7, +- [ZBAR_ISBN10] = 8, +- [ZBAR_CODE39] = 9, +- [ZBAR_I25] = 10, +- [ZBAR_PDF417] = 11, +- [ZBAR_QRCODE] = 12, +- [ZBAR_DATABAR] = 13, +- [ZBAR_DATABAR_EXP] = 14, +- [ZBAR_CODE93] = 15, +- [ZBAR_EAN2] = 16, +- [ZBAR_EAN5] = 17, +- [ZBAR_COMPOSITE] = 18, +- [ZBAR_CODABAR] = 19, +- +- /* Please update NUM_SYMS accordingly */ +- }; +- int h; +- +- assert (sym >= ZBAR_PARTIAL && sym <= ZBAR_CODE128); +- +- h = hash[sym]; +- assert (h >= 0 && h < NUM_SYMS); +- +- return h; ++ switch(sym) ++ { ++ default: return -1; ++ case ZBAR_SQCODE: return 1; ++ case ZBAR_CODE128: return 2; ++ case ZBAR_EAN13: return 3; ++ case ZBAR_UPCA: return 4; ++ case ZBAR_EAN8: return 5; ++ case ZBAR_UPCE: return 6; ++ case ZBAR_ISBN13: return 7; ++ case ZBAR_ISBN10: return 8; ++ case ZBAR_CODE39: return 9; ++ case ZBAR_I25: return 10; ++ case ZBAR_PDF417: return 11; ++ case ZBAR_QRCODE: return 12; ++ case ZBAR_DATABAR: return 13; ++ case ZBAR_DATABAR_EXP: return 14; ++ case ZBAR_CODE93: return 15; ++ case ZBAR_EAN2: return 16; ++ case ZBAR_EAN5: return 17; ++ case ZBAR_COMPOSITE: return 18; ++ case ZBAR_CODABAR: return 19; ++ } + } + + void _zbar_symbol_free (zbar_symbol_t *sym) +diff --git a/zbar/window/win.c b/zbar/window/win.c +index b949f65..7edcfa2 100644 +--- a/zbar/window/win.c ++++ b/zbar/window/win.c +@@ -194,7 +194,7 @@ int _zbar_window_draw_polygon (zbar_window_t *w, + win_set_rgb(hdc, rgb); + + point_t org = w->scaled_offset; +- POINT gdipts[npts + 1]; ++ POINT* gdipts = malloc((npts + 1) * sizeof(POINT)); + int i; + for(i = 0; i < npts; i++) { + point_t p = window_scale_pt(w, pts[i]); +@@ -204,6 +204,7 @@ int _zbar_window_draw_polygon (zbar_window_t *w, + gdipts[npts] = gdipts[0]; + + Polyline(hdc, gdipts, npts + 1); ++ free(gdipts); + return(0); + } + diff --git a/ports/mchehab-zbar/issue219.patch b/ports/mchehab-zbar/issue219.patch new file mode 100644 index 00000000000000..2f86a7c3aa356e --- /dev/null +++ b/ports/mchehab-zbar/issue219.patch @@ -0,0 +1,13 @@ +diff --git a/zbar/decoder/databar.c b/zbar/decoder/databar.c +index 8cfa848..ffb972e 100644 +--- a/zbar/decoder/databar.c ++++ b/zbar/decoder/databar.c +@@ -695,7 +695,7 @@ lookup_sequence (databar_segment_t *seg, + seq[i++] = s; + } + dbprintf(2, "}"); +- seq[n] = -1; ++ if (n<22) {seq[n]=-1;} /* https://github.com/mchehab/zbar/issues/219 */ + return(fixed < 1); + } + diff --git a/ports/mchehab-zbar/portfile.cmake b/ports/mchehab-zbar/portfile.cmake new file mode 100644 index 00000000000000..57d5da97a7bb0c --- /dev/null +++ b/ports/mchehab-zbar/portfile.cmake @@ -0,0 +1,48 @@ +if(EXISTS ${CURRENT_INSTALLED_DIR}/share/zbar/copyright) + message(FATAL_ERROR "${PORT} conflicts with zbar. Please remove zbar before installing ${PORT}.") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mchehab/zbar + REF 0.23.90 + SHA512 d73d71873bec68ee021997512a9edbd223f5f5fe43c66c4dd3502224ba6009be2e5e1714766cb8e1056244673e87e0939ed0319116f61d7371b5ab79fb5e04eb + HEAD_REF master + PATCHES + c99.patch + issue219.patch + windows.patch + x64.patch +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + NO_ADDITIONAL_PATHS + ADD_BIN_TO_PATH + ADDITIONAL_MSYS_PACKAGES findutils gettext gettext-devel liblzma tar xz + OPTIONS + --disable-video + --without-gtk + --without-imagemagick + --without-java + --without-python + --without-qt +) + +vcpkg_install_make() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/doc") + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/zbar" "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/mchehab-zbar/vcpkg.json b/ports/mchehab-zbar/vcpkg.json new file mode 100644 index 00000000000000..8a2be0ce1aa413 --- /dev/null +++ b/ports/mchehab-zbar/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mchehab-zbar", + "version": "0.23.90", + "description": "ZBar is an open source software suite for reading bar codes from various sources, including webcams. This fork is actively maintained.", + "homepage": "https://github.com/mchehab/zbar", + "license": "LGPL-2.1-or-later", + "supports": "windows & !uwp", + "dependencies": [ + "libiconv" + ] +} diff --git a/ports/mchehab-zbar/windows.patch b/ports/mchehab-zbar/windows.patch new file mode 100644 index 00000000000000..3e950ec14621ac --- /dev/null +++ b/ports/mchehab-zbar/windows.patch @@ -0,0 +1,68 @@ +diff --git a/configure.ac b/configure.ac +index c8fea14..eb0a097 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION], + [Library revision]) + + AM_CPPFLAGS="-I\$(top_srcdir)/include" +-AM_CFLAGS="-Wall -Wno-parentheses" ++AM_CFLAGS="-Wall" + AM_CXXFLAGS="$AM_CFLAGS" + AC_SUBST([AM_CPPFLAGS]) + AC_SUBST([AM_CFLAGS]) +diff --git a/zbar/Makefile.am b/zbar/Makefile.am +index ca54d01..6c0cd83 100644 +--- a/zbar/Makefile.am ++++ b/zbar/Makefile.am +@@ -68,7 +68,7 @@ if WIN32 + + libzbar_la_SOURCES += processor/win.c libzbar.rc + libzbar_la_CPPFLAGS += -mthreads +-libzbar_la_LDFLAGS += -mthreads ++libzbar_la_LDFLAGS += -mthreads -Xcompiler -Wl,-DEBUG + # FIXME broken + libzbar_la_LIBADD += libzbar-rc.lo + else +diff --git a/zbar/libzbar.rc b/zbar/libzbar.rc +index 413635b..c241f82 100644 +--- a/zbar/libzbar.rc ++++ b/zbar/libzbar.rc +@@ -17,8 +17,7 @@ VS_VERSION_INFO VERSIONINFO + VALUE "InternalName", "libzbar" + VALUE "OriginalFilename", "libzbar-" XSTR(LIB_VERSION_MAJOR) ".dll" + +- VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." \ +- XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION) ++ VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION) + VALUE "ProductVersion", PACKAGE_VERSION + + VALUE "FileDescription", "Bar code reader library" +diff --git a/zbar/processor.h b/zbar/processor.h +index d5e9fef..54d6584 100644 +--- a/zbar/processor.h ++++ b/zbar/processor.h +@@ -27,7 +27,9 @@ + #ifdef HAVE_INTTYPES_H + # include + #endif +-#include ++#ifndef WIN32 ++# include ++#endif + #include + #include + +diff --git a/zbar/thread.h b/zbar/thread.h +index 96d6415..252d3f2 100644 +--- a/zbar/thread.h ++++ b/zbar/thread.h +@@ -35,7 +35,7 @@ + # define HAVE_THREADS + # define ZTHREAD DWORD WINAPI + +-typedef ZTHREAD (zbar_thread_proc_t)(void*); ++typedef ZTHREAD zbar_thread_proc_t(void*); + + typedef DWORD zbar_thread_id_t; + diff --git a/ports/mchehab-zbar/x64.patch b/ports/mchehab-zbar/x64.patch new file mode 100644 index 00000000000000..c8eefac8edf2c0 --- /dev/null +++ b/ports/mchehab-zbar/x64.patch @@ -0,0 +1,21 @@ +diff --git a/zbar/decoder.c b/zbar/decoder.c +index 7f7336f..e9ffc45 100644 +--- a/zbar/decoder.c ++++ b/zbar/decoder.c +@@ -25,6 +25,7 @@ + #include /* malloc, calloc, free */ + #include /* snprintf */ + #include /* memset, strlen */ ++#include /* offsetof */ + + #include + +@@ -113,7 +114,7 @@ void zbar_decoder_destroy (zbar_decoder_t *dcode) + + void zbar_decoder_reset (zbar_decoder_t *dcode) + { +- memset(dcode, 0, (long)&dcode->buf_alloc - (long)dcode); ++ memset(dcode, 0, offsetof(zbar_decoder_t, buf_alloc)); + #if ENABLE_EAN == 1 + ean_reset(&dcode->ean); + #endif diff --git a/scripts/buildsystems/make_wrapper/windres-rc b/scripts/buildsystems/make_wrapper/windres-rc index b695744fcca7ba..9d20158f1f416d 100755 --- a/scripts/buildsystems/make_wrapper/windres-rc +++ b/scripts/buildsystems/make_wrapper/windres-rc @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for windres to rc which do not understand '-i -o --output-format'. # cvtres is invoked by the linker -scriptversion=2021-04-02.18; # UTC +scriptversion=2022-08-24.12; # UTC nl=' @@ -59,67 +59,61 @@ func_file_conv () func_windres_wrapper () { # Assume a capable shell + bin= in= out= for arg do - if test -n "$eat"; then + if test -z "$bin"; then + bin=$1 + elif test -n "$eat"; then eat= else case $1 in + --output-format=*) + ;; --define*) - eat=1 - set x "$@" "-d $2" - shift - ;; + eat=1 + set -- "$@" "-d $2" + ;; --include-dir*) - eat=1 - func_file_conv "$2" - set x "$@" "-I $file" - shift - ;; + eat=1 + func_file_conv "$2" + set -- "$@" "-I $file" + ;; -o) eat=1 func_file_conv "$2" out="$file" echo "OUTPUT:$file" - set x "$@" - shift ;; *.obj) func_file_conv "$1" out="$file" echo "OUTPUT:$file" - set x "$@" - shift - ;; - --output-format=*) - set x "$@" - shift ;; -i) eat=1 func_file_conv "$2" mingw in="$file" echo "INPUT:$file" - set x "$@" - shift ;; -*) - set x "$@" "${1//\\\"/\"}" - shift + set -- "$@" "${1//\\\"/\"}" ;; *) - set x "$@" "$1" - shift + # libtool reorders arguments; save unqualified one as input + func_file_conv "$1" + in="$file" + echo "INPUT:$file" ;; esac fi shift done - echo "$@" -fo "$out" "$in" - exec "$@" -fo "$out" "$in" + echo "$bin" "$@" -fo "$out" "$in" + exec "$bin" "$@" -fo "$out" "$in" exit 1 } diff --git a/versions/baseline.json b/versions/baseline.json index 37655799270961..8904762f74c94b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4552,6 +4552,10 @@ "baseline": "2.28.1", "port-version": 0 }, + "mchehab-zbar": { + "baseline": "0.23.90", + "port-version": 0 + }, "mcpp": { "baseline": "2.7.2.14", "port-version": 3 diff --git a/versions/m-/mchehab-zbar.json b/versions/m-/mchehab-zbar.json new file mode 100644 index 00000000000000..8b4e71c46cbdcb --- /dev/null +++ b/versions/m-/mchehab-zbar.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7c066057a5c24bbea65e26e9e7519db938a2932e", + "version": "0.23.90", + "port-version": 0 + } + ] +} From 3af5e2108385beb9831abe0cc215d765f7ddc8a5 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Fri, 26 Aug 2022 01:38:49 +0800 Subject: [PATCH 470/791] fix usage (#26509) --- ports/mpfr/portfile.cmake | 1 + ports/mpfr/usage | 6 ++++++ ports/mpfr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mpfr.json | 5 +++++ 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 ports/mpfr/usage diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake index 7ab383aa654ffa..2b79603080d91e 100644 --- a/ports/mpfr/portfile.cmake +++ b/ports/mpfr/portfile.cmake @@ -40,4 +40,5 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/TODO" ) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING" "${SOURCE_PATH}/COPYING.LESSER") diff --git a/ports/mpfr/usage b/ports/mpfr/usage new file mode 100644 index 00000000000000..0219b24b7249e8 --- /dev/null +++ b/ports/mpfr/usage @@ -0,0 +1,6 @@ +The package mpfr can be imported via CMake FindPkgConfig module: + + find_package(PkgConfig) + pkg_check_modules(mpfr REQUIRED IMPORTED_TARGET mpfr) + + target_link_libraries(main PRIVATE PkgConfig::mpfr) diff --git a/ports/mpfr/vcpkg.json b/ports/mpfr/vcpkg.json index 09f4f2cfd022bc..ec64b8c273016b 100644 --- a/ports/mpfr/vcpkg.json +++ b/ports/mpfr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mpfr", "version": "4.1.0", - "port-version": 5, + "port-version": 6, "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", "homepage": "https://www.mpfr.org", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 8904762f74c94b..28a5223cf91b28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4758,7 +4758,7 @@ }, "mpfr": { "baseline": "4.1.0", - "port-version": 5 + "port-version": 6 }, "mpg123": { "baseline": "1.29.3", diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index 2c3c62260e6854..4336a2c574873b 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d41295a2963c8db8171724b2456dfaa2ec1a866", + "version": "4.1.0", + "port-version": 6 + }, { "git-tree": "39b251ed109ce7a5787fe0e7235f9fe0ce436a09", "version": "4.1.0", From b8b8efa56d7ae07b4eab00c6dd20f0bbd3483405 Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Thu, 25 Aug 2022 10:42:47 -0700 Subject: [PATCH 471/791] [libtcod] Update to 1.22.1 (#26504) * Update to 1.22.0. * Add png and zlib features, enabled by default. Adds missing default features. * Update to 1.22.1. * Update versions/l-/libtcod.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/libtcod/portfile.cmake | 6 ++++-- ports/libtcod/vcpkg.json | 21 ++++++++++++++++++--- versions/baseline.json | 2 +- versions/l-/libtcod.json | 5 +++++ 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index fd17041cfa6578..0fb9abcfd9a7bc 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,16 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.21.0 - SHA512 1d18a49b0d66337e2b29ad6b9a4a412cc4d2fd723d9a3d3c983ff3ef2f5bee4422ea3469513e0fe3b2f885773fb5d70e17128bc473b952ab6e0de27f687c905e + REF 1.22.1 + SHA512 75fd804f4c970da6ffc084c896ab5e6d76527bf4e20d471ee50ac4e186e94e5a8dc8b68757f9bb46667147e2d3b2925f111749d3c865f3e82765b9de88d21e90 HEAD_REF main ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES + "png" CMAKE_DISABLE_FIND_PACKAGE_lodepng-c "sdl" CMAKE_DISABLE_FIND_PACKAGE_SDL2 "sdl" CMAKE_DISABLE_FIND_PACKAGE_GLAD "threads" CMAKE_DISABLE_FIND_PACKAGE_Threads + "zlib" CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) vcpkg_cmake_configure( diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index b6cd1e7ad02519..32bf8c8be0a03d 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,13 +1,12 @@ { "name": "libtcod", - "version": "1.21.0", + "version": "1.22.1", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", "documentation": "https://libtcod.readthedocs.io/en/latest/", "license": "BSD-3-Clause", "dependencies": [ - "lodepng", "stb", "utf8proc", { @@ -17,10 +16,20 @@ { "name": "vcpkg-cmake-config", "host": true - }, + } + ], + "default-features": [ + "png", + "sdl", "zlib" ], "features": { + "png": { + "description": "Support for reading and writing PNG files. Required to save screenshots and to load tilesets from files.", + "dependencies": [ + "lodepng" + ] + }, "sdl": { "description": "Support for SDL2 windows and events including OpenGL support and the libtcod context.", "dependencies": [ @@ -30,6 +39,12 @@ }, "threads": { "description": "Support for deprecated threading functions. If in doubt then leave this disabled." + }, + "zlib": { + "description": "Support for REXPaint files and TCODZip archives.", + "dependencies": [ + "zlib" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 28a5223cf91b28..1ad838b4167e6c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4161,7 +4161,7 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.21.0", + "baseline": "1.22.1", "port-version": 0 }, "libtess2": { diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index d25e566a5e3cd4..54060046406ea9 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08ac6efab8aa18d3c8e4bde44914495640e451a9", + "version": "1.22.1", + "port-version": 0 + }, { "git-tree": "598c5c5eb9ba1628257089e6397b7bbdd6723ee0", "version": "1.21.0", From 23e74ca2c2a31fa6147a32813613159aef31b908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Thu, 25 Aug 2022 19:44:12 +0200 Subject: [PATCH 472/791] [Turbobase64] Adopt maintainer guidelines (#26498) * [turbobase64] Fix maintainer guideline violations * [turbobase64] Update version database --- ports/turbobase64/CMakeLists.txt | 32 ++++++++++++++------------------ ports/turbobase64/portfile.cmake | 15 ++++++++------- ports/turbobase64/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 2 +- versions/t-/turbobase64.json | 5 +++++ 5 files changed, 41 insertions(+), 28 deletions(-) diff --git a/ports/turbobase64/CMakeLists.txt b/ports/turbobase64/CMakeLists.txt index c4fcebc4709a4a..c62f679e7e333a 100644 --- a/ports/turbobase64/CMakeLists.txt +++ b/ports/turbobase64/CMakeLists.txt @@ -34,37 +34,33 @@ else () endif () if (ARCH_AMD64) - add_library(base64 + add_library(tb64 $ $ $ $) else () - add_library(base64 + add_library(tb64 $ $) endif () # End of Yandex code -target_include_directories(base64 SYSTEM PUBLIC $) -set_target_properties(base64 PROPERTIES PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/turbob64.h") +include(CMakePackageConfigHelpers) +include(GNUInstallDirs) -install(TARGETS base64 - EXPORT base64Config - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib" - PUBLIC_HEADER DESTINATION "include" - COMPONENT dev +target_include_directories(tb64 PUBLIC + $ + $ ) -export(TARGETS base64 - NAMESPACE TURBO:: - FILE "share/base64/base64Config.cmake" - ) +install(TARGETS tb64 + EXPORT unofficial-turbobase64-config + ) +install(FILES "${CMAKE_SOURCE_DIR}/turbob64.h" TYPE INCLUDE) -install(EXPORT base64Config - DESTINATION "share/base64" - NAMESPACE TURBO:: +install(EXPORT unofficial-turbobase64-config + DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-turbobase64" + NAMESPACE unofficial::turbobase64:: ) \ No newline at end of file diff --git a/ports/turbobase64/portfile.cmake b/ports/turbobase64/portfile.cmake index e4db2c00b66a3d..ddd4266b10b86a 100644 --- a/ports/turbobase64/portfile.cmake +++ b/ports/turbobase64/portfile.cmake @@ -6,14 +6,15 @@ vcpkg_from_github( HEAD_REF master ) -configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/turbobase64/vcpkg.json b/ports/turbobase64/vcpkg.json index b0e93558d77ab2..41ac724e67128a 100644 --- a/ports/turbobase64/vcpkg.json +++ b/ports/turbobase64/vcpkg.json @@ -1,8 +1,19 @@ { "name": "turbobase64", "version-date": "2020-01-12", - "port-version": 2, + "port-version": 3, "description": "Fastest Base64 SIMD/Neon library", "homepage": "https://github.com/powturbo/Turbo-Base64", - "supports": "!windows" + "license": "GPL-3.0-only", + "supports": "!windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1ad838b4167e6c..43b6254ff674f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7330,7 +7330,7 @@ }, "turbobase64": { "baseline": "2020-01-12", - "port-version": 2 + "port-version": 3 }, "tvision": { "baseline": "2021-08-10", diff --git a/versions/t-/turbobase64.json b/versions/t-/turbobase64.json index 761a503da0e7d8..e0f08c21c34a7e 100644 --- a/versions/t-/turbobase64.json +++ b/versions/t-/turbobase64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20d23821ef39944689c9ec0e8cf02d17c7b68901", + "version-date": "2020-01-12", + "port-version": 3 + }, { "git-tree": "1077b7996d7d22e798b337bc29177a566ec64e4b", "version-date": "2020-01-12", From 8424da584e59e05956913bf96f87654aa3096c7e Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Thu, 25 Aug 2022 20:46:01 +0300 Subject: [PATCH 473/791] [boost] update to 1.80.0 (#26233) * [scripts/boost] modify script to use v1.80.0.beta1 * [boost] generate ports * add versions * [boost-build] remove obsolete patches * update version * [boost-json] remove obsolete patch * [scripts/boost] modify script to use v1.80.0 * [boost] generate ports v1.80.0 * [boost] generate ports v1.80.0 * [boost-locale] update patch * update versions * [scripts/boost] fix script and regenerate Boost ports * update versions * update version Co-authored-by: Yury Bura --- ports/boost-accumulators/portfile.cmake | 4 +- ports/boost-accumulators/vcpkg.json | 2 +- ports/boost-algorithm/portfile.cmake | 4 +- ports/boost-algorithm/vcpkg.json | 2 +- ports/boost-align/portfile.cmake | 4 +- ports/boost-align/vcpkg.json | 2 +- ports/boost-any/portfile.cmake | 4 +- ports/boost-any/vcpkg.json | 2 +- ports/boost-array/portfile.cmake | 4 +- ports/boost-array/vcpkg.json | 2 +- ports/boost-asio/portfile.cmake | 4 +- ports/boost-asio/vcpkg.json | 7 +- ports/boost-assert/portfile.cmake | 4 +- ports/boost-assert/vcpkg.json | 2 +- ports/boost-assign/portfile.cmake | 4 +- ports/boost-assign/vcpkg.json | 3 +- ports/boost-atomic/portfile.cmake | 4 +- ports/boost-atomic/vcpkg.json | 2 +- ports/boost-beast/portfile.cmake | 4 +- ports/boost-beast/vcpkg.json | 2 +- ports/boost-bimap/portfile.cmake | 4 +- ports/boost-bimap/vcpkg.json | 2 +- ports/boost-bind/portfile.cmake | 4 +- ports/boost-bind/vcpkg.json | 2 +- .../0001-don-t-skip-install-targets.patch | 75 ----- ...update-architecture-feature.jam-file.patch | 45 --- ports/boost-build/portfile.cmake | 6 +- ports/boost-build/vcpkg.json | 3 +- ports/boost-callable-traits/portfile.cmake | 4 +- ports/boost-callable-traits/vcpkg.json | 2 +- ports/boost-chrono/portfile.cmake | 4 +- ports/boost-chrono/vcpkg.json | 2 +- ports/boost-circular-buffer/portfile.cmake | 4 +- ports/boost-circular-buffer/vcpkg.json | 2 +- ports/boost-compatibility/portfile.cmake | 4 +- ports/boost-compatibility/vcpkg.json | 2 +- ports/boost-compute/portfile.cmake | 4 +- ports/boost-compute/vcpkg.json | 2 +- ports/boost-concept-check/portfile.cmake | 4 +- ports/boost-concept-check/vcpkg.json | 2 +- ports/boost-config/portfile.cmake | 4 +- ports/boost-config/vcpkg.json | 2 +- ports/boost-container-hash/portfile.cmake | 4 +- ports/boost-container-hash/vcpkg.json | 2 +- ports/boost-container/portfile.cmake | 4 +- ports/boost-container/vcpkg.json | 2 +- ports/boost-context/portfile.cmake | 4 +- ports/boost-context/vcpkg.json | 3 +- ports/boost-contract/portfile.cmake | 4 +- ports/boost-contract/vcpkg.json | 2 +- ports/boost-conversion/portfile.cmake | 4 +- ports/boost-conversion/vcpkg.json | 2 +- ports/boost-convert/portfile.cmake | 4 +- ports/boost-convert/vcpkg.json | 2 +- ports/boost-core/portfile.cmake | 4 +- ports/boost-core/vcpkg.json | 2 +- ports/boost-coroutine/portfile.cmake | 4 +- ports/boost-coroutine/vcpkg.json | 2 +- ports/boost-coroutine2/portfile.cmake | 4 +- ports/boost-coroutine2/vcpkg.json | 2 +- ports/boost-crc/portfile.cmake | 4 +- ports/boost-crc/vcpkg.json | 2 +- ports/boost-date-time/portfile.cmake | 4 +- ports/boost-date-time/vcpkg.json | 2 +- ports/boost-describe/portfile.cmake | 4 +- ports/boost-describe/vcpkg.json | 2 +- ports/boost-detail/portfile.cmake | 4 +- ports/boost-detail/vcpkg.json | 2 +- ports/boost-dll/portfile.cmake | 4 +- ports/boost-dll/vcpkg.json | 2 +- ports/boost-dynamic-bitset/portfile.cmake | 4 +- ports/boost-dynamic-bitset/vcpkg.json | 2 +- ports/boost-endian/portfile.cmake | 4 +- ports/boost-endian/vcpkg.json | 2 +- ports/boost-exception/portfile.cmake | 4 +- ports/boost-exception/vcpkg.json | 2 +- ports/boost-fiber/portfile.cmake | 4 +- ports/boost-fiber/vcpkg.json | 2 +- ports/boost-filesystem/portfile.cmake | 4 +- ports/boost-filesystem/vcpkg.json | 2 +- ports/boost-flyweight/portfile.cmake | 4 +- ports/boost-flyweight/vcpkg.json | 2 +- ports/boost-foreach/portfile.cmake | 4 +- ports/boost-foreach/vcpkg.json | 2 +- ports/boost-format/portfile.cmake | 4 +- ports/boost-format/vcpkg.json | 2 +- ports/boost-function-types/portfile.cmake | 4 +- ports/boost-function-types/vcpkg.json | 2 +- ports/boost-function/portfile.cmake | 4 +- ports/boost-function/vcpkg.json | 2 +- ports/boost-functional/portfile.cmake | 4 +- ports/boost-functional/vcpkg.json | 2 +- ports/boost-fusion/portfile.cmake | 4 +- ports/boost-fusion/vcpkg.json | 2 +- ports/boost-geometry/portfile.cmake | 4 +- ports/boost-geometry/vcpkg.json | 2 +- ports/boost-gil/portfile.cmake | 4 +- ports/boost-gil/vcpkg.json | 5 +- ports/boost-graph-parallel/portfile.cmake | 4 +- ports/boost-graph-parallel/vcpkg.json | 2 +- ports/boost-graph/portfile.cmake | 4 +- ports/boost-graph/vcpkg.json | 2 +- ports/boost-hana/portfile.cmake | 4 +- ports/boost-hana/vcpkg.json | 2 +- ports/boost-heap/portfile.cmake | 4 +- ports/boost-heap/vcpkg.json | 2 +- ports/boost-histogram/portfile.cmake | 4 +- ports/boost-histogram/vcpkg.json | 2 +- ports/boost-hof/portfile.cmake | 4 +- ports/boost-hof/vcpkg.json | 2 +- ports/boost-icl/portfile.cmake | 4 +- ports/boost-icl/vcpkg.json | 2 +- ports/boost-integer/portfile.cmake | 4 +- ports/boost-integer/vcpkg.json | 2 +- ports/boost-interprocess/portfile.cmake | 4 +- ports/boost-interprocess/vcpkg.json | 2 +- ports/boost-interval/portfile.cmake | 4 +- ports/boost-interval/vcpkg.json | 2 +- ports/boost-intrusive/portfile.cmake | 4 +- ports/boost-intrusive/vcpkg.json | 2 +- ports/boost-io/portfile.cmake | 4 +- ports/boost-io/vcpkg.json | 2 +- ports/boost-iostreams/portfile.cmake | 4 +- ports/boost-iostreams/vcpkg.json | 2 +- ports/boost-iterator/portfile.cmake | 4 +- ports/boost-iterator/vcpkg.json | 2 +- .../0001-json-array-erase-relocate.patch | 20 -- ports/boost-json/portfile.cmake | 5 +- ports/boost-json/vcpkg.json | 3 +- ports/boost-lambda/portfile.cmake | 4 +- ports/boost-lambda/vcpkg.json | 2 +- ports/boost-lambda2/portfile.cmake | 4 +- ports/boost-lambda2/vcpkg.json | 2 +- ports/boost-leaf/portfile.cmake | 4 +- ports/boost-leaf/vcpkg.json | 2 +- ports/boost-lexical-cast/portfile.cmake | 4 +- ports/boost-lexical-cast/vcpkg.json | 2 +- ports/boost-local-function/portfile.cmake | 4 +- ports/boost-local-function/vcpkg.json | 2 +- .../allow-force-finding-iconv.patch | 24 -- ...U-support.patch => fix-dependencies.patch} | 73 +++-- ports/boost-locale/portfile.cmake | 8 +- ports/boost-locale/vcpkg.json | 4 +- ports/boost-lockfree/portfile.cmake | 4 +- ports/boost-lockfree/vcpkg.json | 2 +- ports/boost-log/portfile.cmake | 4 +- ports/boost-log/vcpkg.json | 2 +- ports/boost-logic/portfile.cmake | 4 +- ports/boost-logic/vcpkg.json | 2 +- ports/boost-math/portfile.cmake | 4 +- ports/boost-math/vcpkg.json | 2 +- ports/boost-metaparse/portfile.cmake | 4 +- ports/boost-metaparse/vcpkg.json | 2 +- .../boost-modular-build.cmake | 2 +- ports/boost-modular-build-helper/vcpkg.json | 3 +- ports/boost-move/portfile.cmake | 4 +- ports/boost-move/vcpkg.json | 2 +- ports/boost-mp11/portfile.cmake | 4 +- ports/boost-mp11/vcpkg.json | 2 +- ports/boost-mpi/portfile.cmake | 4 +- ports/boost-mpi/vcpkg.json | 2 +- ports/boost-mpl/portfile.cmake | 4 +- ports/boost-mpl/vcpkg.json | 2 +- ports/boost-msm/portfile.cmake | 4 +- ports/boost-msm/vcpkg.json | 2 +- ports/boost-multi-array/portfile.cmake | 4 +- ports/boost-multi-array/vcpkg.json | 2 +- ports/boost-multi-index/portfile.cmake | 4 +- ports/boost-multi-index/vcpkg.json | 2 +- ports/boost-multiprecision/portfile.cmake | 4 +- ports/boost-multiprecision/vcpkg.json | 2 +- ports/boost-nowide/portfile.cmake | 4 +- ports/boost-nowide/vcpkg.json | 2 +- ports/boost-numeric-conversion/portfile.cmake | 4 +- ports/boost-numeric-conversion/vcpkg.json | 2 +- ports/boost-odeint/portfile.cmake | 4 +- ports/boost-odeint/vcpkg.json | 2 +- ports/boost-optional/portfile.cmake | 4 +- ports/boost-optional/vcpkg.json | 2 +- ports/boost-outcome/portfile.cmake | 4 +- ports/boost-outcome/vcpkg.json | 2 +- ports/boost-parameter-python/portfile.cmake | 4 +- ports/boost-parameter-python/vcpkg.json | 2 +- ports/boost-parameter/portfile.cmake | 4 +- ports/boost-parameter/vcpkg.json | 2 +- ports/boost-pfr/portfile.cmake | 4 +- ports/boost-pfr/vcpkg.json | 2 +- ports/boost-phoenix/portfile.cmake | 4 +- ports/boost-phoenix/vcpkg.json | 2 +- ports/boost-poly-collection/portfile.cmake | 4 +- ports/boost-poly-collection/vcpkg.json | 2 +- ports/boost-polygon/portfile.cmake | 4 +- ports/boost-polygon/vcpkg.json | 2 +- ports/boost-pool/portfile.cmake | 4 +- ports/boost-pool/vcpkg.json | 2 +- ports/boost-predef/portfile.cmake | 4 +- ports/boost-predef/vcpkg.json | 2 +- ports/boost-preprocessor/portfile.cmake | 4 +- ports/boost-preprocessor/vcpkg.json | 2 +- ports/boost-process/portfile.cmake | 4 +- ports/boost-process/vcpkg.json | 5 +- ports/boost-program-options/portfile.cmake | 4 +- ports/boost-program-options/vcpkg.json | 2 +- .../portfile.cmake | 4 +- ports/boost-property-map-parallel/vcpkg.json | 2 +- ports/boost-property-map/portfile.cmake | 4 +- ports/boost-property-map/vcpkg.json | 3 +- ports/boost-property-tree/portfile.cmake | 4 +- ports/boost-property-tree/vcpkg.json | 2 +- ports/boost-proto/portfile.cmake | 4 +- ports/boost-proto/vcpkg.json | 2 +- ports/boost-ptr-container/portfile.cmake | 4 +- ports/boost-ptr-container/vcpkg.json | 2 +- ports/boost-python/portfile.cmake | 4 +- ports/boost-python/vcpkg.json | 2 +- ports/boost-qvm/portfile.cmake | 4 +- ports/boost-qvm/vcpkg.json | 2 +- ports/boost-random/portfile.cmake | 4 +- ports/boost-random/vcpkg.json | 2 +- ports/boost-range/portfile.cmake | 4 +- ports/boost-range/vcpkg.json | 2 +- ports/boost-ratio/portfile.cmake | 4 +- ports/boost-ratio/vcpkg.json | 2 +- ports/boost-rational/portfile.cmake | 4 +- ports/boost-rational/vcpkg.json | 2 +- ports/boost-regex/portfile.cmake | 4 +- ports/boost-regex/vcpkg.json | 3 +- ports/boost-safe-numerics/portfile.cmake | 4 +- ports/boost-safe-numerics/vcpkg.json | 2 +- ports/boost-scope-exit/portfile.cmake | 4 +- ports/boost-scope-exit/vcpkg.json | 2 +- ports/boost-serialization/portfile.cmake | 4 +- ports/boost-serialization/vcpkg.json | 2 +- ports/boost-signals2/portfile.cmake | 4 +- ports/boost-signals2/vcpkg.json | 2 +- ports/boost-smart-ptr/portfile.cmake | 4 +- ports/boost-smart-ptr/vcpkg.json | 2 +- ports/boost-sort/portfile.cmake | 4 +- ports/boost-sort/vcpkg.json | 2 +- ports/boost-spirit/portfile.cmake | 4 +- ports/boost-spirit/vcpkg.json | 2 +- ports/boost-stacktrace/portfile.cmake | 4 +- ports/boost-stacktrace/vcpkg.json | 2 +- ports/boost-statechart/portfile.cmake | 4 +- ports/boost-statechart/vcpkg.json | 2 +- ports/boost-static-assert/portfile.cmake | 4 +- ports/boost-static-assert/vcpkg.json | 2 +- ports/boost-static-string/portfile.cmake | 4 +- ports/boost-static-string/vcpkg.json | 2 +- ports/boost-stl-interfaces/portfile.cmake | 4 +- ports/boost-stl-interfaces/vcpkg.json | 3 +- ports/boost-system/portfile.cmake | 4 +- ports/boost-system/vcpkg.json | 2 +- ports/boost-test/portfile.cmake | 4 +- ports/boost-test/vcpkg.json | 2 +- ports/boost-thread/portfile.cmake | 4 +- ports/boost-thread/vcpkg.json | 2 +- ports/boost-throw-exception/portfile.cmake | 4 +- ports/boost-throw-exception/vcpkg.json | 2 +- ports/boost-timer/portfile.cmake | 4 +- ports/boost-timer/vcpkg.json | 2 +- ports/boost-tokenizer/portfile.cmake | 4 +- ports/boost-tokenizer/vcpkg.json | 3 +- ports/boost-tti/portfile.cmake | 4 +- ports/boost-tti/vcpkg.json | 2 +- ports/boost-tuple/portfile.cmake | 4 +- ports/boost-tuple/vcpkg.json | 2 +- ports/boost-type-erasure/portfile.cmake | 4 +- ports/boost-type-erasure/vcpkg.json | 2 +- ports/boost-type-index/portfile.cmake | 4 +- ports/boost-type-index/vcpkg.json | 2 +- ports/boost-type-traits/portfile.cmake | 4 +- ports/boost-type-traits/vcpkg.json | 2 +- ports/boost-typeof/portfile.cmake | 4 +- ports/boost-typeof/vcpkg.json | 2 +- ports/boost-ublas/portfile.cmake | 4 +- ports/boost-ublas/vcpkg.json | 2 +- ports/boost-uninstall/vcpkg.json | 2 +- ports/boost-units/portfile.cmake | 4 +- ports/boost-units/vcpkg.json | 2 +- ports/boost-unordered/portfile.cmake | 4 +- ports/boost-unordered/vcpkg.json | 4 +- ports/boost-utility/portfile.cmake | 4 +- ports/boost-utility/vcpkg.json | 3 +- ports/boost-uuid/portfile.cmake | 4 +- ports/boost-uuid/vcpkg.json | 2 +- ports/boost-variant/portfile.cmake | 4 +- ports/boost-variant/vcpkg.json | 2 +- ports/boost-variant2/portfile.cmake | 4 +- ports/boost-variant2/vcpkg.json | 2 +- ports/boost-vcpkg-helpers/portfile.cmake | 2 +- ports/boost-vcpkg-helpers/vcpkg.json | 2 +- ports/boost-vmd/portfile.cmake | 4 +- ports/boost-vmd/vcpkg.json | 2 +- ports/boost-wave/portfile.cmake | 4 +- ports/boost-wave/vcpkg.json | 2 +- ports/boost-winapi/portfile.cmake | 4 +- ports/boost-winapi/vcpkg.json | 2 +- ports/boost-xpressive/portfile.cmake | 4 +- ports/boost-xpressive/vcpkg.json | 2 +- ports/boost-yap/portfile.cmake | 4 +- ports/boost-yap/vcpkg.json | 2 +- ports/boost/vcpkg.json | 2 +- scripts/boost/generate-ports.ps1 | 14 +- versions/b-/boost-accumulators.json | 5 + versions/b-/boost-algorithm.json | 5 + versions/b-/boost-align.json | 5 + versions/b-/boost-any.json | 5 + versions/b-/boost-array.json | 5 + versions/b-/boost-asio.json | 5 + versions/b-/boost-assert.json | 5 + versions/b-/boost-assign.json | 5 + versions/b-/boost-atomic.json | 5 + versions/b-/boost-beast.json | 5 + versions/b-/boost-bimap.json | 5 + versions/b-/boost-bind.json | 5 + versions/b-/boost-build.json | 5 + versions/b-/boost-callable-traits.json | 5 + versions/b-/boost-chrono.json | 5 + versions/b-/boost-circular-buffer.json | 5 + versions/b-/boost-compatibility.json | 5 + versions/b-/boost-compute.json | 5 + versions/b-/boost-concept-check.json | 5 + versions/b-/boost-config.json | 5 + versions/b-/boost-container-hash.json | 5 + versions/b-/boost-container.json | 5 + versions/b-/boost-context.json | 5 + versions/b-/boost-contract.json | 5 + versions/b-/boost-conversion.json | 5 + versions/b-/boost-convert.json | 5 + versions/b-/boost-core.json | 5 + versions/b-/boost-coroutine.json | 5 + versions/b-/boost-coroutine2.json | 5 + versions/b-/boost-crc.json | 5 + versions/b-/boost-date-time.json | 5 + versions/b-/boost-describe.json | 5 + versions/b-/boost-detail.json | 5 + versions/b-/boost-dll.json | 5 + versions/b-/boost-dynamic-bitset.json | 5 + versions/b-/boost-endian.json | 5 + versions/b-/boost-exception.json | 5 + versions/b-/boost-fiber.json | 5 + versions/b-/boost-filesystem.json | 5 + versions/b-/boost-flyweight.json | 5 + versions/b-/boost-foreach.json | 5 + versions/b-/boost-format.json | 5 + versions/b-/boost-function-types.json | 5 + versions/b-/boost-function.json | 5 + versions/b-/boost-functional.json | 5 + versions/b-/boost-fusion.json | 5 + versions/b-/boost-geometry.json | 5 + versions/b-/boost-gil.json | 5 + versions/b-/boost-graph-parallel.json | 5 + versions/b-/boost-graph.json | 5 + versions/b-/boost-hana.json | 5 + versions/b-/boost-heap.json | 5 + versions/b-/boost-histogram.json | 5 + versions/b-/boost-hof.json | 5 + versions/b-/boost-icl.json | 5 + versions/b-/boost-integer.json | 5 + versions/b-/boost-interprocess.json | 5 + versions/b-/boost-interval.json | 5 + versions/b-/boost-intrusive.json | 5 + versions/b-/boost-io.json | 5 + versions/b-/boost-iostreams.json | 5 + versions/b-/boost-iterator.json | 5 + versions/b-/boost-json.json | 5 + versions/b-/boost-lambda.json | 5 + versions/b-/boost-lambda2.json | 5 + versions/b-/boost-leaf.json | 5 + versions/b-/boost-lexical-cast.json | 5 + versions/b-/boost-local-function.json | 5 + versions/b-/boost-locale.json | 5 + versions/b-/boost-lockfree.json | 5 + versions/b-/boost-log.json | 5 + versions/b-/boost-logic.json | 5 + versions/b-/boost-math.json | 5 + versions/b-/boost-metaparse.json | 5 + versions/b-/boost-modular-build-helper.json | 5 + versions/b-/boost-move.json | 5 + versions/b-/boost-mp11.json | 5 + versions/b-/boost-mpi.json | 5 + versions/b-/boost-mpl.json | 5 + versions/b-/boost-msm.json | 5 + versions/b-/boost-multi-array.json | 5 + versions/b-/boost-multi-index.json | 5 + versions/b-/boost-multiprecision.json | 5 + versions/b-/boost-nowide.json | 5 + versions/b-/boost-numeric-conversion.json | 5 + versions/b-/boost-odeint.json | 5 + versions/b-/boost-optional.json | 5 + versions/b-/boost-outcome.json | 5 + versions/b-/boost-parameter-python.json | 5 + versions/b-/boost-parameter.json | 5 + versions/b-/boost-pfr.json | 5 + versions/b-/boost-phoenix.json | 5 + versions/b-/boost-poly-collection.json | 5 + versions/b-/boost-polygon.json | 5 + versions/b-/boost-pool.json | 5 + versions/b-/boost-predef.json | 5 + versions/b-/boost-preprocessor.json | 5 + versions/b-/boost-process.json | 5 + versions/b-/boost-program-options.json | 5 + versions/b-/boost-property-map-parallel.json | 5 + versions/b-/boost-property-map.json | 5 + versions/b-/boost-property-tree.json | 5 + versions/b-/boost-proto.json | 5 + versions/b-/boost-ptr-container.json | 5 + versions/b-/boost-python.json | 5 + versions/b-/boost-qvm.json | 5 + versions/b-/boost-random.json | 5 + versions/b-/boost-range.json | 5 + versions/b-/boost-ratio.json | 5 + versions/b-/boost-rational.json | 5 + versions/b-/boost-regex.json | 5 + versions/b-/boost-safe-numerics.json | 5 + versions/b-/boost-scope-exit.json | 5 + versions/b-/boost-serialization.json | 5 + versions/b-/boost-signals2.json | 5 + versions/b-/boost-smart-ptr.json | 5 + versions/b-/boost-sort.json | 5 + versions/b-/boost-spirit.json | 5 + versions/b-/boost-stacktrace.json | 5 + versions/b-/boost-statechart.json | 5 + versions/b-/boost-static-assert.json | 5 + versions/b-/boost-static-string.json | 5 + versions/b-/boost-stl-interfaces.json | 5 + versions/b-/boost-system.json | 5 + versions/b-/boost-test.json | 5 + versions/b-/boost-thread.json | 5 + versions/b-/boost-throw-exception.json | 5 + versions/b-/boost-timer.json | 5 + versions/b-/boost-tokenizer.json | 5 + versions/b-/boost-tti.json | 5 + versions/b-/boost-tuple.json | 5 + versions/b-/boost-type-erasure.json | 5 + versions/b-/boost-type-index.json | 5 + versions/b-/boost-type-traits.json | 5 + versions/b-/boost-typeof.json | 5 + versions/b-/boost-ublas.json | 5 + versions/b-/boost-uninstall.json | 5 + versions/b-/boost-units.json | 5 + versions/b-/boost-unordered.json | 5 + versions/b-/boost-utility.json | 5 + versions/b-/boost-uuid.json | 5 + versions/b-/boost-variant.json | 5 + versions/b-/boost-variant2.json | 5 + versions/b-/boost-vcpkg-helpers.json | 5 + versions/b-/boost-vmd.json | 5 + versions/b-/boost-wave.json | 5 + versions/b-/boost-winapi.json | 5 + versions/b-/boost-xpressive.json | 5 + versions/b-/boost-yap.json | 5 + versions/b-/boost.json | 5 + versions/baseline.json | 308 +++++++++--------- 455 files changed, 1416 insertions(+), 813 deletions(-) delete mode 100644 ports/boost-build/0001-don-t-skip-install-targets.patch delete mode 100644 ports/boost-build/0003-update-architecture-feature.jam-file.patch delete mode 100644 ports/boost-json/0001-json-array-erase-relocate.patch delete mode 100644 ports/boost-locale/allow-force-finding-iconv.patch rename ports/boost-locale/{0001-Fix-boost-ICU-support.patch => fix-dependencies.patch} (52%) diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index 8a666948b43c80..704e2c6cfe11d9 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.79.0 - SHA512 4f3531ac9a008a22cb252c7fd81fcfc10d93e9b643bdcdfe19bdc80a34cb2823eecbb09f83425485f3b31ba34c36910d2993b33acef8c5deb63a6572cbf124ee + REF boost-1.80.0 + SHA512 e3d129cf6f922f0d31e0c94f72d277758985eff9338bbc19470ea28d8f8d41202bea0f0e653acf449001da9db13bed576ff99beebda1d87ab92de7cf0ec68208 HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index f3eb83b523cc70..41f48977332b54 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-accumulators", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "license": "BSL-1.0", diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 735cd44755dc64..383dcc3633e289 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.79.0 - SHA512 457f894e538182990c066fed06ce4ae1749e742eb31677bb00a60faab0072a3fddfbc993c467695ef52b7e0d72f13ee2bc5bf5d10176c091c68a59676426624b + REF boost-1.80.0 + SHA512 4dd9e92b988b84bb18671a5742cd18e8b5a8eaee609f9fc510fb7285ce3dc43a1ceffa6ba37e2aa329bced6a24b34da85013acc7bacce848d992f667bfda07e0 HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index 4c645ab218172a..cbaac64ae83550 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-algorithm", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "license": "BSL-1.0", diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index 0fc01d0e38d705..37633f3a5ccd90 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.79.0 - SHA512 9249c21cea651ea193b93d816de63e79d9cc014f6fb5d8087c96a0c193d98381db8b0e78e757d294ff078160f41d80c56f87cb03f84aa1bad942bd173086c41b + REF boost-1.80.0 + SHA512 10c790d3ab48d4a46611c4c6bb75566c7e5695fb23e369ddd70e394df85c7f6aa5dc845ac6795a09ea1967eaad340f2209a2a370e60f7211aa395cb70ae05b67 HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index f840bc0af7ddd2..de930667ee8015 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-align", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "license": "BSL-1.0", diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index c51c3be87e5cba..530424e2b3435f 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.79.0 - SHA512 7085eacd189e8a1339e04c878cc20c2f45529d72048d992b0f9e8e35b7c002368f27ac54e495abcca0ecb998606db1a858df5ecb80b10301512da613b366876c + REF boost-1.80.0 + SHA512 f8dd40ef5b118f39b4cde16529dc10b12720b17370595a136a64fdf414ea3f974a33eb032c60a6235153595fb01469e9d5b3bb9fef5a73b5547acff0fda73db2 HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index 1e3b7b55cec7c9..77fcce1f27fa27 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-any", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "license": "BSL-1.0", diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index de8a95dfc98d4b..16f3a81724bd3d 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.79.0 - SHA512 924a5b99721bda3e3ee4912858b02a44e6b94671718e1657340715d9929b5cdfb0fa394bab8f49b8c2bf553c285bc91c4e083c816352878a2ea6c08e79a28e9b + REF boost-1.80.0 + SHA512 0a1f6297e11864defe3bee9993c186db7bf52f0b782a6e501a8c74061e51732df465c22335a1f01cdc3049c7ff72a426ac5f347a0335b6e793df0cc3a3afc171 HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index 4c95cd9a272990..21b0da151b1379 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-array", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "license": "BSL-1.0", diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 850ead9d50117f..d313b6e8dc956d 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.79.0 - SHA512 f4e84e4616ad9cc4fae1077e5d3de1ca4e93cf25c83b1fc4bf0130727b41cb3888516e212c89745831c33a9282cf6697742b716bc340c76939cd6335f035716f + REF boost-1.80.0 + SHA512 03f80833b124216165cc40b1787751c68b59e14f9b8499a57d968670ca1edae9e2f09e474931eea028ff485038f47b7e4c2cb8f4fd479fab2ad8a3c2b48b4f6c HEAD_REF master PATCHES windows_alloca_header.patch ) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 36be45fba3d155..764289f0f7a8e3 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-asio", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "license": "BSL-1.0", @@ -11,12 +11,17 @@ "boost-bind", "boost-chrono", "boost-config", + { + "name": "boost-context", + "platform": "!uwp & !emscripten" + }, "boost-core", { "name": "boost-coroutine", "platform": "!arm & !uwp & !emscripten" }, "boost-date-time", + "boost-exception", "boost-function", "boost-regex", "boost-smart-ptr", diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index c7f7ad244bb711..d568ecf0b5b076 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.79.0 - SHA512 fc7f97ca1d58fc5e7ef8ebe45239cdbec6b239afe7cb137aed629051a59c356d9bd82c2a9e0e6ce4c0e9b779cac8c68f1969910ca4b936ce15770083182e34d8 + REF boost-1.80.0 + SHA512 23bea8a04fa880aea4bb19ee1f8bcb27123997bec494c9826460ab9b1dc1b9918d2162157a2d2666cf605a739ea859bbf3998dc3485d75f47be50969a246f35e HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index 0ea351ed3f62c7..a55e9040698c68 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assert", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "license": "BSL-1.0", diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 48b30c19b221a1..6323586564bb6e 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.79.0 - SHA512 0db0b6f4a93f8bd6d86a4db6390b7edc7717a490323121418c120e2d2b20322b73a6c7d9b18a4d7df357c7d36e111b548e78c72d32888089b460956476b8360b + REF boost-1.80.0 + SHA512 219b253991d2260bde5a50fd7811856fa3348ce2f84c4a37e32338cd1ceee046b27a43c6ea5a2b3c539de94b51721a11bfeccbf8b1b7b16f5786fac3f118c833 HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index 70e6dfe5f968f2..603ca4db377170 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assign", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "license": "BSL-1.0", @@ -9,7 +9,6 @@ "boost-config", "boost-core", "boost-move", - "boost-mpl", "boost-preprocessor", "boost-ptr-container", "boost-range", diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index d365cd29715c92..a5530bee3e1564 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.79.0 - SHA512 0ac0c72b3455440ad93b3659ce3796916cf718ce4161d9391a397c8f687d2f73efe2a68bb134b178f4d004de769fc75ff75717802ca6c56968c28f46c50ce1eb + REF boost-1.80.0 + SHA512 c4fc4262deca9fbfbed4202c8965cbd7f569cbdbc4808abb8db102bbc2a742704757a2dd2f3cb750da3ac37774a590a1a7336f18f5f713ce6dfcf3f331b35a9c HEAD_REF master ) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 02b16d207563f3..61497f632f684f 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-atomic", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "license": "BSL-1.0", diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index 68308327ea1759..3fce0586050b6f 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.79.0 - SHA512 d3f17b37fd503d9e65f0490832302d14318898a6b598864143fbd5310f69ade026499efe6947c66fd7309770ec63bb0dad1688cf3f750910426a058d53127e10 + REF boost-1.80.0 + SHA512 b8ed78521a228e91346868fd1dd1d5d543b396e49895c889887a23065aac4253c4e7cb19b89712ee6a332f5ae73807fa75b82d57ddd2bd47b49ace5cb03cfa6e HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index bc2c62664dd5d9..2c72805935d162 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-beast", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "license": "BSL-1.0", diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 6ce6c2ec589a17..731bc17f6f835d 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.79.0 - SHA512 85e6c549433027a43f99e18d422be70055aa59e9548785c9ab1d166e49c21702b1d939070187c58b296ea20635a6ef6fa4d1040c9746eba96790f26200de7201 + REF boost-1.80.0 + SHA512 1017fa1c290edbe5e7064c4d62626aa637b39755ba00d28bca9028283c740c28613fd6735158d39c30aa309251986ea0a0a0a7db9bd2c1cb7cbd46c96e2b857e HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index 67fe38b38af6ee..2f26c64ae40719 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bimap", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "license": "BSL-1.0", diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 0df740c4a641af..0153fbcc312db6 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.79.0 - SHA512 30ebcb26d0a719df2bfd23e25e86c15e8080219f6398c71c1d6cf230f1a10cccb0aee4d84e2bc116039c6597620ddae9bc5d7a40f0f5802644eff074e0c8e7af + REF boost-1.80.0 + SHA512 a16828b6750c6e929fea313ac724c295401115cfb1750c22663f0da8e0a046cb19f97ba6f4047abcade7e21da890cfb995b733656adb2fafa62226f4a925449d HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index 55fd5cd5115f81..8e9bc6fdd416b1 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bind", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "license": "BSL-1.0", diff --git a/ports/boost-build/0001-don-t-skip-install-targets.patch b/ports/boost-build/0001-don-t-skip-install-targets.patch deleted file mode 100644 index 8a0415c7cc8b79..00000000000000 --- a/ports/boost-build/0001-don-t-skip-install-targets.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001 -From: Dmitry -Date: Sat, 11 Dec 2021 16:58:23 +0300 -Subject: [PATCH] Don't skip install targets if there's no in ureqs - (#113) - ---- - src/tools/stage.jam | 4 ++++ - test/install_build_no.py | 26 ++++++++++++++++++++++++++ - test/test_all.py | 1 + - 3 files changed, 31 insertions(+) - create mode 100755 test/install_build_no.py - -diff --git a/src/tools/stage.jam b/src/tools/stage.jam -index c5f02e3b..325129dc 100644 ---- a/src/tools/stage.jam -+++ b/src/tools/stage.jam -@@ -478,6 +478,10 @@ class install-target-class : basic-target - return [ sequence.unique $(result2) ] ; - } - -+ rule skip-from-usage-requirements ( ) -+ { -+ } -+ - # Returns true iff 'type' is subtype of some element of 'types-to-include'. - # - local rule include-type ( type : types-to-include * ) -diff --git a/test/install_build_no.py b/test/install_build_no.py -new file mode 100755 -index 00000000..0ccf3c5c ---- /dev/null -+++ b/test/install_build_no.py -@@ -0,0 +1,26 @@ -+#!/usr/bin/python -+ -+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com) -+# Distributed under the Boost Software License, Version 1.0. -+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) -+ -+# Check that no in usage-requirements of dependencies does not affect -+# install rule, i.e. a skipped installed target does not affect insallation of -+# other targets. -+ -+import BoostBuild -+ -+t = BoostBuild.Tester() -+ -+t.write("a.cpp", "int main() {}\n") -+ -+t.write("jamroot.jam", """ -+make x : : maker : no ; -+exe a : a.cpp ; -+install install : x a ; -+""") -+ -+t.run_build_system() -+t.expect_addition("install/a.exe") -+ -+t.cleanup() -diff --git a/test/test_all.py b/test/test_all.py -index b7ef5ad7..9ed729d0 100644 ---- a/test/test_all.py -+++ b/test/test_all.py -@@ -250,6 +250,7 @@ tests = ["abs_workdir", - "inherit_toolset", - "inherited_dependency", - "inline", -+ "install_build_no", - "libjpeg", - "liblzma", - "libpng", --- -2.34.1.windows.1 - diff --git a/ports/boost-build/0003-update-architecture-feature.jam-file.patch b/ports/boost-build/0003-update-architecture-feature.jam-file.patch deleted file mode 100644 index 1f00a166d40f69..00000000000000 --- a/ports/boost-build/0003-update-architecture-feature.jam-file.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f1c2f1ec0415e7259cd3ce3e4c20965a1642d9e2 Mon Sep 17 00:00:00 2001 -From: Jamlys Lee -Date: Thu, 7 Jul 2022 13:23:17 +0800 -Subject: [PATCH] update architecture-feature.jam file - ---- - src/tools/features/architecture-feature.jam | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/tools/features/architecture-feature.jam b/src/tools/features/architecture-feature.jam -index 3fb0059..a47c4bf 100755 ---- a/src/tools/features/architecture-feature.jam -+++ b/src/tools/features/architecture-feature.jam -@@ -10,7 +10,7 @@ import feature ; - [[bbv2.builtin.features.architecture]]`architecture`:: - *Allowed values:* `x86`, `ia64`, `sparc`, `power`, `mips`, `mips1`, `mips2`, - `mips3`, `mips4`, `mips32`, `mips32r2`, `mips64`, `parisc`, `arm`, --`s390x`. -+`s390x`, `loongarch`. - + - Specifies the general processor family to generate code for. - -@@ -30,6 +30,9 @@ feature.feature architecture - # RS/6000 & PowerPC - power - -+ # LoongArch -+ loongarch -+ - # MIPS/SGI - mips mips1 mips2 mips3 mips4 mips32 mips32r2 mips64 - -@@ -44,6 +47,9 @@ feature.feature architecture - - # z Systems (aka s390x) - s390x -+ -+ # Combined architecture(s) -+ arm+x86 - : - propagated optional - ; --- -2.25.1 - diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index c683414fc50e96..e0e3fad9d4788b 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,18 +4,16 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return() endif() -set(BOOST_VERSION 1.79.0) +set(BOOST_VERSION 1.80.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 638f2883b9c49265d5566eadc8c93d16cb351edeb941110bad8a17871ea7d53df8eb13c80aaefb94f354b71a22454958af1ecb9a441686dbaa9631e33682a9f2 + SHA512 9076732697f9d8f682b5857f6552b537e7745fedfcee3b82083d497a1f58a795ae73c652ab2a04340b9264155738f4eccfe33095bc996169a4e5117e641644fb HEAD_REF master PATCHES - 0001-don-t-skip-install-targets.patch 0002-fix-get-version.patch - 0003-update-architecture-feature.jam-file.patch ) vcpkg_download_distfile(ARCHIVE diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 9572452fba5ee5..beeff3345aa261 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-build", - "version": "1.79.0", - "port-version": 1, + "version": "1.80.0", "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "license": "BSL-1.0", diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 264d3edca13ffc..562d098d129bde 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.79.0 - SHA512 1b937aa3ee79cf2d835a87922748fb891b6ffc5400d29fe6956114c840b90ab1cc4001076c8f7d63801d01c517dbbf0b0698b473041f5665a507e28a2c797c75 + REF boost-1.80.0 + SHA512 1966bc51a605fabdb7bccefec04a7517fdc08b490eb30f865223c7da442309e224b71caa6bd8e57fac117ac35a95d29b82ed96d283f514d1baa361199af178c6 HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index aea6f2896ba676..367af6accd17db 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-callable-traits", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "license": "BSL-1.0", diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 1448db29254720..96a4ef900150a7 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.79.0 - SHA512 b4809a49ca65bd7062a2bcc73dc044e7d47dfe058e31102977d1c394b78f806aa7b448a314aceef86d0939505a32a72cfd8101617be9037f4b591f1f04d8f303 + REF boost-1.80.0 + SHA512 421b8b30e7e11024c240815e2c5eb5a7c7b76fdc8ac7da9bb70c600aced9da96bd634bfb3dd5c485f00d0cf2bc9bb75cda15bcc08753cd007853fcf2ca80f8d1 HEAD_REF master ) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index 7ef5d70c141542..769985c076f9a4 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-chrono", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "license": "BSL-1.0", diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index d851cb8f657351..d3b3a91915ddda 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.79.0 - SHA512 1779cc3a149c1be7686dd44c83efb6f1f4e5141d6d7905ef89cdabbbd3e93d56aaf0da7f81f4c8be0adada997e29b525cc2a41ad787fee6a7b453e7680417d03 + REF boost-1.80.0 + SHA512 1d7cc56dbdc66ad9a3956ee02e351fe1efca8419fa8a2a6bda1fad4f23676cd29d66a92c7ecb73295edd7a8ed3180614923e233bc55c3f3dfc39be86a8118fe2 HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index c2e9fa61c6be92..103d4521b86b84 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-circular-buffer", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "license": "BSL-1.0", diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index fa0f6a7fe970df..52aefefacfd9b5 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.79.0 - SHA512 38a1c87c94ae91437b39fc2283b33150368dc7b90ef288da1d3d30969179e56040a3c697d28ba87a0e6a69b3697609b02835ffd29fb940b3f5b9e44b86694da8 + REF boost-1.80.0 + SHA512 1bd295c78493bb363c34868d6f8772d6ef33970de96dbbaef138f721e46b820cbeb96bb61d1bfe1baa7f9cfa4b6c9d274229559693be73ec29959c4f91d89fd8 HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index a9f342df1e4295..aebfa86523c0e7 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compatibility", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "license": "BSL-1.0", diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index 2bb58e281a9746..9ee451c862147a 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.79.0 - SHA512 de8a38259c65e4ab0945dbad42ee507ac46974660beb2dce92212f5fd64fb963f7fa8eb9db907e435b72c430dff15405d7f04c3d4d8687c969608e88774e35e8 + REF boost-1.80.0 + SHA512 95434c987bf32a05c9f98f7428af434f078c67259fd39d8549152e4d6f7327de13d90898be27889e8c4df5f237e8dd732723a0c9b33e19ca2af7bee4f4814778 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index 620dd5bd0a13c1..7ddd1d435e73fb 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compute", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "license": "BSL-1.0", diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index e492b8cb74b5de..e9f135f5d1c970 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.79.0 - SHA512 dd8a43492d1eae6f3e2c5b1f6e011f04605817dec7e1358c18704a1e0432390f4304093670dc1892ec1080e438a33b17f80cae9c10b4fc99eb640a67b44d4004 + REF boost-1.80.0 + SHA512 214946b1064da82612a2f779556bb7d619b9e3d79ac9b41f1858322a0db3373232543cc91a5c821f86292d5bcf5bd6fb74ceb0835e1ffcf433474411fae6194e HEAD_REF master ) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index 053d3a21039038..40df1184a46376 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-concept-check", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "license": "BSL-1.0", diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index bd6ad84aecd327..7cc52a9a3f52eb 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.79.0 - SHA512 e8d4f44d08865f83599b7580612055ab76b482c7ce6196d4e44c39480a39293685f1b4c683987c6eebe992141deb9c6be1f69ade4c68cbd30f7f97aa92134ebb + REF boost-1.80.0 + SHA512 1c2a87548e2401fcd3a5ae3ab17b0f4f930b6c5ae1f1820aeb5274132ae2c3ae52b5226b9a9b1c46c8a48aee2e6014e1f4dcfe251d5bdf367681b3ed4d933a90 HEAD_REF master ) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index dc7268f2d6dda1..3a5f2d6c9e2c0d 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-config", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "license": "BSL-1.0", diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index 28c84d479b8409..d8bb5ef0a99bfb 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.79.0 - SHA512 97623e7b71944c0c3472aa96322a60e53a4231482938c3170d4493e090d999f6431f4e2f2ba7405fc37f2267869bf5265f674723a8d642e838a0f63ec0ff28d4 + REF boost-1.80.0 + SHA512 330ff226663bcb4c1ba5a334b3e40a45e715bbee6973c9b1f858eb6940c6376abca79ea5a5f9907934fd4c6340e6b3da2fb1c1be77d9bdde95566232705af957 HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index 7afac8c0005d63..56988cdcd4db0e 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-container-hash", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "license": "BSL-1.0", diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 57eb5f90ad1886..90e96003567342 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.79.0 - SHA512 934e136095d80ce1c862fa699b070908dffd9f278cdeeed3da6a0469f36fad7820ffd3cd9407bad8e8fd4606057c408cf31444140d8749db05b18934c3dd35fb + REF boost-1.80.0 + SHA512 a67bfbce1ceceacc3048477569e652741a7c3eec0a1c8602a23c327ca3dc1725902235620c4ea43064daa2469d984c7654da076939a0ac300626be2e335787c6 HEAD_REF master ) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index 2102cd57dc7fc1..d5d47e9a2f3ad6 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-container", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "license": "BSL-1.0", diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 97412ce79a1d20..acce482b93a365 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.79.0 - SHA512 25fc307a3ffa9b2b87199e0d7faf87ccd899c619d5043d3780e65476a0356a3edb0fcd55400bd2898f12de149952edf2fde58c79b62d993b534b81561bd174ea + REF boost-1.80.0 + SHA512 4313ea48612eb4768f015a4b48ae9470e709556b9ad817da0deeaca5ea6c142339c9d670ed919bdc89b4ea139b627617386a828d2dfb6757ac9416184629a3d4 HEAD_REF master ) diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 987e59c364cfe7..c7ffd32b7a6a6b 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-context", - "version": "1.79.0", - "port-version": 1, + "version": "1.80.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "license": "BSL-1.0", diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 2561d51b32c833..80c9edd61e4d7e 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.79.0 - SHA512 511df371ee4c1bc9e443a4df1c1156138187f94b549df0944cc46613bf3ce07e7002d3003a41385b7e0f43326590ae4d932a15fdf0cc4d883b4be05ce79c3a94 + REF boost-1.80.0 + SHA512 bcb2f74b3ed3af4e919054ab8b3e24b634d0ea0d9da14c308859e4bcf9382316669f38790ecd8b25c06f5cf84c924e79915159e8ddb0f5d1912d87f063aa1e71 HEAD_REF master ) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 370c506bf71e7d..9809aa126b8925 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-contract", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "license": "BSL-1.0", diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index eca7221e90e923..b8dd288b0a3d6e 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.79.0 - SHA512 dc2ff45cd1e046039fddb4af2ea2651eabbacb047255e55be395e4d3a71bde719b6dcf5071143800f14b70522f8f9e5dde2acab871e1d0aa36c9be7d1f38ed3b + REF boost-1.80.0 + SHA512 fff6ae3b7be67b1346c3b2027157a828ccf9c08279a104502707e262255291612f849a2d51ff4acc7768f31f2dae5311c3928fd56f5b97623d3781b25e62dd1e HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index 2e341ca48073fb..e67c5e67e75753 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-conversion", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "license": "BSL-1.0", diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 77a6f775fe4ec9..f3fe39d1d98d1b 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.79.0 - SHA512 deb3b28c8c356f4d36c9f5af01f682572c14f10b3466acb34619aa56ee398b687a95a731cd144e870b3c6581540b7ae48a1cfe4b6926a9781470aac6e07da9c4 + REF boost-1.80.0 + SHA512 68f40fdbaa45618a4c7cf27eaf202be4407451fa9c3f575235c39b3ee2ccb2d80e5766ca1c4b5472560caf34310ccdd92f296743d12e025b5678d3e87ccd9c45 HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index d0bc0df7628dee..147eeb8d3670e7 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-convert", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "license": "BSL-1.0", diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index d0b92b175f7a6f..674b4c914e31c7 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.79.0 - SHA512 f1fc5f371f52a0b12e72d9a9f11a57f561383195091b7252bc9fda39837504b29481e22750a526b54bd169ec3cc44b3d0d6bbd296027913858eb8c9326b56cdb + REF boost-1.80.0 + SHA512 4b83c749f18b5f79b52f7b400f9da3255f9b4fbf6280096a09da1ffbaab0513a0ce7d6b68c9e26fb93e632e3bb1dd46de280d721ab7ffcd66dce2f8ed97030b9 HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index fb0b225dab9f2c..9b54ae369df232 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-core", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "license": "BSL-1.0", diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index cab75fa11e6d53..afdfcfa023333f 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.79.0 - SHA512 a969a25627713fd0cf440ee1c60979c10465df95589dc829f8ee480c5a5cfd833ee3ea5f90616d175f06cf1b01750d682886e8d7e64038e159bfc15b184a5de4 + REF boost-1.80.0 + SHA512 71e0694e7056c83593999b4cd49d9bd6abf8ff1b37f2559b12de317218601f70a1bb192dc8270f4455739486d8660dd5a4bd76420c58182086d7710883e897ec HEAD_REF master ) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 89754e5e50a347..eb4f9b84f83f81 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "license": "BSL-1.0", diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index e795fd594b6a36..5ad02d110f9c70 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.79.0 - SHA512 a93c43fea67d2963e90d9e84e7a6b2832d1f6a9810385092198300af35f1d27b4a33367eff256c7bd32beed0041d84ada62a12aeda45f5f7641fc801b94f0aeb + REF boost-1.80.0 + SHA512 5a0ea6f9e69373edb52b83e6efeb552fc0d211e2316c65d3506ad3dd5f547a9025a14924615df35e790c9d351a0c6a5269c31ab961eadcf019f25f5e739b5bc0 HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index 44a94ff00c9663..38d92475bb40f6 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine2", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "license": "BSL-1.0", diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 1c9c39f433cbd2..449fe21fc7ea4a 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.79.0 - SHA512 31d3b5f0f7e7beee47b4bee9531a598b7fe27681ea6719e68f6dfae4047aff0c453f5cd8668de2e0441cf8d04ae38a83f530ef56dc2e7262a975e567cdc0439d + REF boost-1.80.0 + SHA512 9365b348dba52436d717c329634b58a9731b22b289714a3618bad9a4ea6967b8170ec289c4528762cd3cf74ae768a3756ce3d876ea8297b65f941d5560080a1b HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index 0803357c17b5ad..4d9f06cf95eb93 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-crc", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "license": "BSL-1.0", diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 195b3ff12fc025..ec1aabfb17a496 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.79.0 - SHA512 e24b9c1c2564395b673b32a8b2308f21846cdf74476a8391ff54af12bccea3a3522b035567318cea03393ad6729a7910210008780c450c126433a4117874a10d + REF boost-1.80.0 + SHA512 6b15abc20f89d06ff225042e36685dfd3121432c72d965e94d65e5c17bff6c7dc2f4a5d2511e0496518245ada92bf178f46ba5dcb3af9e56383e3cce9c03f6f5 HEAD_REF master ) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index a878773ff5f64c..f3b260b540a375 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-date-time", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "license": "BSL-1.0", diff --git a/ports/boost-describe/portfile.cmake b/ports/boost-describe/portfile.cmake index 2fedfe00cc7168..d1b688f86052ac 100644 --- a/ports/boost-describe/portfile.cmake +++ b/ports/boost-describe/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/describe - REF boost-1.79.0 - SHA512 0a8ca55ac3c6b3a80c003d2817b16c1b2fd4730554cd392673efeb675a3ea54907abd4a54447fc3f83068ead9acf462af38fa9f3dbc6cce9644237892f5cc03e + REF boost-1.80.0 + SHA512 ede3b1723b30da1cb37042895d1c3e43e94d5ab67f0f78887da265e57f8e7cf5a535e3d56d637e8e251271c7fc645d17cdcb4acd568d613c0479e2bf49de1010 HEAD_REF master ) diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json index db52e9ea958d66..c8e119fad5d9fd 100644 --- a/ports/boost-describe/vcpkg.json +++ b/ports/boost-describe/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-describe", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost describe module", "homepage": "https://github.com/boostorg/describe", "license": "BSL-1.0", diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index f603c550707fae..6271bf1dd4ec12 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.79.0 - SHA512 ca51c9127db37971b8ad32276d0aa666544a1382dc60298972a3075b81846b89257850cfd4ce7f9409bfb92c088c7df96618633a3b00f578dce86728074965b7 + REF boost-1.80.0 + SHA512 1f9d1a392905973a7d717bc11e7b2539711df74549e49d56ac124c44a5c1ec103c96b669ac49e37ed2fd7fa01b7851940bc43803f1a7c22250ed869411931c59 HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index 5807a65411962e..5f99183c0590be 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-detail", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "license": "BSL-1.0", diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index c85b3452b3f86e..23d9399b8154e4 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.79.0 - SHA512 cf77949934d835d9100cdf4e09b225085b94a73e4a2652aa939aa99a90cacce32fc90124a062d64677976a7c9573373ee97d274d1bda701127a7aa77fc010e2e + REF boost-1.80.0 + SHA512 5d13d9b2efdad1f99a7db9dc90b0faa4845b850182915c32c195b73eadfaea77a0d15f5163a8a402561af1f5d66ca1f6273abace42a8340b7587e8cdce5d9d0a HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index 02a91abd862764..c5c74621605935 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-dll", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "license": "BSL-1.0", diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 08d1b037c8ebb0..bb55cbf1379ad9 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.79.0 - SHA512 c9aa196ddf479e2c6d3f92abcf1cd2fb5e459af8f47fac2dae7dd4355bb16ffba7ddcfd5750681cb0a5ba76503f2824bf5c0bbb7f3f8dc8320ba977df3baacab + REF boost-1.80.0 + SHA512 ce09a94ffd67b9670be1250c81ef2e85f48c73981cbf02053ff17a7a0cab56f27348e504fbfebe3b322b94c33c78989684fa992d780be1271858e9d96a0c4979 HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index daecb6557adcd8..05cea9194c1c79 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-dynamic-bitset", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "license": "BSL-1.0", diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 4900f75c71671f..084bdf2432afd2 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.79.0 - SHA512 b2fa5408e863a250d749c7a86bf755d1e77243d410b11fa5d67c4361014d641feb6510c2e36393dcb3ebe4a2b81dde7858b976af4c46094e0e25bae904705207 + REF boost-1.80.0 + SHA512 187f758c77882f6e30a880a8ac84f450a07a275836a629bc93e8dd3bf5f77b7137172370816b78f109df58fe4757c7af5cefa0f818bdb802c8ef1138a8b12acb HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index eb070039005594..9e3acee297bb17 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-endian", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "license": "BSL-1.0", diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index 107f7a23c56e9d..aae9c88309ff6b 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.79.0 - SHA512 a43b5b296f5af17ca447dd8ca5d89abbddf37969fef858f2d5966f57b336f5620b7e77ac5c99fe796d4440d66ecd376564c00b7936a5393a67045cbf148d520e + REF boost-1.80.0 + SHA512 57477329a2671147db24a6fd9792f8694943c92475d03daab2284c1ca316fca9675ba3a9e6f0adcd5e7361d35869240efff10d373e30c79ba99cb9a4640e649a HEAD_REF master ) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index f6009b54ab8bf9..288fa7cbe972e2 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-exception", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "license": "BSL-1.0", diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index de6e376e6b0266..46d25daeb45985 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.79.0 - SHA512 c264fe03b9cf08973acadeef3e00ea8b76610420b0b1a256a137a963f79f3b9114f07ceca6b604c4ea86e4088c954d3780f90bc13167d35f1ff38be237a216fb + REF boost-1.80.0 + SHA512 4eb5b35fcf5c882051d0deebc55c58c40a235c8d8695cfad462036a9a7de972a40c5bb4c724d4c412e400f9f1ed74f079af3ca7f5143739068f31c0c76567a8d HEAD_REF master ) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index 1dd1d73fa9c0c6..d814be69d75555 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-fiber", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "license": "BSL-1.0", diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 68bad85a2c94a2..509a066f358c1c 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.79.0 - SHA512 6f3ff9f3006110622642ec27c7913157bacdc3d5d1f19044d67bafb9be2f26e9feea26e91e6556f9806999524ae59d59527ccfd1d52b4bea7c9363ecbff4454d + REF boost-1.80.0 + SHA512 9e8c3151f65af1242014987b10009c6b0467d0da3da1813e709a7238669a54a7256097ec205e3ff430b3b00c8a29d06a7b666562c3285e4d6fb5e73857e24604 HEAD_REF master ) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index 8c9bc68646647f..6fff2f3e87c058 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-filesystem", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "license": "BSL-1.0", diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index e1dcc33a368126..3ad6bd2660f4e1 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.79.0 - SHA512 cd0b8d481989602a2deea71332434da4ef358e0a0ca81cdd7adedd01b70cba189aa93e3e7a92ea6dcb9614247ed063f18e099712fc7a42044da2461160435496 + REF boost-1.80.0 + SHA512 84e2ab0e65e1dd8d05c4e5f98a603b99b85faed8c7ab50244ba6d252ecc62c2a8c14f542958d8833b8ed8c13d364db1e33a872a94cf5c204dd33f280a7986ff2 HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index e7ff5774999965..452b00f957538c 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-flyweight", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "license": "BSL-1.0", diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 86e818cd9ef97c..906a4190415b49 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.79.0 - SHA512 3f003e96806543cebe888014e870d0e0030ad8fd3762332e548f6d9c146a45996a8bb1b29d2c91b5f3a39e7731a9c6c8447f95631e5e6dc12293e07f5bda55e2 + REF boost-1.80.0 + SHA512 4ce33f0b1157ee29c2bd2f9a68b2992b1839da220789b2146632f7a2a859bf756ac60ebf0ed7876c4d57c5a814f51561e3b13fafc58f80ac653b2d93b572abae HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index 559acef07225d7..1abb85ce610d39 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-foreach", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "license": "BSL-1.0", diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index c93a1427f994dc..fa814a67eca674 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.79.0 - SHA512 46ef8394324925a427f5ba574c897d0b3d27389aed0a6085f4b8dc600c6a720f9f3f1ced3a368c5438f42ac8d204da833df228187e4a6fe7129be755cd16ae90 + REF boost-1.80.0 + SHA512 89dc4daf80d7663472839f66455c747c0944b336302a09be6bdf3e186956a703fe136e7e9c4d27b11cde7baf517f46b289ffaa6a1dd762e5c5810eb1470cf2c8 HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index 53e9743a10fcb5..c7c987022b7d54 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-format", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "license": "BSL-1.0", diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index 9daab85d8599dd..cc8271fef8418d 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.79.0 - SHA512 95fbe35406c1276a8170b7f83dcdc7285ee04ee2e14329544cbb2ccb3a8a24d05ca7cd2b762f88223505f4c4b379a523068492e625c58bb8eb961a6333966019 + REF boost-1.80.0 + SHA512 6fafbcbecaca0fc44d674484340823d8561f64ed94f13f11b994a8c34a1a36a90b1d8355fbb2c3adfa15bcd8618d3fac1874670c8677ef02f8edcb2a25f04183 HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 3b9e49da2e1382..d1e76490945a83 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function-types", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "license": "BSL-1.0", diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index 3ae65a5b5a7f9e..068359db351ca8 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.79.0 - SHA512 a1f0e4ff828c286e9eb29a8cb8c203248605b9ddc9e81e0797ff62f1513f7debfe3c48fd158383cb2e963a442959e33de5fa7fb641690649ed402e782b411947 + REF boost-1.80.0 + SHA512 fa3383b2876bc5fc8c9a5f79d2757d232f327b7ff380dedb9993a684dd2ce7a5de9a5c3cc15c94341c62faeea7c8d718418ed166a2171375c8d4f5ec74863e4f HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index 67a1e839552be2..476a7780f940b3 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "license": "BSL-1.0", diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index f705fafb212507..246cc1da78bca3 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.79.0 - SHA512 17ab121ec3e9f2bdd9a3404861f6c2952ffda84bf2731fb3300e736c993cf4d49460d4e35edd6cccc123fe87d5c0b32ac0fa0c71770cfb74d8b3a7f14cbda991 + REF boost-1.80.0 + SHA512 c7af977120c64b44d28b26fcc0f897731b1baa770d87659eddffcab32646e0b754a022ea5beddd930b7043f15beb083befb23303ab5363f8abd67c0ad822b592 HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index 99b1ec1c3719fd..083145d31d9da4 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-functional", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "license": "BSL-1.0", diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index f845397ede5065..614a0db01f0cf4 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.79.0 - SHA512 87347852c8aaed2287c409468b8fddba378698454bfc451c2832e99eb0b9dd3340c9d3c160e5313a72598c0787b4c28032bb4a0326cec505c93601afb0f5b06a + REF boost-1.80.0 + SHA512 77121dc0bf188b530d2d7e2ab6ab5c6d3e8c01f9a063e581187bd3cce5ab35002c08f47dc5bce03487344b50c1fc1817f9cf4e1daeece9ce96ae5a2a99ac632e HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index 67c0c521d10d38..aa73ce1bea9927 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-fusion", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "license": "BSL-1.0", diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index b832776bc047dd..27ca8729ee7aff 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.79.0 - SHA512 0f6e92d4dd9fc98598101bc0b581ffd22b7771686824aa37c713fd247cb19a4c60d750842a40da44438376a66ed067846381fba5b4cdc19a7182bf37d2d6fc77 + REF boost-1.80.0 + SHA512 3b195957afa51292f21430b9dad8f1ac4a69320bc423de86813c0f3740ee6dc5a33264f91eedbd022a1ccfd520fff45acc39d87c13e70031935b76ce3a584ce1 HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index 7ea8abcbb96277..551fefde5c50de 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-geometry", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "license": "BSL-1.0", diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index f16d2bc2ea8fa9..de5aaa8e41a3ea 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.79.0 - SHA512 a682481b9a7d75f9db477388c707eb277ded72bcc72a4e1d71ea5521f72d7dececb5ad3c558a449b630eb4eec15c805152f650f8a7981eaf15a0c1d819bc77d4 + REF boost-1.80.0 + SHA512 4e562691addb9a1e58a90842c91439a6a906933d3de886e1d6d5c670d0774b493e427a986b7a37ff0d2c039e49142b5b37e4326815ada1946eab64ee69101be1 HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 081c1b74912eb5..54771317eb79d9 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-gil", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "license": "BSL-1.0", @@ -8,12 +8,13 @@ "boost-assert", "boost-concept-check", "boost-config", + "boost-container-hash", "boost-core", "boost-integer", "boost-iterator", "boost-mp11", - "boost-numeric-conversion", "boost-preprocessor", + "boost-type-traits", "boost-variant2", "boost-vcpkg-helpers" ] diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 340f21c46ba1e5..574094963c2d9f 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.79.0 - SHA512 18c4a3272d08445bf6dfe23546d5380740979014207620b67890e20df21a7cd0d2c9c9f9b96ea240ceab5f4e1af98cc09518667959b4782595f36fa290e88a8e + REF boost-1.80.0 + SHA512 dde026b845d38468e041dbc3f9c2c65febfe8f378a526920d09de00ae4019d36a88051741163becf3cc560fe5f0919302d100ac38e5c140dd0fe23e9e7bc2a17 HEAD_REF master ) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index a05c2dd3888c54..cfabf9ed7c3ade 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-graph-parallel", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "license": "BSL-1.0", diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 1d9422d962da9f..d9026bc31cfb3f 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.79.0 - SHA512 abf24abcccc14145463d9a2b465137352703fd6d5fbb7bc2d8e1d7f126f165826a858a47d3d8ae0f2bec897875f77a138d03708dbcfa4b7ff31910fd6f1a7d63 + REF boost-1.80.0 + SHA512 b6a2007fdc0739fdb397621c297f60001f512216a578fba35fe60766ee8e6649c9e2c4e1d0ab6e21a2c7d5fd2b2dfcbeb9d99cc7d88dc05b9ed13bca8949c8b6 HEAD_REF master ) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index 18bfed79048e13..2e01a0861210aa 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-graph", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "license": "BSL-1.0", diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 006fbfe36d4cdf..90add160f61022 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.79.0 - SHA512 e50511f768c16ba5eb41a4240e4df85f944443ae6b35848f079fec0ed65e27ba70c643f1cea58bf1fae2034a6c88be81ce23639e21c3030e43c2295652514f96 + REF boost-1.80.0 + SHA512 ada58ec5f99a65e5affad995c0afd0fd37478beaa1efd6f376a0532b062f281571512f7ae279e672595b0f7f765bd130abac68744532537d33537a1bf81e0b25 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index 0b59037c82cbf2..3ce9d470d5da29 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hana", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "license": "BSL-1.0", diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 5288cd0bfe3dda..d67499677cf29d 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.79.0 - SHA512 f538cf751dd8909010613579a5b10da58b6d8474d9f58e9a6e2ab6ad95b52cd08c8e6a6c6d3abd5426508bc1de432a11a355652c6241ba474ddfeffa285f4411 + REF boost-1.80.0 + SHA512 29185c23e783075d75ca5faef4013206ff21a9f570cd556b6b10ca2699890fa90e11b41239373225589d2784507c7fd8c7317355d4cceb55c2fa9a47e1920535 HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index ff2b95818df910..a9776e0dcd0b88 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-heap", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "license": "BSL-1.0", diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 1bff93ad5d4fef..78221a015c133e 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.79.0 - SHA512 abc02ad88428550899d03fc54b35e5c31ce967028e7453bb46c28cfc99272319a3aea145054eeb22ea3b75358548f863eb561228efbe47a3e732d1e3be1b698b + REF boost-1.80.0 + SHA512 3dbaf900167f77f7bdfa97688e08f942f79a075c4fbe449392b8de7438ac499417c09a3c40322992bcd54e54ac765491f2461ea8a6bbd87105e1fcb4083c6775 HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index d9e4f8122fc7ae..29bfae50cc77ec 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-histogram", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "license": "BSL-1.0", diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index dacb488940d310..c48a3f038ce23c 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.79.0 - SHA512 78e02a1b1f5f7b484d9c8e91d239147c9e37f58d7bda944bad5ec302a4dad0b4ea39efd3cc839540a12c5f17ec7944f6f27d9fc529b7992426393cdf30a2dcec + REF boost-1.80.0 + SHA512 5958a7599aee973d76012b5b83eb3306383bebf9321f0c0293c16b8144cc0cb2baef8f6415ecb63330cc6ba945311794e833311633cf5c7b76ce7fd4005aa6f8 HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 883a6b393ecc35..154d5c013104ef 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hof", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "license": "BSL-1.0", diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 30297b929ebea2..73accc7d531d35 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.79.0 - SHA512 4a6297454579052d9fdcb76a2b1659dd5767cff751d35770ad34f9c48a9308a548d914b8ff7156f1c64866751538f68926e81ae1a09d8f7d8da14442ee90c679 + REF boost-1.80.0 + SHA512 798fbf8a88df27f117b820a36b2d2eecbb505948c70962284ec3ce1e6f5e96b4309b43fe39c5c983b65712fc3392ecac057c5aee766fbf94ec23f071decb925f HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 743875af8d2e50..ef28f54f2cb2d3 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-icl", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "license": "BSL-1.0", diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 36aa39949a0ecf..ade8258672bd44 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.79.0 - SHA512 97607006e8acf9c988dc951ca6c04d912bfbcbf86762b00cb5675dfb3e205ec60fa95c2b13c08dcbff4bccbd4775323fa6c2a2faddfbe1a9a2730b9e769761c7 + REF boost-1.80.0 + SHA512 eea19b26071cd4ea11afc5877ac23459897a40d278777b7ba2e8aa05a4f009a056e415b49766552460a2cc89c2cd02129ad5bcaa246b43075c0ff4f559083def HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index fc0f9b0afc2b1a..9863ba1f343336 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-integer", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "license": "BSL-1.0", diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 31fc9e8046cbfd..76b1a1b680923c 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.79.0 - SHA512 ab6f9fda45ba3896a7908a1f7659da690f4ebf988f084dc90f46197ee83bd8c824d14f44c1e080954c3e4c886cb447a980b8c1e5df91f552cec9c9b20f98d0c5 + REF boost-1.80.0 + SHA512 75547ae0e829d11c742c01a43fb9c178e178323ca197b5063eae01aec89babd812f987ce0eff3a34994d355b27cc26b0edee1795d0671dd7dcbd7d98007a02a5 HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index bf29bb5f093b43..779aa3a67796ae 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-interprocess", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "license": "BSL-1.0", diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 5c2ea2ace96258..d6e92adf8aa74c 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.79.0 - SHA512 46af32271e33f2e004df2b8da5c117eff0a65bb229be788cae888ccc24e9f6e43d87ff151c5c242e90731a8e54fd95e7d3c6562e3a019bb551475c83e5a61a7f + REF boost-1.80.0 + SHA512 16bafe92e11ac15ec08b7c7ecdf8456fd898f469b2f15970806bd0c4aff48e77b3392574e57d3e4c812f5e6afa1a4156a64a1650bc89e4e43af618ed7c95e267 HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 846b2768643190..54e204b52c3a9c 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-interval", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "license": "BSL-1.0", diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 92cd55b23d7b0a..344b582c290d56 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.79.0 - SHA512 4536cc104c2538d2c7a4e22882a27c47732b69ead76fd49d75592f582bc1873a0731753eb421ad67576467d731169333a1e95a39efb0e977512a58b407d59fb4 + REF boost-1.80.0 + SHA512 b13c07d16117b2151a495bc02520ff198f5953a8b70e7757ddb727550f44822fbacda42072489f6f83d180312f628acade3a063abfa2b97cafd6d3d05de84726 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index 10191e751a8b61..7657b72defa0d4 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-intrusive", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "license": "BSL-1.0", diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index 7097641f494c36..ccf419543d624f 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.79.0 - SHA512 e647ef4eefcf452b6b5f64ac39bd0661a39c78660a360e0bb009e8788b8d251a5d3bcde3c1edaedd7bbd588eb88eba495d52a52d504eac72e429ba0ae0a87482 + REF boost-1.80.0 + SHA512 9c37f72be450ca0fac5e10540732f43779665d9b03a90ad5a9abaca558fec40f62ca04f2a41894131b0661220206c4e4bd93671a1e2a26747f3361adab2c51a5 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index 3f15640eda1f71..b8d2db6bef367e 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-io", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "license": "BSL-1.0", diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index b1aac26495af2f..aefe2ccca16d93 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.79.0 - SHA512 f733c586df4f267dba7b7181caa2e7ca1418d2cd843cf032121c06ffcda936c194fd7a78ebe292133217a8aae4bb83fd2c2890b52739da74c4833ecd950d0555 + REF boost-1.80.0 + SHA512 861e6810cc5cb180aadea7980a3c8bd7ea5a0dfe1e45145debdbe1c5083d94e17f5c92cf9f4892ab391e7b531df1c00bebd07c814950b9ac9ffbff41bbc78a16 HEAD_REF master PATCHES Removeseekpos.patch ) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 6d01ed79d5f516..5163061a216395 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-iostreams", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "license": "BSL-1.0", diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index f269042497bebe..2af94bf81b276b 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.79.0 - SHA512 26b0308126df522725887fcb9578d7e645f181cd8a6850915a5ce0c832a5f2e5521ba75a17f29a5eba788e3d8bd46d61ebb4b61fa40f233c33e99f83949516f6 + REF boost-1.80.0 + SHA512 f8824624a5e635e3909638db74816291e871ae443934645cfa38a0682547923c1daa11152a35de66704d7da54d952e652cefef504de05fba9608fe100aeaf572 HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index 68f227529faefa..e06cbde678284d 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-iterator", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "license": "BSL-1.0", diff --git a/ports/boost-json/0001-json-array-erase-relocate.patch b/ports/boost-json/0001-json-array-erase-relocate.patch deleted file mode 100644 index 1a8ade170643f1..00000000000000 --- a/ports/boost-json/0001-json-array-erase-relocate.patch +++ /dev/null @@ -1,20 +0,0 @@ - include/boost/json/impl/array.ipp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/include/boost/json/impl/array.ipp b/include/boost/json/impl/array.ipp -index 4d067fb..a2c7fd6 100644 ---- a/include/boost/json/impl/array.ipp -+++ b/include/boost/json/impl/array.ipp -@@ -491,8 +491,11 @@ erase( - auto const p = &(*t_)[0] + - (pos - &(*t_)[0]); - destroy(p, p + 1); -- relocate(p, p + 1, 1); - --t_->size; -+ if(t_->size > 0) -+ relocate(p, p + 1, -+ t_->size - (p - -+ &(*t_)[0])); - return p; - } - diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index c72a076367ccf0..cc6cf3d405f327 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.79.0 - SHA512 1243e4bdf5f2570c1f92e12dbe9cdef55d72d73d0e6abc6253eae928280ba913bfbc3a4d92d09a9c9b98e06ef95345c2c99dd0983d8dd2a7f1d8f0826530e1dd + REF boost-1.80.0 + SHA512 cf18af252ef10e07c008cd360df9bd7683758bb53b401f01a37378e4c82d95f743f1a10af0aed9a9f60d3ca64469af4c2fa03ff7ac1b3b693237bc1fefd0aec6 HEAD_REF master - PATCHES 0001-json-array-erase-relocate.patch ) vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 3fa10d633a5c4b..59c5287cd724a2 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-json", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "license": "BSL-1.0", @@ -14,7 +14,6 @@ "boost-config", "boost-container", "boost-core", - "boost-exception", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index bf54ef65ba0e5b..309c39258ae206 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.79.0 - SHA512 4baa279ae5ba4a0b63c3177bebb30a15f539f56e8786a4049a027a6593c73a07f6d397b3bdc07fedaa0407015a7320f1577a499ba463c8bfdb13d1fdad2394b7 + REF boost-1.80.0 + SHA512 ca572e0d76260a7ffdad33ee3eaf9924c8ff275fbce54747f11358a439a2e6f5e9b968aea8d365ff448924d91c3247319d190cdccd832b7efa5f4484b4e09ba8 HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index 74f2616870f623..c51fcb2b8d3132 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lambda", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "license": "BSL-1.0", diff --git a/ports/boost-lambda2/portfile.cmake b/ports/boost-lambda2/portfile.cmake index d4336f7bf96b65..e49ae6b650485b 100644 --- a/ports/boost-lambda2/portfile.cmake +++ b/ports/boost-lambda2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda2 - REF boost-1.79.0 - SHA512 352b7070627458c63866c2b00829c84aa76c0188b772555fa019603d80314f446c38311b08e30c07d9fb337988a335109112aaa5cb188723effc54b7356d0a67 + REF boost-1.80.0 + SHA512 1e3e11c4cbc0a926ada538382ab78ad0b81719cf2bb418a0962474fc5714fa9aef380f766495c76285ad425078912b4752cbbea8965d1b206878be9c0e3ebd8b HEAD_REF master ) diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json index a7f426306259b1..9c8e2d348c9385 100644 --- a/ports/boost-lambda2/vcpkg.json +++ b/ports/boost-lambda2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lambda2", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost lambda2 module", "homepage": "https://github.com/boostorg/lambda2", "license": "BSL-1.0", diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index 05189dc98ad85d..a08e9fe2af9c26 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.79.0 - SHA512 1f567029d8b737f6e7cb4fcd8df03f0aaf89bedf5c127b5cbd02ce27910934361254e2d03ba95614a7e41f2e2c4a09a346b41ea53aacc68dcf64e77e58b7fa23 + REF boost-1.80.0 + SHA512 ec43985c02e6353d101309b829948f3e7c2dc1044e4f09f3de36404c8e196b65a98218943b427f1a2b5849aed1f756493b550834de3704ac0fc1d5899a8ff555 HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index 77395c01e03757..6737d50a56c82d 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-leaf", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "license": "BSL-1.0", diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 46a076bf6ecc88..97a20dd36987c9 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.79.0 - SHA512 9d0b28cd20c88638d048ff48d2f0209627f15558c1ff2619ed28cc07207c71352799289004d4108c20187b1099720064a2d1ca517b8b19e523e6702acb8fe018 + REF boost-1.80.0 + SHA512 b708917e7f5cc3c1cfde0856233a4ba8d3d717006d8cee1c3c7522b2b713b7a8a170de1e87e2b55cee412ec904d64d54333a64ef8ee10ac2cbad7a73b62ff173 HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index 1fcb7717e0c287..f646ae2a7399fa 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lexical-cast", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "license": "BSL-1.0", diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index fc2d6f97c90387..e40649d3d66fea 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.79.0 - SHA512 c6dd1e1b397bea700c9692a1a71d2943c5221afbd0f82e5c67093154923537127a3cb1d727e532454363a58210feef638ebe1a2ebec22ae93c16f52f3c29203b + REF boost-1.80.0 + SHA512 a5dbb5b849003b47a7e7595db427a59aa80ec1e1ff15aea9b4d18bfc82570201097ab91edee28de5610e720ea265bddd256bb86a5c91f26695a6b57813b15c0b HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index e4a494a1241676..b075bbf7a30330 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-local-function", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "license": "BSL-1.0", diff --git a/ports/boost-locale/allow-force-finding-iconv.patch b/ports/boost-locale/allow-force-finding-iconv.patch deleted file mode 100644 index 134cb81a13ea8c..00000000000000 --- a/ports/boost-locale/allow-force-finding-iconv.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 -index 88a8cb1..e6a6b7f 100644 ---- a/build/Jamfile.v2 -+++ b/build/Jamfile.v2 -@@ -17,6 +17,7 @@ import feature ; - # Features - - feature.feature boost.locale.iconv : on off : optional propagated ; -+feature.feature boost.locale.force-found-iconv : on off : optional propagated ; - feature.feature boost.locale.icu : on off : optional propagated ; - feature.feature boost.locale.posix : on off : optional propagated ; - feature.feature boost.locale.std : on off : optional propagated ; -@@ -164,6 +164,11 @@ local flags-result ; - - local found-iconv ; - -+ if on in $(properties) -+ { -+ found-iconv = true ; -+ } -+ - if on in $(properties) - || ! in $(properties:G) - && ! solaris in $(properties) diff --git a/ports/boost-locale/0001-Fix-boost-ICU-support.patch b/ports/boost-locale/fix-dependencies.patch similarity index 52% rename from ports/boost-locale/0001-Fix-boost-ICU-support.patch rename to ports/boost-locale/fix-dependencies.patch index cd02f742e93bfc..95e77f5cee4bd9 100644 --- a/ports/boost-locale/0001-Fix-boost-ICU-support.patch +++ b/ports/boost-locale/fix-dependencies.patch @@ -1,37 +1,43 @@ ---- - libs/locale/build/Jamfile.v2 | 63 ++++++-------------------------------- - libs/locale/build/has_icu_test.cpp | 4 --- - libs/regex/build/Jamfile.v2 | 47 +++++++--------------------- - 3 files changed, 20 insertions(+), 94 deletions(-) + build/Jamfile.v2 | 69 +++++++++++--------------------------------------- + build/has_icu_test.cpp | 4 --- + 2 files changed, 15 insertions(+), 58 deletions(-) -diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 -index 578e722..5f25917 100644 +diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 +index 450ec87..653f592 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 -@@ -70,62 +70,17 @@ if $(ICU_LINK) - } - else +@@ -20,6 +20,7 @@ project /boost/locale + # Features + + feature.feature boost.locale.iconv : on off : optional propagated ; ++feature.feature boost.locale.force-found-iconv : on off : optional propagated ; + feature.feature boost.locale.icu : on off : optional propagated ; + feature.feature boost.locale.posix : on off : optional propagated ; + feature.feature boost.locale.std : on off : optional propagated ; +@@ -86,62 +87,17 @@ if $(ICU_LINK) + ICU64_OPTS = $(icu-path)/include $(ICU_LINK) $(icu-path)/bin64 shared ; + } else { - searched-lib icuuc : : icuuc -- $(ICU_PATH)/lib -- shared +- $(icu-path)/lib +- shared - shared ; - - searched-lib icuuc : : msvc - debug - icuucd -- $(ICU_PATH)/lib +- $(icu-path)/lib - shared - shared ; - - searched-lib icuuc : : this_is_an_invalid_library_name ; - -- searched-lib icudt : : $(ICU_PATH)/lib +- searched-lib icudt : : $(icu-path)/lib - icudata - shared - shared ; - -- searched-lib icudt : : $(ICU_PATH)/lib +- searched-lib icudt : : $(icu-path)/lib - icudt - msvc - shared @@ -39,7 +45,7 @@ index 578e722..5f25917 100644 - - searched-lib icudt : : this_is_an_invalid_library_name ; - -- searched-lib icuin : : $(ICU_PATH)/lib +- searched-lib icuin : : $(icu-path)/lib - icui18n - shared - shared ; @@ -47,14 +53,14 @@ index 578e722..5f25917 100644 - searched-lib icuin : : msvc - debug - icuind -- $(ICU_PATH)/lib +- $(icu-path)/lib - shared - shared ; - - searched-lib icuin : : msvc - release - icuin -- $(ICU_PATH)/lib +- $(icu-path)/lib - shared - shared ; - @@ -67,24 +73,36 @@ index 578e722..5f25917 100644 + + explicit icuuc icuin icudt ; - ICU_OPTS = $(ICU_PATH)/include -- icuuc/shared/shared -- icudt/shared/shared + ICU_OPTS = $(icu-path)/include +- icuuc/shared/shared +- icudt/shared/shared - icuin/shared/shared -- $(ICU_PATH)/bin +- $(icu-path)/bin - shared ; + icuuc + icuin + icudt -+ $(ICU_PATH)/bin ; ++ $(icu-path)/bin ; + +@@ -221,6 +177,11 @@ rule configure-full ( properties * : flags-only ) -diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp -index 9419b30..ed9be05 100644 + local found-iconv ; + ++ if on in $(properties) ++ { ++ found-iconv = true ; ++ } ++ + # The system Iconv on Solaris may have bugs, while the GNU Iconv is fine. + # So enable by default only if not on Solaris. + if on in $(properties) +diff --git a/build/has_icu_test.cpp b/build/has_icu_test.cpp +index 344c8ea..f200bce 100644 --- a/build/has_icu_test.cpp +++ b/build/has_icu_test.cpp -@@ -15,10 +15,6 @@ +@@ -9,10 +9,6 @@ #include #include @@ -95,6 +113,3 @@ index 9419b30..ed9be05 100644 int main() { icu::Locale loc; --- -2.12.2.windows.2 - diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 396f9c54f80236..0b62dc03814e25 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,12 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.79.0 - SHA512 2f036406e8343895b3749bd7769b1dadb48d7552862898842b43eccf51c62153f4683c46cef91fd97228d6022e60a9bdb0726a00bcc74f519e0539b3a69dc0bf + REF boost-1.80.0 + SHA512 b05bdef8bc0f1f1c1183ce97394e008d69ff316e934570dfb50fef49503d7c4dba8e3d742a701b70d8df21559a577b5f114714214ef8974ada36796c221a2d32 HEAD_REF master - PATCHES - 0001-Fix-boost-ICU-support.patch - allow-force-finding-iconv.patch + PATCHES fix-dependencies.patch ) include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index f09d93643756a7..62aad6d2c4bc5f 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-locale", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "license": "BSL-1.0", @@ -12,12 +12,14 @@ "host": true }, "boost-config", + "boost-core", "boost-function", "boost-iterator", { "name": "boost-modular-build-helper", "host": true }, + "boost-predef", "boost-smart-ptr", "boost-static-assert", "boost-thread", diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index 6d641d6e0fe3e5..b2b40a153e7f95 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.79.0 - SHA512 3251573a8ed7c974ea8cddbca086124d7b2503c1da482d3f6a024d5c69632606f36c00e33b13b2de44b5f41a1ed67d06d39014f0cdfb960c109b155f5c7eb3a4 + REF boost-1.80.0 + SHA512 18d1af8881ec9c043a877c633af4f5750ddd867d49c2f801dd69561514ea3590923739b0897c1d46fc34d5cadfb07e4a3f5e29326c858a6ad42047bab1c21685 HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index defe38b84d98da..8a3925418005c1 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lockfree", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "license": "BSL-1.0", diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index 59d7b0dcb46d0f..36fcdf960b15e5 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.79.0 - SHA512 da3fff9756f991a6b3a1529499c4f58fa4ac6167c2dfaf1b7debd45e5a2c1f0687dee1e0edb21d28859971f9e0afab3e1aae3a48b6a39a98dc6d52a697b0f2c4 + REF boost-1.80.0 + SHA512 1538ce8d2a37b93d4d091b5da3a6937ac47fca084132d622d06938157b5d9f6b6ecf877677145531855b76479643b33a3401a1f15723aa85fda71543451d0c4b HEAD_REF master ) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 4907092d19fd45..2674c1c90c3db8 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-log", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "license": "BSL-1.0", diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index 96e7708b7550e2..9e2cfa83a19688 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.79.0 - SHA512 9b3689d4b08cc0edc69aa9f2ea2f182e94d734a407b030b9b41ebaccae20055fae8f8662324abfa1b8217bf10edbc996b6e218df9f9a4bb9dc8952460b5f3cef + REF boost-1.80.0 + SHA512 17c9a38212bc851bef2ab43db1c7027b51d4726bcb8225bdcdc52a84872b3e40e0f37722b9b10840116f200135dd80d850085caf9b70b8fbf2ae2fc99882cbde HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index 33bf21e279e1f2..38c7419a8c4f21 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-logic", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "license": "BSL-1.0", diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index e246791214f0db..f8098aa83b6354 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.79.0 - SHA512 97d7d11b80c5d583ceed3548f294876180d4ff8e0aab5b39c1dc5249300a124c4ac2d8894b3c4e8bec9f7fa42e3886f679a47b8b86feb7c1d9e8389b767bb499 + REF boost-1.80.0 + SHA512 980dd906951ea835433d87b6c8c7828483146ed1e6061af9671008cca0d9acd014795c5eb8297469171fe8d192b46c33f8d18a0d25608fa5b835c19d10eb8390 HEAD_REF master PATCHES 001-remove-checks.patch ) diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index 9571b8de36f5cd..177272c87658f3 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-math", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "license": "BSL-1.0", diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 4bc880c411f656..05ed9875d57313 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.79.0 - SHA512 851b34afc5badece71dbc2bd017e72dc6871ffc246fdedcc3f699b7afdda8b7140016f1f9f44af891aa25bf61aab990ac11e8541ae53a4cae1c25b05131f0a74 + REF boost-1.80.0 + SHA512 7f6e6acedf2896f03d3d7b3557fe58f1fedee44e318cbf8b513eae79cb4c0ad99b8ac3cd6838c1c0d25ba28a291fdda766a76753f940e3a271c9af58e639f503 HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index 1c1b5ce97b890a..2d883046398347 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-metaparse", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "license": "BSL-1.0", diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 18f8bbfc8a5058..416e431d25c522 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -5,7 +5,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../vcpkg-cmake-get-vars/vcpkg-port-config.cma get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) -set(BOOST_VERSION 1.79.0) +set(BOOST_VERSION 1.80.0) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") if("${CMAKE_MATCH_3}" GREATER 0) set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 81623bf1faccd3..9220b8553aa590 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-modular-build-helper", - "version": "1.79.0", - "port-version": 8, + "version": "1.80.0", "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index 6cc86d66767a0e..7181de3f71e5f3 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.79.0 - SHA512 1c62ca4673ca70dd1334ac6380f74db2f3827631d1419f658461bd4ab22a81406a2b1229adf48f92cf827a627e1997409c9911d8bc9ed6a5d5ac320127818fb0 + REF boost-1.80.0 + SHA512 66c2d25f6ee2a17bf378ee000bf367341aa6f11bfc0c029aee53501b77aa37b503393048071f8f96a6b528202954f448d50e166c96cb494fc7914ff5fae65bc3 HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index 479998601e2b26..9c1e9bd84fba2e 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-move", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "license": "BSL-1.0", diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 75ad22305c3872..d587c38beb27bd 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.79.0 - SHA512 0955d8b9df916b8386edca235e0e142f43bf80e93fb44cb6c75ef9190668be04d07bccb68907d55222fa21c01729105e2c18d6a407b953eb62835622ad41b0d9 + REF boost-1.80.0 + SHA512 bc7e7d9d8d6e48fc367d9680ccb230ee31b6a1a54d8ac5ef4d421ce47227d5a0f4170a0e1ca44eff6df7d3bf960775a8371543f1391ee47747f4c22e5565db6a HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index e99a6d0da271ce..6c916e04187498 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mp11", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "license": "BSL-1.0", diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index 4af9f1642e192d..2881fa53178ba9 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.79.0 - SHA512 280b35c991741480a4ee9ae97c11ed14a108b200344ac5b4af2e5956041275dceeb1370320a90e30ac12a0ab0667afd80910776b1f0e404d5bc3637f53993010 + REF boost-1.80.0 + SHA512 76d93705a76a7e1e805d48106dd7cb53850db635af70f3c76f0cdb5c86ab417e1433713d5e30431ddfc92f77e89b9cbee6b312949caec88f8586e8a43ecf2962 HEAD_REF master PATCHES fix-build-boost_mpi_python-on-windows.patch ) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 8d65e241f4b638..0e9ec4abff3b6f 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mpi", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "license": "BSL-1.0", diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 5c086ddf7461a1..1688bf7c9f02e6 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.79.0 - SHA512 55d1e6481269070d7ec45b11f19dc437f56ad72c869b82b312278cbddf5b4ae83dc70d74b2f0e99741f68d7c07d401b3c5c48a119f15825dea7164ea3cfcd275 + REF boost-1.80.0 + SHA512 83b34d01ef1e45c9a71324eaf07b897ea1d4848ab8259c54f1227e16690ac399155f7791fff51063521ba62adee8ca97f77956d526461c80f77bfe1467bba293 HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index eb4badfe4fccdb..5f6d8b13cce6fb 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mpl", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "license": "BSL-1.0", diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index f73c01846a5c81..572e4fe4c61c98 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.79.0 - SHA512 29ddbf189b699d1313950b7c30d2ad98e0e242508f9a8d81e98c384572808dfe55072af41f5c036bd2a51d39d7081d10c3c79d9f8f7a9245a67d3840974cb1b9 + REF boost-1.80.0 + SHA512 52e7e59d54d108a260c059f5e668b802fb0535fdeab9e0d7901eae626ab4a3b785b4e0b87694e0732993f9813f5af6f7566d20da1f503df207a1b98820cd9e8f HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index fe38a7327d35ee..36d46c9ad51f6f 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-msm", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "license": "BSL-1.0", diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index ad92053dec0b89..cd314f6a602be3 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.79.0 - SHA512 5665ffa1b298320cd525b3d22a5e59c1c88a148672ed98295a00957b05316943f081821102c3881ba03b565d0c0879d11b0d3bdf1221a92fbfe4dddb98820074 + REF boost-1.80.0 + SHA512 5e66cd038dd9d86a04b1631ba11245e0fa6742ffa73b12a2b09093891f0c5ebb53844cc0c23acaece067dceea721a1f003360bc90c632e2eab90a5446359123a HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index 92ca481d6b8d86..5c28d54ebe9467 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multi-array", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "license": "BSL-1.0", diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index f0a2fe3b66abf9..e280407d25eb24 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.79.0 - SHA512 359d68e58977e84c6fab0a0e6a1a64ae7589437b0847c0a492ba6bd0089b023729bebfae1c7f4e2f21a5289e11bd0dfa643f34fa913dda59dcecb49dd8adfe63 + REF boost-1.80.0 + SHA512 0a584c17acec728791b6094da407ed708fa81733910858310397d25473cfb0a0c8cf8dc702e5a3b5530483cc465c6578d0dc3fbee1e8af8cde2c2435c953d365 HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index 778c02abfe531a..232784b3e69e6d 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multi-index", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "license": "BSL-1.0", diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 4d01bbd480b52a..0a69f07c03e926 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.79.0 - SHA512 feb6f97d124032a22fe48989fd783242ca2db1adc3f821e36b6798fd068e038037dd32cc6c7cb0c3c76fe96074c9e7ff287809edc944d4f1c4f1aff686fda57d + REF boost-1.80.0 + SHA512 b444a29f9f6d8739ab2f9b73c16c2e74556a8c2d92837d7fc4b0c5bad68479381411bfdc43247643560b5b6ec8645f4c452ffddffc035350aaf40dc081f6ff81 HEAD_REF master ) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index 6b7a99432415b3..2a0884b2ab53fb 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multiprecision", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "license": "BSL-1.0", diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index cc1035d63aeef8..06cff6e68e0fc3 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.79.0 - SHA512 47169153491cf7589f8e0080c609caac55388b5bf89577fac60a1c7e94a46203652652ec904898a8f9b84319fb9f92ccea2eb2a892b49c69b82270f975c2cc25 + REF boost-1.80.0 + SHA512 9f9c1cb3586a9c780ead2059b19257697151729a90afa7f3f58ce887f8a4c3a312a0b3c6929eb9a94e9c85bfcde0f7d6f417b8b613badb92a2423707a717e805 HEAD_REF master ) diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index 67021a29c2b73f..05346e5fd90753 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-nowide", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "license": "BSL-1.0", diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 445031044916ed..90a16361b06ebc 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.79.0 - SHA512 87b357355ddf1dfb565e770dbbbaf6b8b3d7005237ab01610170152d9cf4d6f3d7ba4bec8b127bce876abaf322af46e92f921f39b3ae41bd150ed29ff53b021e + REF boost-1.80.0 + SHA512 88013af11aa4b7eff97a905884d1afd2ca91bff990946f3a23bc7237dc7ea9f85ebdedc19aabf733d09d8a9662f57d89f2f1dcac83a4bd68b423f0c8144154f2 HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index aa96a68ea64cf7..de06b6e7164009 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-numeric-conversion", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "license": "BSL-1.0", diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 57a5b658e2af15..3b8103fc7ca3f2 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.79.0 - SHA512 f774cf8f0b38472e99241be3aae5b4f7eae6ed450bba654a6d718c32a0e7c5e38c1e40cbb426d83428e97864a691c6522352c045f8fcdb8ca48ef041b8b1b3e2 + REF boost-1.80.0 + SHA512 9bcebd443556e3d122e4474b728b277d801195adc26ba4e82ee6609c6bd1c902b1a6220d8d5c3856be2daf04b86dc0a56d4bd2d56ae1a17dd88a50b6fa5f97f3 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index ddf84ae3b876e8..55f2f09c829b20 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-odeint", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "license": "BSL-1.0", diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 6773a94e94ecd7..58e1b14670af2b 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.79.0 - SHA512 43f2a88c39049d9a419af63fbb9c2cbfcaad8a691289a2085d646b2b98711879801662ec6486cd83509797856c9ec8492010e9deb36da3a4b40e6df81c2dfad0 + REF boost-1.80.0 + SHA512 87934f110311e329ec7d08f6a16d17feb1e550bba2b66d261e04d9a367136e3067fedd5ecf8abd19fb68876b7bad95cbd2b731a15f786063fe50b51066ff8870 HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 9225d5d4af2aac..b6f18feaf0db14 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-optional", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "license": "BSL-1.0", diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index ddd8ac2fa5803b..3ce82b566f9201 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.79.0 - SHA512 e0e4587ea19e70047790e86496d85a7c1e310e8b33af99dfbcad330243b9ff390d710cfebda15a94de4497f4a85498c051c043adbe8c41770b747a742a34634c + REF boost-1.80.0 + SHA512 0ee69623ddfda236dee7c6a07ed251cc5a2e17523078fd4006a5fd46a06e670fdfe833ab48bc46f4859144b42ce8da269d5ea941094e2eb5207ea1533939ae26 HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index 4ffa96ebc3dee2..4df2807e589667 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-outcome", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "license": "BSL-1.0", diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index dd8c5fefb02cb5..e9ffb81cc821eb 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter_python - REF boost-1.79.0 - SHA512 caadacd40b1e51db7b4e0e42e920e8d3492fdcaee29760c398bac64a614df37f8e103c31dadb8496bc11312791a2bdd60b45a16c5019f11c601480019d7bd181 + REF boost-1.80.0 + SHA512 377deeba670b75f36601e6e9754c6ed9a2f68e5873314b1a13eca1ccd6f5a5865256429c316963b8ee7208462492d481467580d846359f886c854acbd7f42ccc HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index ef3b2eb75dcfb1..f14880a6bfb594 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter-python", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "license": "BSL-1.0", diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index ad66cbc7d3171e..b48b8b05748e71 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.79.0 - SHA512 cc81271b12af89bb804187dbe004f011d24960419b4f5ee3cc83953eca09522d3578ef9972f0a22e2e03406fbb782abd6d12e584c55f0cac6062296b762c37e1 + REF boost-1.80.0 + SHA512 492718a20f284c9b509efad0acdf4522daad0d2b9128578ea38c98f2386f93bd33a5f5b3cb866bc95af831020909ccc0d1760478796f7517339b66b95cdfc0ef HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 6eb74f2fd8520b..5a3208a26e1f21 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "license": "BSL-1.0", diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index cfbcd21edfcb4b..e9d96e9787d5f3 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.79.0 - SHA512 bcecf3f189d2ceae2eed25d2bc0e5a20e858829f6e0ec281c523d7391e4340ab07847a8e9df78a69c2afd3235310f6044c86802b9e34bdbd8f9294176ec991b9 + REF boost-1.80.0 + SHA512 f0c8f70730c41beb1a940172f53cb394146da4b3e3e8c6a0ed15162747254392743c9bc65bd73e96926bae92414f135c4e0d88760e587279227947289e902b51 HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index add024455d0d82..ee1d43a12ae1f1 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-pfr", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "license": "BSL-1.0", diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 34df6d961591e7..64cb1998d335df 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.79.0 - SHA512 4520aa72f01fd9a57b23262247f68d690eb1df996ca1f3119230d78c6b37b49634bd895b6e32faf4b6ddc8367121d67dc2e8ece0da3330a55eee51a3a66bee31 + REF boost-1.80.0 + SHA512 a8afd8d8318f9267cf4021de62d85332503a38b3f71ee6161f3b459e8fe890ab89813e99ac5d082b2dee7012797631b6641881d2964f5e964c6000ca02a13703 HEAD_REF master ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index 6ac14bf4bbbfd8..bc03303b3a4a8d 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-phoenix", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "license": "BSL-1.0", diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index aa1dcd7d4a5bf4..37a267de7abeeb 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.79.0 - SHA512 f9cc05b4a5537c4aba68c18ee04bbd7363bd2830c6028578955d2e694cd45e47ac10f73326b79616267a8edffaaf4aea44c9e5d3f3c473235887542d3efd10cb + REF boost-1.80.0 + SHA512 fedd917078448e42e5ba6542acc32b2d5a19bdb70c1ed6e3345b799ce4d0bd6f630c073272d7b13bbbaf01bbf19073e0e31661fb5aba7a44585e3d1d35a22d91 HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 154d38bc056778..6a43da7cfc5ef9 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-poly-collection", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "license": "BSL-1.0", diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index f0cbef187e2038..99559dc93382f6 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.79.0 - SHA512 3df76a3777155cffd449c2a08cfe271a2735202e514a37029afd1800e4c1d887403e37980f3c6bdc056a0b1333b55e674bcb9acbe33c2e5ba956ac2995d4ed67 + REF boost-1.80.0 + SHA512 2b6751c422e9cbc5369389017dcf38f2c113ea321f2b534a40fed23ea12b5e8897e67780656525f72661e3514eb13918928f6697dac49e338433f53d5816d4f7 HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 8a787a30100fb5..1ce8e71fc7a23e 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-polygon", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "license": "BSL-1.0", diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index 6ee1c885053abf..93ed3d71556484 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.79.0 - SHA512 ea62735a0f53bf0f94fd994055dc422007557f4a42c35d9b76259fa23e01f7ed637334342e3127d725a187610fff9a76bba044837bfc545bac21594ea8d58500 + REF boost-1.80.0 + SHA512 ba7b65256ae92a8fccfafa067bfeffa974c33a8258db89e1d2081bb98f8c8904611ddc7c3f381559b3af4518fdb3ae9554efed9bc9455fcd8eba83bf29137b67 HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 590068a8c5e4e7..396494d84f9c74 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-pool", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "license": "BSL-1.0", diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 97635dea37e01b..beaf0d8d583f05 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.79.0 - SHA512 329616d4b1e1e160b92f3f33f3172eeb124c9167616c29443804a817230c747fb51f211b2727b28c9a9a50364b4b7fb535000f22572e6db4f9e4b31b8ca375b9 + REF boost-1.80.0 + SHA512 1435c629f69bcd36ba4a73da2854a11f5faaacf09bd715d0d4e2f87625e53761d4e047092a6d3b26ae3cf7d9e2dfffedaa427f9b92cc10f63bbecf9e6cd8e180 HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index fe62d6055d6380..20ba0b25241ed2 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-predef", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "license": "BSL-1.0", diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 528dae4cd08569..58be5c26195f86 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.79.0 - SHA512 1c9a03441f11d3f2c0eb33563fee28261ffcb20ef60d1b16c8a4fccf20158472574aea70e674bbcd67cba19b5b76bc93e886b6a7a9cb9de462de7597d00c9f06 + REF boost-1.80.0 + SHA512 01c1d2b77b1655364b34a224ef532ee4a8691f586e5ee99d34f9a2cda8624830573002ec812264a474eb174af3f19e9524cdabdd3de112ce8d1f3497e5596a52 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index 4ecfa662499735..e449c7608f3e67 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-preprocessor", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "license": "BSL-1.0", diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 7443b5f2101bff..45b979af3a0899 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.79.0 - SHA512 f2d4fabb6d1c08d67394733a325b50b9384e6dd6fd7de163a5aab1fa70b881d26f13f2e48e8cb7df53598e2c5989ad36bd99d1aabc736eb8b150a0e4a6c17ff2 + REF boost-1.80.0 + SHA512 f4f394fbc9e10f6cb0cc87d60c607d045eec6603a9676f416cffe19835613acc824b2aaddd25e80f8f12f11de519620cfb07ace68b2a811e4e0a00f959f352e9 HEAD_REF master ) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 8a0d8d549f8fc3..e420f24f93fe65 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-process", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "license": "BSL-1.0", @@ -15,12 +15,15 @@ "platform": "!uwp" }, "boost-fusion", + "boost-io", "boost-iterator", "boost-move", "boost-optional", "boost-system", + "boost-throw-exception", "boost-tokenizer", "boost-type-index", + "boost-utility", "boost-vcpkg-helpers", "boost-winapi" ] diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index fca7622b45ec8a..35413ec7faa605 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.79.0 - SHA512 250ededd7a3933413354ecd808336cab4e50fbd41cb92e66ee64d7e8dd959872df3040e0a08683b150e043a92da5fc4e3b1373d642adc4af88d8672a02077098 + REF boost-1.80.0 + SHA512 0f95b1d017793d5cb6ac05b0d28afad05fd2e1e64875a7c9f1f5082e9634106af0d6e82312590e24ef709f2584924e49759f11b91b6014e1e20d17d317266a33 HEAD_REF master ) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index b4c55ace0ee312..0b92e231be7cc5 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-program-options", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "license": "BSL-1.0", diff --git a/ports/boost-property-map-parallel/portfile.cmake b/ports/boost-property-map-parallel/portfile.cmake index c6be30f8d7ec64..dde291335fc2c2 100644 --- a/ports/boost-property-map-parallel/portfile.cmake +++ b/ports/boost-property-map-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map_parallel - REF boost-1.79.0 - SHA512 fc4dc74098abb84d258377e63277ea2ef2d6d8bdd4d1f75bde65c223f4854d231c4f4681454b8475cd5b623f98220f31b51fbba2a9dba0b299f5a9b260a55ad3 + REF boost-1.80.0 + SHA512 02427c033a1325e77106d5b3613af4e3c6ff6d0f2322e688bf3dd0390367c7a727d4ebd85cf811ec3f0034d89b69e20aba57c96bd73ddbe626d20eae78e2e367 HEAD_REF master ) diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json index bf7ba49db4fff1..688a607ddf60c7 100644 --- a/ports/boost-property-map-parallel/vcpkg.json +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-map-parallel", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost property_map_parallel module", "homepage": "https://github.com/boostorg/property_map_parallel", "license": "BSL-1.0", diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 5aaed8b5c8d29d..72f49cc0de9fba 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.79.0 - SHA512 5265b559b942b581890d12beb625d83a4a0261cf3efb0cb381b4c5d1ee178f1ffabd7be1782d87747b2b2a0a3e5ceae8587f8728cb30ad4fbff49e1d15f9a645 + REF boost-1.80.0 + SHA512 831a8f0973523d7bcaf45a7ad85c9c42a8df48a6d23b44d9282bd3fb980d7f88f73b51d63da535a6cd8c189c1f955ace2b8e337f7f669ee2cffe367503265265 HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index e102df02f8aff4..09ab5908dbb36f 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-map", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "license": "BSL-1.0", @@ -17,6 +17,7 @@ "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", + "boost-type-index", "boost-type-traits", "boost-utility", "boost-vcpkg-helpers" diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index 09a8d59ba862b5..1b99bd07d77c47 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.79.0 - SHA512 d0c7fbd9c12cc07d55aafd0a629df668681fe170a2e231d3de166caecc86e1a8751416a366ae247327dd8a24dc2aa945ce125e3747af361325d7f76187a687d9 + REF boost-1.80.0 + SHA512 8b26fcf02a32dddcf3115a3bb4189a1d472e1f1596f42918002fce43bd9554be288a873e23177160c607bdf36b91f4f3ff70625294ee0c536b2d9b1912e6f118 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index ccbb057d6dc2dc..b45335f45193a2 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-tree", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "license": "BSL-1.0", diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index e4de4a00fdf8d5..1894c508cbcfba 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.79.0 - SHA512 9237f04f926a53acdf186611487bfd3b33647f7f3e90b4ca09159fd7c230dfd7ffcb5dd7c56766391815a4bb2f77d98182e5eff39a4e1207d32d75f294f8f97a + REF boost-1.80.0 + SHA512 996e7d1670d7b6b1389b88bb78946e8afbb37de87f1e819093df35d3237eff5c6d84aaf66ab010a32ff897b73d8a631b1fd1afc958c95cf85295be57c7cf1e1f HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 21fc85e34d9c10..44e6861144127b 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-proto", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "license": "BSL-1.0", diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 3163ce1d4b1365..a130abbfc6e492 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.79.0 - SHA512 65e90c815331ff3ccb1fbec2745e03beb5f97431c54a9eb2b2d4813a2709e655313ff3d30e06e4fa5f84aa4488cf1c17cfd7e0913498dcbd11a706d8ba2f71d0 + REF boost-1.80.0 + SHA512 ff8293ff63bb4bc02d9dd7237154c28a186bf968fd1f03866976ab5a245636db2b074922671a3ad1687858fb8d7ef86c251f9d39be0d5763df1c45ecb56e4c40 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 0e4da19c8dc590..34adb83fd94b2c 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ptr-container", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "license": "BSL-1.0", diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 4aef0e8c372fcd..80f7b1f4d1d7d3 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.79.0 - SHA512 de41d0eb76709c7aaeb2bf7a459c0c3a3372e0747e2261773569c27e8bf78baad158cfb3bc4316c3073b000665f6faf664bcd34a2f68c40382b9d3c935ce2c42 + REF boost-1.80.0 + SHA512 0bcb87196b7d9c621bb4ee1fc70ef08b9faad5d0eceb0fa03a5c61316e71ae51f1efc4568c2259c498b60dd6fe609b4ba1d92b9a5ca10f61d78cf106f7a611be HEAD_REF master ) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 168ead86175e1e..b82f65852e5912 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-python", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "license": "BSL-1.0", diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index e3ca1e4e4d755d..cb4360c4b0cdb1 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.79.0 - SHA512 0c9887826884b8b75acfd4cb89c0817ff8b7000ac326586e5efa6950f0812822024eb5d6fa290408b2babcbc2ec5e7e135483f793ae0b5786a8cac28598cd748 + REF boost-1.80.0 + SHA512 1375e31e49b9b63624dca221067e0e85482db9fea5e9c77b58d17b49076b35bf25a2c781d1a7ac0cabe1e82834bd0eb58a428be18a613cc7ae286ede8931900f HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index 7aa7413a03b31c..ff8ff35cd61ab1 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-qvm", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "license": "BSL-1.0", diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index bd7524d77d52b0..7d013057c64ebd 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.79.0 - SHA512 3a4d20ea69c4565357bc4098a3acc1281903a6118280cde056755ef2fc184cccfcc7b6f5c29b938b4d0f0d41072fc9d174e524e8c48fed6bcb0cdd1692afa01a + REF boost-1.80.0 + SHA512 8989ca6ecd45066b710d1fb655f0a9b67481f4a08a41738126b6a5ccc15152d4bddc9c41f4afd893bbca5025c8c93dd6fbaacde29a5065bb6523d24681fb63d7 HEAD_REF master ) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 7e8eb77ceb1cfd..ead0979197ea2b 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-random", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "license": "BSL-1.0", diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index a85f4477453a5e..a0ee849eff180d 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.79.0 - SHA512 d612c58f0a75fb63f23a4e89d5eed3feda78617a3cdad0c0ee0c44184fbd36cf1cb99c59b94f737dee2588ef8dbf6ead05b94c584dbdd4acd9fdc1fd59c8cac1 + REF boost-1.80.0 + SHA512 8c41ed678c346be3b608abe0dcb9b95a4872c8244d1869be50abf6d121ea4e62b59a77f0639bd13c810ecf86a205f80ab8b4a5f92b433cdd5be209f7d8346504 HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 2c147e12f97deb..ba1203a828114c 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-range", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "license": "BSL-1.0", diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 90df48714d2880..d72f157fbd8d8c 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.79.0 - SHA512 d3053b442cf2a00f0644d1f0ef438c6d2745edab3a6b0efe885e656c2072acbb09b69155bf7bf62a239820eddcecbb93be63c66864915a76bd169ec5916cdf7c + REF boost-1.80.0 + SHA512 97a88d841635cb85b39d394721bbb3065d4c6d60e2911c27a4f51b01f80872b6cd814ea19711cf9628b4dadf78a704ce68c43c8d31a4eca1f5120b8441375631 HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index a31509b11b4905..9dbff0a658e251 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ratio", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "license": "BSL-1.0", diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index bdc00bcd7b25b5..6db5ffd028a962 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.79.0 - SHA512 9192f72442d5b7037a0386cce26d412e6f576eb6352f259bd626ebeace472037a2363be235e1f1675f4fa5ab41212eca58045a584e81c36782b77d6965032106 + REF boost-1.80.0 + SHA512 58a424b1fc4eafa604362b4efbff706bf04792f163fbdf6cc8d9a1c93fa15fbfe1bebea401a7f533af2a57d8fa3a98bba92a75204bca46050ba4cb84c6ac3093 HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index d6742887fa305b..090b61b8e0246f 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-rational", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "license": "BSL-1.0", diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index aee64fd7ca02d9..63a3713a0ab29e 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.79.0 - SHA512 69cb333d35c81e24ec98e0d0498313bfb25429dadc8ded693b9fe8cf1fcfec489e3c3ccbc0b68971d5d7c1f50c29167fd85ca464ddadb64a7798b914f51d35c3 + REF boost-1.80.0 + SHA512 266811207ed3eb91b436b42d99a3d0d6bfd7018d379a6116e908471449e5f4686bc940c268d48fe9b07be7ef68d9e01907eeda8c16de79eccaa6e17220468320 HEAD_REF master ) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 6648cb9e7bb2cf..c20cb37d379c85 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-regex", - "version": "1.79.0", - "port-version": 1, + "version": "1.80.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "license": "BSL-1.0", diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index 14b6290f56c75b..68d572a526b91b 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/safe_numerics - REF boost-1.79.0 - SHA512 54b9c3e3b1e7f58bf76fc332a6090dde800cfa3367a7a3848716815fba07ac7c03694e804af1665d0eeb0b096613bc40a937f81076eac73305f3c58ace9df3dc + REF boost-1.80.0 + SHA512 ee70b13590bfdedeb756f42d566a414fc05d5b079876f514daba4bddfa9420420f720f7bdba5006327766e3d7840c82f74a2cab0b35971f98c571f4aaf06dc11 HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index f51473f657877b..030bc0475e731b 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-safe-numerics", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "license": "BSL-1.0", diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 67856a860849a9..fc436f554e1bf4 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.79.0 - SHA512 92b4fac0a73455baede0625f5b56c8015e86ec61f90722b5ddb6c94a52f8a329ffd979d51e287b5a916f0e003cecd2bf6d6f246306499b423d98d4f652acc7f6 + REF boost-1.80.0 + SHA512 1cac78c81fee8ada8eac3780955b4930dbf38f8066859aaca6db5d0eec9d285b2ee4bf87c2d412725c9558331a3d13f66c315338cc0ec6ad1c0c43086dc2a4a4 HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index f4e7b14c3efcd6..7cc7d25170f1c4 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-scope-exit", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "license": "BSL-1.0", diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 36d25f30beb048..f0e9775ebeac5f 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.79.0 - SHA512 d2b7039a25898d08ff586b1ce25183412defbfe6e6a7b6427ac54553de88ca079c1c15b92d34c9e76390692a22bc8b7821a53efc6eeb01a6520d4ce1d2fd675a + REF boost-1.80.0 + SHA512 89140a1385a5bece0b01b8c366fd007163fbf4cde21db98e3f485602983af180a41b5d2906e9d504e87ac7739c97a7d99f9a52c40d3fa0c67386c2e06f380ac1 HEAD_REF master ) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index c48ad725b9a1ae..dde45cf1f9bd18 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-serialization", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "license": "BSL-1.0", diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index 94ed6db0fdf06c..bf05debea1f332 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.79.0 - SHA512 95739f7eb98c5e9fa5c7fb02d076239dc2f2fb3849b01a22298c06ae4454775f6b78b5c9739a5065d4a1e2ee30e771e5b3c1f3e567c4d76969281c5702ab2a50 + REF boost-1.80.0 + SHA512 e6231d27e3089df7d06ea74e7d58439bdf5b5c785e11cf82531166b0d7d3f0f5c0d5d60e435cd2b8e28457ed96ff497e3abd236ec96c7c16a965a59962b86726 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index c5262128b3474e..523cbb4fb8e5b5 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-signals2", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "license": "BSL-1.0", diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index a44474b4e7ff4f..fe89599da4d47a 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.79.0 - SHA512 fe39bf66b08e19fee5210969c5d71e9195b30003a48941c1002d718a2ab8972ff811302163d924efae54304f044e74aebd6a69894796dcfc03b09b10347e6fd2 + REF boost-1.80.0 + SHA512 044c742f000e724f1d74eeaf24bc4cfd61e2d95fba3273f55930d98cc660243de09a16e131a780731de137e68d8698ae5e91b43f12e1b0179d8fc076cd2d660c HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index 9faa1eef0faeb7..85aa92d94fc670 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-smart-ptr", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "license": "BSL-1.0", diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 3aa47ece14b374..4a16105859163f 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.79.0 - SHA512 779f1e7d78baa1147af8cdbcd5aa38576c8977ce5e17ea69b38028c6ed3366812875bcea7702e3efa3c6b55c941a4993ae68ec576a0775a61da0a101356632ef + REF boost-1.80.0 + SHA512 6d7abe931fb4267c83ecf5505cd0f4418b99b2d07de3e9432cb3c2562d0c94b44f6585b3cef5a01a3f0cb197464627e1a902993d712bafee25e833beef6e0413 HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index dfcc21c6c6db35..628cf55cfe4475 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-sort", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "license": "BSL-1.0", diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 3a5f1e373d3469..92672fbba8b234 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.79.0 - SHA512 6b1c5c0995493039d6c1c0de175300813cbf67f8e347e886c0ded7432fdbdd90faa59d429c313bdcdd2afdbebbdc18d9f3302090e9915db949624f83fa8ce1a2 + REF boost-1.80.0 + SHA512 189d3d4216d37a78a0241f616d365df24a1e00abb6a84031be1fc5189b596f182c4d4002cbe5ffe0a62d7d2f0ef1cfafdab1ad18bcde1767ea560fc9104a848a HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index b5ccd4fa7a8b47..1411bde9494975 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-spirit", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "license": "BSL-1.0", diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index da5901baeb0a81..8de48737fa34b3 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.79.0 - SHA512 d4816c160c0daf50ce1d864aba8be6e5216b356d76d2b2b5a4952e37aad557f1b4e59c1e7198c4616f3a5d3e92fc59b2405097b9ab4b6ff769dac0ba30cc3621 + REF boost-1.80.0 + SHA512 e4017745b1d56721321497e343bc7bce448ecaad8b184971a98c1c89d9f3a9766b214cf4887ea242d94521a22c40ed8211e249f0795a114f89c7d55066fc42c3 HEAD_REF master ) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index 28cfb42adeaafc..cfffa939f25681 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-stacktrace", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "license": "BSL-1.0", diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 54ec5240626ef7..9fd6a438d19fc1 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.79.0 - SHA512 db28105e06764987a3adcd2e5a30ef8803b862a4d1176da58f4950c10f4c06c174de9d8157c3bcaaa1cad81fbbed03f85309f2bb733ca177e12dd9cf59dc6eb5 + REF boost-1.80.0 + SHA512 c6248ba5e5ca325652ee54c0bba021662c3b04d9d1bcda68b37d8d72ec36a7427354e986d036577d72e3fa4eff5d471327a7d8e84ebacbac2fc9ea3b0f7ef04b HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index 38657695482c68..debe1efdc13ed1 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-statechart", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "license": "BSL-1.0", diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 6e9b3d0b132ce0..f31c73e41e6de2 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.79.0 - SHA512 3b0a26ec1ac9887610ebe68820c05324e1ac7a8ebff46333577b0d6571a512ffdccffc24124fa90f8cdf322bac8a66d4da523c8a872b0ff6e149fab4e921bdd3 + REF boost-1.80.0 + SHA512 86ae616988f25bbf69b509ca8ec01657642aab9d69210011544c25e3e365d5eeed7161a3bb48b5a99d174c07e51240e7d1d92a9229650b4da327cf2b55a95724 HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index 6546cf01c60f34..9b381234774978 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-assert", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "license": "BSL-1.0", diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 4c9acceea2f4b6..0163ae7373d977 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_string - REF boost-1.79.0 - SHA512 bd94db596a4a8e4cdd1aca52fe75dbe46cd1242e67edee5f5fe236d39cb3368db7268ce9de6be5686da5fa19105c82616a3569b27c5c2e9974db9d18df73a8a7 + REF boost-1.80.0 + SHA512 3f96bec4f4f040564adae7e89c755fb8db764be47152e0d13c13dba5931f4778727ffcd549c5786c44e595d9ea866e831bb4dfb5f6e6c08470dbfa1188e7847f HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index 05c1baa5ff4e7f..4f5ea500a7cbb8 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-string", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "license": "BSL-1.0", diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index c6fc4875dcc2a4..5e9cfc38cbee63 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stl_interfaces - REF boost-1.79.0 - SHA512 e41e0465144ea65d10524f560a90b3a0ad1c60af8f5b679aba7e1bb12a09fccf9a4e271d6e1f6eff02ce7c444a21a8b9ea38709c5c6836ed4d7a35659756b0b8 + REF boost-1.80.0 + SHA512 dddd56f03cedb9a94e7dd9a2937a57798c91a833081fc568778f185808896fc1e6b8553a423ed4f4ae3bb25a40128ffc679a8c18671fedba5dbea35c39099ad2 HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 20b06ad49fe929..0661b06de2d354 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,12 +1,13 @@ { "name": "boost-stl-interfaces", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "license": "BSL-1.0", "dependencies": [ "boost-assert", "boost-config", + "boost-type-traits", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index 3b3a37f1b2506f..ffa838b8c48807 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.79.0 - SHA512 785aa2efff0c1e507ceb32a0d7f0c1034960ab5a87ebe45cf4acb5020d8cfcaa810ab3218d06e783ff7cafe661630fc67373d649865c6c0603b2be0c05b09b04 + REF boost-1.80.0 + SHA512 9f3365e993d27c6ca46015ee3111ea2a8962d6de0bb2b45652a6bf26e5be025d70f427ec92ebecb3ce1980220e4540d2dca4180a3dcdd1ca4006161cc1bf5402 HEAD_REF master ) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index df081b0f2bac44..ea6d0d28e06f44 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-system", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "license": "BSL-1.0", diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 80ef29269d2f93..7a01e23d63e224 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.79.0 - SHA512 040eb3137f5842e65a4a607417410d09a118baf1f92645974ba65e9dae4d6b6e727f28954d1733a96a83978da8d742d050c7ffc3013afa5d936efc47841547b9 + REF boost-1.80.0 + SHA512 0848afee0070950a2e3b1f3a4d297992cf3789d85b5cd64ac8894d629eea02d7830eda2a359567c5d2c9d1249accd934c7f9b422f14df2ccfa793f65a410ff02 HEAD_REF master ) diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 323c0c08e74036..2d9959527db974 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-test", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "license": "BSL-1.0", diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 51a707590df990..55a38681f9dcc2 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.79.0 - SHA512 96003963e8d24d5436cf093b89367a0ae979fc0f2860af0cd7819976261987559002b68b7fb17030eb635622609324148a127beb2e462079fe17b5a983550111 + REF boost-1.80.0 + SHA512 f0ffb8ab6222ca667471452a953fd84149f477c052ec28228b6899354d766fcfd337f3c4202c5e9eefe71a0999196b2e76b025d13499554e1eafeb961d6c993b HEAD_REF master ) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index 7b0317dc3ca6da..39b54759b1f24c 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-thread", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "license": "BSL-1.0", diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index ad9650a61b3600..e6e939c28db6a7 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.79.0 - SHA512 b8c278d9a77ac3ac86d810dbd242a7abeeba66283bfebb66e191aa24ba94672344cf1473fddb9d143fcda8a95cac3020693ba6c7e798cf27593bcbd179ddb50f + REF boost-1.80.0 + SHA512 f3661a8f6783105dd931df6bed9349a50bce035e26c701bb3bf6d78db04c6ac1e3e476297b2465be27f0987de57341e9e57e3c18f279aa4289dddc4496ebd9ac HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index 9a7979d881eff5..fed036a4c91b7e 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-throw-exception", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "license": "BSL-1.0", diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index a0d42b3ad66370..8f8fc0fb5199d4 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.79.0 - SHA512 525f69db7b710a5d3f39b7c161e8ca60a72e48a17ccf0e31522cb5a0ddeac8ea03d9a41122b6ac25e8fbe11e28f563d8b52b7cd10817ff80bef597fe91860fe5 + REF boost-1.80.0 + SHA512 51fb90cbef6a044a72f6a05550254108db6faeaf67bb8830e764fa3c40f325ba0d3351228c7a88b0c320d112e2d11eb67013c2da025d084ab5846a1b298b350c HEAD_REF master ) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index 1155fb2c8abfed..3923b673e727eb 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-timer", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "license": "BSL-1.0", diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 157c44291a2010..509a497bed353e 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.79.0 - SHA512 001c9dbfc415aad9156b6d7aa9450d31cc7b02746eba5d089c9932bc99996473793996045c30f5e17c1e2ea6698ad56c0093ba420e3d7861387dacf69974a8b8 + REF boost-1.80.0 + SHA512 3a96bb3f6a91d9f14b0450a6a9eafcc336fd9724db49a0ef84fb8a1a858420959cdfb2e7375a9db2f82d885b257229dab5c586196c61ba6a83f9435fc1cc1f37 HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index ff833e5c6c147d..f529dc622f957b 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tokenizer", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "license": "BSL-1.0", @@ -9,7 +9,6 @@ "boost-config", "boost-core", "boost-iterator", - "boost-mpl", "boost-throw-exception", "boost-type-traits", "boost-vcpkg-helpers" diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index f1246ce5cc4d64..5d20a4baf3631e 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.79.0 - SHA512 35c0be969efa9c3144efe4a9e903aacaa7469ec1f7319fd9ef8077e00e3b96557fa9a8aea5d77275cd59f7de434ccaaddbbf72c9f1c5634c98fe996144a24ec0 + REF boost-1.80.0 + SHA512 bde1c576d526a9eb51419371b05bc3104de8458b5d4ecf4fdd8fd6d79af4e31f79a6e09fedd6515930098664a254d0f34ae1c506bb8be88dcd038355e7f8c3e4 HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index aaf16ee59e3b07..374904ec9f6be4 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tti", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "license": "BSL-1.0", diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 1e3c1b8faccde6..effab5138e3150 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.79.0 - SHA512 ef121e99ca697dc9237e824871401d88cf3edbbc394897b58157b66de77feeea85f664e285d4c10c8a24ebbf8b4e1b361b1ff18cc9d764dc4a1b2eb06f17e3c9 + REF boost-1.80.0 + SHA512 4c7bf3efa65405d64842201cdd62e0ed0a0e7893ba7b9e6f9162adaa065c481afefecc50fc7c731460b7829ef50e598845029926891519971bec11a896a3c2e3 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 369df13529b6bb..2675c3a18aba9d 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tuple", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "license": "BSL-1.0", diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 370219be6ca2cc..365425e62e8363 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.79.0 - SHA512 6da75295b96a61064038c93cf30ac06670f1856e4c7ef0489a656dbcc8547e1ecf42b4e52dbd28f63e1547761af89a21fe953d7fdaf664d759d2b50aed7be7a5 + REF boost-1.80.0 + SHA512 7f37e8343e95e84b4d03d68c82960a105ed5c7b08d1ecc9a745cd2a1fa772776c06548a0870754f20d9113cdcf92482b085ca6c8db6616d79aa895edf164c129 HEAD_REF master ) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index af4fc252cf88a5..46636ccbc9de10 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-erasure", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "license": "BSL-1.0", diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index e526b0ef9321a3..fe6fc53901bb7e 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.79.0 - SHA512 47c5375c0a719f8d60be8d4550b35050e925eb1cb3b6e7825f6a9b1e8269d9983cf879882e03e1b25142871609e2b213e0a6a1dbafd7e5c27c6f0bee8c6d1588 + REF boost-1.80.0 + SHA512 9ad38e8560e327ea3f2f419e9b264bb78864bd7a518d90fe65da159d989720f9125fe5d710ed627a61a523e61762f672a7763b100e474cb9b9c54bc592ad80a3 HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index 6833f900c916e3..e032a963b19367 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-index", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "license": "BSL-1.0", diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 66749bd77862ad..e9172b2717cc32 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.79.0 - SHA512 ab325e4db39849667d2ce4dd3d7e77175e51909be9825d0edc102ef1edf75298744e5351c8891851e1cbc939064d352808a21753a7db429585ec34587be7374f + REF boost-1.80.0 + SHA512 27430430f709f9d863d83153cf93299cec1c656e5b304d329a5044d39e6e16b3d779874dfe05f4fd6ecb4abaee92c9675739862e443809b59a5a29449785f4b2 HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 0d269a244d57b2..f9c2aa568116dc 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-traits", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "license": "BSL-1.0", diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 333a08f2e8e4ab..351ba917782202 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.79.0 - SHA512 ba0cfecb8c4ed750c46a9803350cc9e3e5a9493ef8b5f528003128039d57b13c10ec24ec31fa3e8d3d97a39a1d2381515ff340a471354a9fc8551268ca34aec5 + REF boost-1.80.0 + SHA512 13514536d68ceadd66910a22c54a29f986c176f6854198d466ccef50c78cd5a7132b63779a48893a0e1fdf552789bca30cc356e1f582ccb547edf32d7bbf4298 HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index cacb60dc800069..c24da3bfee15fc 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-typeof", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "license": "BSL-1.0", diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 5cad78ae1c6def..5fc6e0bd6af7f2 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.79.0 - SHA512 080ccf36bef22c72620f595b41e7bcaf9e900335ba662d5c605b03b710ce2ca0b64c9666b970331a2ecab870c3f8f14705defe7d7de57821b0f070a74ee89606 + REF boost-1.80.0 + SHA512 8f081be2ceaadfba63fbb802bed2b29b814f9de8cb29ac212a0949570d458112000ba7e914c7547486086cc8467c59cebad860ad8aa685f1ac355f38ed543165 HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 2cb2c3fb2d8ced..b1040e69ecc215 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ublas", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "license": "BSL-1.0", diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index 95ebab60f997cf..e19445688f2ba6 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-uninstall", - "version": "1.79.0", + "version": "1.80.0", "description": "Internal vcpkg port used to uninstall Boost", "license": "MIT" } diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 83cc9a0b270ebe..f7eec90f485d05 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.79.0 - SHA512 babab18e42d3279f0a8705bb081e45c23d5bedff478145df453040f9b14b4619bd03702c2d6513a244846dcc8c4ebc401b014cbfef7d7c7a2208c9b184cf734f + REF boost-1.80.0 + SHA512 d9b1f196d6c38f78989912bec953ae0dcc4af1a8b961415bc9e9f2c84652f9422bc6a98ad439c28fe3418e01256728ebe6ca3411706be3fd7e7b2ff57899b1fd HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 2b84fb167f25e2..6d849ab0f50eb9 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-units", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "license": "BSL-1.0", diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index b0e57b01fa2703..da6a6ce6a33ac5 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.79.0 - SHA512 2a4d3a0861c265cbd0fd9c366776d85a6204ab25383b924e4a596477f8d338aadcc5fd29c3dc4efc6b07ba3cd5c68deb3debc2a1ba6852d04fbf7e4910ac4ad6 + REF boost-1.80.0 + SHA512 4d82257d6ec001f327426f6cafd2fe066c091285dc38cbd1754d6195516dbd48fbc6e280614f899c211134fb0cc05fabe6ca37657ebf3e65f401a15d31c0d76d HEAD_REF master ) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 6b56be8529969a..02b0598b70426e 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-unordered", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "license": "BSL-1.0", @@ -9,8 +9,8 @@ "boost-config", "boost-container-hash", "boost-core", - "boost-detail", "boost-move", + "boost-mp11", "boost-predef", "boost-preprocessor", "boost-throw-exception", diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 116c900a8839b9..91353eabc271b7 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.79.0 - SHA512 f26aa277728231958a14b1d7522d72b7d511c419d72d08bd4df4fcd80d364f5abde98ad2f19e0fe2959524e0406e32c64bf6519d3f0a9d56ccab221b910a072e + REF boost-1.80.0 + SHA512 f9db306c27e64725c110ff4d918edf9cc954711f5a5bdff5c69e3cf0510cfb49f997aa6019f31d096426d8764833b6e0707b0806bc14412b583461745529e537 HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index 767088c9794712..0703658c335954 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,10 +1,11 @@ { "name": "boost-utility", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "license": "BSL-1.0", "dependencies": [ + "boost-assert", "boost-config", "boost-core", "boost-io", diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index 0ca1a9eb0edc35..8a6f655780d65c 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.79.0 - SHA512 52a78598f7120906b03a6ecacf9997926c4e7f0f9696138f25ff75956b012010be5c1f212fb498b064cd94b420182857a17a750558758d82dad4b44d1bbeba47 + REF boost-1.80.0 + SHA512 839aa4125730ba89ed9293053e0f41283af2185c99a2b00a758414545410493d4a8853659f6b87c3c26c81276f7c84777d8733a2244810517ed2170c130100be HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 22b368a897b5b3..5ea5f2ecaf560f 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-uuid", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "license": "BSL-1.0", diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index e4362294e3f1c7..50229d597a0272 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.79.0 - SHA512 e63699023a8d367fafd8197887bb12c998e25685db63c61ba06c32b628e55c7eca37692d95995875adfe47586bd79598e641ae284c585af10f050809f6118a38 + REF boost-1.80.0 + SHA512 b9b6a831d735051c81f0a2b063e071f44fde80bc84833c4f43e0b5eb7edb8c9f0b7e86429db3ddd31ca9639de098a4369a5bcdceff3100621c25ac7f2a4af6e2 HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index 99b25d5bd1e665..70990847aafe94 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-variant", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "license": "BSL-1.0", diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index bfd98dfd8dfecb..ce30c82d9abaef 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.79.0 - SHA512 f4c2f2eaf9c285b747067aaa23ba9937d9bcaff1e1b9aaecdf347d0466775ebfe23aa36b16d1d70969604f81ba9762224cb59fe68c9e35d5a34f6184c7b92948 + REF boost-1.80.0 + SHA512 e3e0406679f03417111cf6e7e78d8932740ed0f743e112b0b9e381995078c410def0b072cb8fd68d8acfefbdf5ec28fad2bac276423f7c2f09522d84db42b717 HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index fc6b8f5c02ee54..2f9df670cbb3b8 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-variant2", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "license": "BSL-1.0", diff --git a/ports/boost-vcpkg-helpers/portfile.cmake b/ports/boost-vcpkg-helpers/portfile.cmake index 922531d1249a19..200e07e337309b 100644 --- a/ports/boost-vcpkg-helpers/portfile.cmake +++ b/ports/boost-vcpkg-helpers/portfile.cmake @@ -1,6 +1,6 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -set(BOOST_VERSION 1.79.0) +set(BOOST_VERSION 1.80.0) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/boost-modular-headers.cmake diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json index 121a55a4e95609..0c1d3927acc91b 100644 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-vcpkg-helpers", - "version": "1.79.0", + "version": "1.80.0", "description": "Internal vcpkg port used to modularize Boost", "license": "MIT", "dependencies": [ diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index f36444d8ef9b4f..3c21862f2ddc88 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.79.0 - SHA512 a224420e17b5dfc39d5928e35628b57aabba00619dfd17988345aae6595610253b518e35bdd04fcb286a2aa0627ca3c4bb8c2fb2260351865f81d7493ff19358 + REF boost-1.80.0 + SHA512 cf6c9c3684e14225750669413ac2f538ebc207fc6ca7180a10a371b0d03de4e3ac570648d2b30e7f534a8f5c49499e9a03866cbf0613cdf25f1ff7ce4a7e1cac HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index fddb03b94f8a0f..7beac48cbf44c8 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-vmd", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "license": "BSL-1.0", diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index b9467a31d2c13f..2e625ff8b98a7c 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.79.0 - SHA512 d573202b2eee3d2810c0cbbbffdb61dea957f8a4be33755a2e797fd23ae531a61a66a3b2cf1fa1d114781b72d280db8a45e350c437dc57d9bed1954c596a83c2 + REF boost-1.80.0 + SHA512 6c6172d9a49e0810cb8c16eea637ced5a2bc2769134b5e194e9e1749cfe5965f9c753af6ecc92e9ab570290f85c157308a628fdf7b9f126bd66af4eb0566e2e5 HEAD_REF master ) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index cff18d82dca792..9eeb74ec7439ff 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-wave", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "license": "BSL-1.0", diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 23948e33be69c6..63772785642a80 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.79.0 - SHA512 c226df34607ee351715e66c28b2370aec12fa0df4505cd0e8ca3de96a61677ba86a662b292c4090b50fc28bb4629a64208155923393bb6b557dfef267e80db78 + REF boost-1.80.0 + SHA512 851e1cd8e7d2d20bcf1504c978fb9c1caa4ce00db23adbbfbf9de7f8c665c596af42ee5d7d7c44d36a43ffa28e4e98376a48db2ba0db51ff568f31bd547093a1 HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index 96fc3a87756024..a3acfa64eae0e3 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-winapi", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "license": "BSL-1.0", diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 082e26372a46de..95e385cc04cf74 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.79.0 - SHA512 b7d5504b99b9c3007a34a82cf4d8f061955b1c197a1eb7c9245166ece395c4620889e6e9b509fd0b7caff6d5d30bd36ee8eb928f6a069399845200785dd51b23 + REF boost-1.80.0 + SHA512 a394e1d332afae2477a1f03f5e353ff544169d9d446ff4c87cf2f7b806243c13f71d10a87394cb23a170416b987d324dbdf8e365eb5c81d20388400777ba3e52 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index de6691c040a6bb..388d3a50c5843a 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-xpressive", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "license": "BSL-1.0", diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index fe5d338f6280df..6c0dff7f27a6c0 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.79.0 - SHA512 df10ca51af90cac70952f94265d09e14b499aa6d2c89977d93d202347bf497758229b98bad51e43b043957d7ae11801a2843aeb6f740f526adddda0a63404d1b + REF boost-1.80.0 + SHA512 0ef945de4b32093d46975fb9366544fcdace51bd8137ff6ad2a2ba0d0a7a0c5e31dc7c3396ebf6de9b4fbdb6b6ee2000dae6c8c44f897ff6c832eae26b6a207a HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index ad460bb2a843bf..e345791e8c7ca6 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-yap", - "version": "1.79.0", + "version": "1.80.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "license": "BSL-1.0", diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index dd3c22765ff80d..99728cceaa459c 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost", - "version": "1.79.0", + "version": "1.80.0", "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "license": "BSL-1.0", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 41ab9ab78ebdf9..1f9242c65271f7 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.79.0", + $version = "1.80.0", $portsDir = $null ) @@ -171,10 +171,10 @@ function GeneratePortManifest() { $Dependencies = @() ) $manifest = @{ - "name" = $PortName - "version" = $version - "homepage" = $Homepage - "description" = $Description + "name" = $PortName + "version" = $version + "homepage" = $Homepage + "description" = $Description } if ($License) { $manifest["license"] += $License @@ -591,7 +591,7 @@ if ($updateServicePorts) { -PortName "boost-modular-build-helper" ` -Description "Internal vcpkg port used to build Boost libraries" ` -License "MIT" ` - -Dependencies @("boost-uninstall", "vcpkg-cmake") + -Dependencies @("boost-uninstall", @{ name = "vcpkg-cmake"; host = $True }, @{ name = "vcpkg-cmake-get-vars"; host = $True }) # Generate manifest files for boost-build GeneratePortManifest ` @@ -612,7 +612,7 @@ if ($updateServicePorts) { -Encoding UTF8 ` -Raw $content = $content -replace ` - "set\(BOOST_VERSION [0-9\.]+\)", ` + "set\(BOOST_VERSION [0-9\.a-zA-Z]+\)", ` "set(BOOST_VERSION $version)" Set-Content -LiteralPath $_ ` diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index 99ca3f1b905844..31b5df77c64915 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b25f312085b5e73329ad76e24d11c9c1882e2ee7", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "80a1e83cff3df70e006907ccc20851f7086f2dab", "version": "1.79.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 6878d725213155..a89edd8feac296 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "449cdd984b8e373b02b3b5fe727520d2bbddc64f", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "20d7a665b493f8b9816d56125e83928e41dcaa98", "version": "1.79.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index 48a67516a4077b..c18ae278f4b91b 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ba43f3bf67d3825a663dbb55e6210525de2eafd", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "5bc0b7d28ff47bf04454dde5d3ab3eeed5a113b2", "version": "1.79.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index a8d61d37e18155..66f1a75de6957b 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c702b79eb10c68b859be09c9aedbdb1533972ede", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "6382a90fffe32ec65147d579e28f05604eaeef46", "version": "1.79.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index 32a37364a7d653..c67efe7ff12198 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d19880de99410f68c581fc1461458e502952c6d5", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "11a6869eb0c7b2efa3e92b2c36795ef9873c6537", "version": "1.79.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 58ec3ba9bd024e..0b6f3181187b22 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2879fa47cd2ac0abbd8ad8c1b38fa28605c45bee", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "39b1b86ce2c331ab31d001308b6a71fc6fbebf5c", "version": "1.79.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index 9dc4a2e8af4a79..ab0f5c753c2f3f 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6725be5e5074efec28c39594ca05acccc6f00389", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "2e4adae40df44f3927978bba397b60f18ad8e919", "version": "1.79.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 761268229659fb..35651ade6901eb 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4ca8465c21f725287f49640fff191431b14d6d7", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "755ca06375958012e688e91d8ad79c40b20b91df", "version": "1.79.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index f6fc8a96050d58..821a61bed8b45d 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7981a7b10701edd0230d2aac6a058c5ba02f4acc", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "ba96ddc357592c3644f666fbc68d052ad3f0f397", "version": "1.79.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index 408148f5ec11c2..4cdbdff4f11524 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6ad5168ee3dfc5e23b7a47f2919de10b4070af6", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "bb0a62ab1fd80ff0dd756ad89cbc367b2f7c6df0", "version": "1.79.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index b58cc633528f50..5ab0139f0466d3 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c94058be2a3f7dd8a6b7b4999be4ca799c415249", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "4bad70254f12ab9642e3ee96980d834a485af5e9", "version": "1.79.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index 2cfc8ee2585103..c700ac0e282899 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d42f0055a3147df3268da26432a64580f9bdbea", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "c27b66c8e195ce97685c409c0821f907bae83d80", "version": "1.79.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index b86a18058ea638..ed49e092f25749 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b95798b4e7cc7d6697ff1eecc9261ba5d884828", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a5ddae928a30fbcc9d5cb01906a7ee846b1b6c62", "version": "1.79.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index a13fd96481df79..d94955043e2880 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f830b72c86e472095ce7c2f86b56e8a4ef8b0585", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b3fb5022c86bf300e6a55e8ecef2ba41e9f6a39a", "version": "1.79.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index 3d99e0947a5628..68d0145e6d1c21 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af0a6c6a5b473a08afeacfb8590bd4220129ed47", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "dd168284e43a057a5775444c07f11f99a96053c0", "version": "1.79.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index d3e0c260f25612..9c9adab48086e9 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf70dc530094e3190c4d5cc945bb452807cc150b", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "c8a97f3e2854ffb2064635bada5cfac2230a7590", "version": "1.79.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 3c8e013836b5df..dd4a88ed036695 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f07e01ce42b7ea0cbecd1ee38ac2700e69a4457a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "bddfe133f937df01c2a18b9fcbd078538c195715", "version": "1.79.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index 7f0f081ea1c140..1c9f3e5d66c833 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bc892c9f1c28371c4ff1f29b02b350e06dbc8b7", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "d4c84dc32e2d683a910deafe8df7631c36ee8195", "version": "1.79.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index 7b5417e83d70fe..9a233fb4eb35b5 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0beb38f9779faecd886d454778c8824f2a1b6112", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "493a1b5ae991a9c7b2643e649329de16bcd0fa48", "version": "1.79.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index ad043d79466eab..eaf8eaabe9f242 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca3f30a318dacc3dcab0250a9eeb37dc5b6b92a5", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "22c6532dcc9c24fd85febb93dc936e68c031043a", "version": "1.79.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 77aea1a85138c5..dcd775c11fb721 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dc3bdcb7719958b2c449f9d0c5a4a1fee740638", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "09168c62619e569c7b6b2799aa39c361a1afff22", "version": "1.79.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index 74fd3ce16c5232..d28eef06427776 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bacf967cd20a1da8f12491d458bd833194b5c8ff", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "c29fd09bc12ad31bd796ba90682fcbd242090cc0", "version": "1.79.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 5facde369e33cb..89128bcf7f315a 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3935b80eb6478299ca2215ec8f44bbaadb7cb097", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "24210ac19518ca74072938e9569a9e9f5b3476ba", "version": "1.79.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index e39983cd76407d..286668178f01e8 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4602cdd4b32f084e83f9c687d2aabf7aac5a7694", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a07f53ab73b8b844f20b487aa039e4e019538d47", "version": "1.79.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index 0322dfdefd9486..0f1af0869a9d48 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0eefde4b20dad197e9a868ade748b825e6ddafcd", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "1e3552c53e2ef9bcfa7159f2f06079c30dfa53ac", "version": "1.79.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index d86c9644bce981..4ccab9d975d24b 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86c8d2de7e7f583832e134096f2c2a869f16e23d", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "3a6958bd02a806df5b7840c7a62908ca3d5316fe", "version": "1.79.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 8819732c04169b..caa0c51ae7c20b 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c883ecbdff6a25a10471499fe6baa265370d8e80", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a22eddd8a3121063f8ef94eb4e0ae64021d0369a", "version": "1.79.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index 69ac9a292ac70d..c6107fdddb9d4a 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5c4a955fcf3465c0e9589a57d9c9f2df02eb3a2", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b953ff17be4b4da2bb6b898c80b12c4185b3a821", "version": "1.79.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index 712571fc917610..b0765e76b2b96a 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b92ef8da314cedfeb9c03cccb9ed74c54464937", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "8f8442e8490a2ad005762566a768ca944e754466", "version": "1.79.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index b7f476b27200bf..e89692cfcd4116 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1ffdaef7352c8861f62b6a81197f8f57433e471", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "5fd0f57c0b02c713c53ca56f341b904557fd257a", "version": "1.79.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index 96489a2e0f35c7..d63d32e0524d4e 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d59467ccd3c5545e253f0077e97237d3e89e320", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "bc3460f55739fad6ef0e548bc084bade32985683", "version": "1.79.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json index 8d694a95c33de7..1120a2be46f835 100644 --- a/versions/b-/boost-describe.json +++ b/versions/b-/boost-describe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91eb316df6588d70db583e6accf94f3dc79cb78b", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f79ac02e597506f15b55a0445e9a36ed6cb22632", "version": "1.79.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index e57e4836f866be..c47f8ead1fab25 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e3b1298f453e933f97c2145a1539ed0763e52b1", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "65c1cfff48ea4ead86b7db6d20401fbfef4e1022", "version": "1.79.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index d626078ac967d3..5fff9eba134eee 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58b721d72a67913e4f5001269c25b3e7b8982f93", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "0243143e2c2bea8e3579aadfc735b56c40ad5491", "version": "1.79.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index 36aaeae20b4725..375d26d7e7de17 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "288335907a0fe3dfaccf6bf7dc796d6a4e2570e2", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "e2ea8d91791c627d016c69aa73d36d3622ba0df0", "version": "1.79.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 967e0193cf9df5..6f0a0ff0209cc0 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7e23bb3fd93937ab37715ea481e5ed84b51f37e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "24a5162a544f251df6387a1d5bb70ba53497e4c3", "version": "1.79.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index b7ea3a572caa51..5271482e6a1340 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd7bd1fcdb784fea657d9a4f068253b5d95ca333", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "6d7250e9806392fc38643fb7c069ba18fcec2350", "version": "1.79.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index 8d4b033424d904..78f9341414edb1 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "624a28b01820a368ad83f7e3bb6442706e1dfcb6", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "14418cb69ecedbf80d7fe87779fc7028db31eefc", "version": "1.79.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index 740eb6d029e195..004671f7179e76 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77d8b1f9dff7eec868e4c8007c399bb123d80a97", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "3ad60cdb4b5114cda754f4b15d96d72c9615b271", "version": "1.79.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index 1779fc7fd13f65..fb4e7612d00c38 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65fcde6f347e7f0100ef071d6f943d5e1f05790b", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f6e8af8c3f7450a4e32ca807cabfb4197ac7a0a7", "version": "1.79.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index 76f32980d20b4b..bba32a27411cc9 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b86b0bc008ecde19a6e4c83aa2365a197dc214e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "e8948df8fb3d54f6bcca0c5fee45f13406683a3e", "version": "1.79.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index a75b116996fa08..a1aa3e1373f71e 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b8465c0970d28814c1162b864c02f685e471482", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "365fbda5a5fe624367c049e4c118945c0142d0eb", "version": "1.79.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index 0723ae037aa25e..ae06c88d92ac04 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d09eff712efc437ebb49cc7dbf5644a641be3b31", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "53ad331d5cdedab7b40eebaf15d9f8081a5d9eed", "version": "1.79.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 6dc73d2957ff08..dbb9da88fe6078 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a3017f165de9e889e161ab353dda4439cea8169", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "7057b960d6b790eb30f51ef17d67aa958230e100", "version": "1.79.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 8b38d5686aafc7..1375ad65525a63 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43e00a8e09e0b0fd501b8a7b8dacc2a189a0c587", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "d8fd2c72eb4f3c8d501a44f7a5f8ecfe608cc3b4", "version": "1.79.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index 1b80aa7806c804..52577bb2dd6f8c 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e5e11a2bdcfb620804b47dd24f09145d67892e0", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "10c27fdbefb33b57367582e1a8f262db9d94d807", "version": "1.79.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index 3128d3790b9879..e6c69c70d84dcf 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22ed5ea6012738b12286b239ddf1cc9606e3130a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f05a5d0f5a5889edecadab0ee49a1c13dfde0898", "version": "1.79.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 14d903f5b78772..11d64c463cb98a 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bec2e61c5e01a16e3cd4ca47449aa15382931c6", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "fe36550466af98298217643a09ab451aa6a0b4c7", "version": "1.79.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index 44af13bcade298..07df499bc578ee 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2246b1dab26eb279a95fe40b6d6f225b2469d8cf", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "3a95f6dea34a2262e22d4b94404afad68c603a8b", "version": "1.79.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index 5716ded7bafdfb..163bfc69f1d3e0 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7fd5ed599b799127c74238c346fbca9be455009", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a0281e8f5b61dbeb2daf3b3634744daf9c58cdd2", "version": "1.79.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index 1474f0c2ec093a..9a60500e3abf94 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd068f8c4347e0ed41005a78ee39f98ecf79c441", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "2dda9ed4c338faef5a98ec4f713b71976c4de9aa", "version": "1.79.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 4e3f1cd8119a76..990f2e1d08fc00 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02f31ba7775130e875051cd5f5cbdb76066ff0bd", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "3be349686d19ee7b297058dfa2d8177bf22cbe9b", "version": "1.79.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 7c7683eb23fc7a..d4fde1a245c34b 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70a6aaca30a05b7f234b62988f1bd8f53421710a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "ba0d99a55988d554d24baf0ae9b8dbd39950be11", "version": "1.79.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index 7e4a09d8aba712..e4133fbd50da63 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40ecf7b9f806bed59a911028354f0f471b5e1beb", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b4c1a946a0dc6f554cc76efa7ff4636ff4aabb08", "version": "1.79.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index 5ad8440d844ef9..9811b708986daf 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "061544233c810a2a3e04cca99364bb2fe3edcbb2", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "9ce9f45501ca2ac3a6ff4f2c42c69f1b104df70c", "version": "1.79.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index cd0ee4811667db..025861dd7f5975 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f980326e208e00560547b76cbb13759357e74598", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "7970a7ba822ac5e6a8a9f98ba5ee3631b3ccff3c", "version": "1.79.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 8f15d55a10325a..f0da0f539021ca 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9830784da99cc5088750233a568961dfe6701c0", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "274a988e2a03f43beba2efb240692e0af456e8ee", "version": "1.79.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index 3ab3b2a5bb2e46..76d4fc53684f40 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc4c8e51cac9fa083d9f181e9da090a65fe62779", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f196074b225959b27fb96794ffc54db0293efa24", "version": "1.79.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index d6038d4055f083..ed963778f50667 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "538ebc32732429b15db300664e07bab697c2e5e2", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "5162285659ad371e022c242481e20414c8b23e2b", "version": "1.79.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index 71654790a2bcec..33cd3f6173a431 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfe6645cfe18cc173a5101310bc86dbb5fc5532a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a248d3f95d95973f63b5be92c81747165ca0319c", "version": "1.79.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index cf565007faa34b..e3bf6e6edce0ed 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37de3e0e0107aaeb4eb8bc2ee29457131145bb36", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "75821705e2df069874466bb55c4b0c4561950831", "version": "1.79.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index 5c1581846b31b8..7c2b8adbab8a00 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5df6fffeb95a0cdd702d8471696ca31a45f1600", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a9b329add024642bef5338c963bdfeee41bb60df", "version": "1.79.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index c4130a2f5f1390..c0ccab4c6fae3e 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e00f0980f7fc5a06bf3c559b6a1052e068d5de96", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b19f47c6cbcc65ddb2a96bf60df6b358a6e64ad1", "version": "1.79.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index d94013b9b7148b..45cd378d42b977 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e96e65ee098d0846218e7df13156804051aadd23", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "c2eedc92baf94690429ab150e062fe42296099d5", "version": "1.79.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json index d2e9eb45e42d99..e2507b51561717 100644 --- a/versions/b-/boost-lambda2.json +++ b/versions/b-/boost-lambda2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea6068a8cd06ecf372e93ec9967af05735e0e64a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "2ef167f48c1b762124536fd34843f247e9af8b89", "version": "1.79.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index 6563855c37eb10..60d1d16410cd77 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "151ee4285909980fe5008aaf36d65ffc636e654a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "87a96bf13e0afb5212772d1240dfc6accaf71b84", "version": "1.79.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index 553be4ad33a56c..a3d76a80ba9269 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1c65d88dc4dd33ee2308e6dffa9ff580b3ad0e8", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "78f269516df3662fbb3417faba5a8983936de604", "version": "1.79.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index d06734bab0582b..4bc3a29d8d5415 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c1a73008438d7a613f4fbb3a8d12c33276ae584", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "3de1ee1d8f4c2def524ee00056e545765dada7a7", "version": "1.79.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index d3fc69fc58d1e1..d707e4393c0404 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f76509b5e99db09e81179f9168a3da090c581c0b", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "1868faea7b5a4b74f6cb0dca84ef24a7f8d708d0", "version": "1.79.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index b2b23d10a01b83..ef00ce2a4c0b6b 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1e9c0f8ac538167c8425f199e49c771c132d1f9", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "bb27f3391311f8d7078563e4ce98f7706500f33e", "version": "1.79.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index 495699d8342f23..d50703329fb2e8 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c2e069e10107dd06749bf7fadf7d086799ab91a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "311052ccd7332a0eb6d4a80af653a65fe390f7f4", "version": "1.79.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index bbd4f9a58cae32..e60c628882c0fe 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "588f889d8da686230f6f610141d8110562504312", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "438d9d7c26d42ec2a76f0f60954b7cbcb950a79c", "version": "1.79.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index ca06fe121ab399..f4fa7610f50f8e 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3f7257d4b3a7b8d94e00348149051d37eb75921", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "cb4ff8e95c283f70577c94f6d552bbd2fa469b3c", "version": "1.79.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index 28bcfcad60f05e..def3719ed804ae 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d49c84675e49cb7998be2c9efb382044f5bfcd39", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "ad7ebac0f5d44f811d7d8462959b080c0f298eaa", "version": "1.79.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 02f4b4e9045fc5..a2b7b55b706d39 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3047d0e2fdc4eee0c918f418f45d5e1dfb86c0fb", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "e22ad8dde44513f2fa1a9b38c71818aaaee52120", "version": "1.79.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index c6e246b56af1ae..44b92bb14a1091 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a892eef83cda1beff03d4a7dc11481b153fadfa0", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "957381b3c5ac7d2b563b2563ca8a78d49f034e68", "version": "1.79.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index badb1c8ed5f065..4eb661f0c081a2 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf20115432a67132df2313b6ad134276595cd886", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b741f7087023927b8345779b9a30575e1dee383f", "version": "1.79.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index 9c2567504ea2f0..59a2a182c8d993 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87dd60df15aacd026d27193cc0efd1b5323dcde9", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "17190e3d8acbcc5d48001bcf01250f91ff68dbc1", "version": "1.79.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index 28783c9fd8af05..97c226e06d739b 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c213f7c4b3d93700c4cfa30498138df314619c98", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "1fa673fcec0135c3a144d90528f719b281d29043", "version": "1.79.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 8ff696e7149a7a..7b628e701b7114 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b4b10c39ed7937f0cd9539a22f7af1bfc5a3a08", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "cb6831b52a7befc70effc89fbb0313b371f28563", "version": "1.79.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index c2184f6b1c31aa..e2435601f8cb5b 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f1e6f3a8453417be928e6f603986ca0937d6365", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "2a9a9941b94769dd48089ce42e4bc3eeadd5421b", "version": "1.79.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index a9d511ae0caa39..b691c88da68099 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e217e3de385a4953c622960e326d5ae354822f19", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "bccc5117c54e12afbd300458b25ec698ae860db4", "version": "1.79.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index 3c650b96977ac5..43ed0ac2324545 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e2eb2ccd2df8fe19e09aeb8b2c23cb1142c649b", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "636ec387aa16d01e5eb3604bf4c70e90ef520cd5", "version": "1.79.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 10223a4fedf0c9..5c1794f7f55d49 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5bf7c703090e7a83527aef14901df5e26668240", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "8013e5dd702b7f4c9973872435060812981af2f8", "version": "1.79.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 9f0af73077978b..1bb3f5f2757032 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d472eba74f6936b736a2759ae9e0be3c96a7d4b7", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "33a349e75f738b735e678de319469c0f9009a413", "version": "1.79.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index 18cc1d5981fe8f..43dfca7a2f17cb 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f08d713ac19958a488cba507887bc2e7beea1a2e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "893dab725dc2e30afa421db9d4ad5f153da10ab3", "version": "1.79.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index 21e51125ea28d7..378697865f9e5d 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f25e73c7f9e4db6d27692ece6b2db2269bbd3a72", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "9480f61fee5df6864a425964bd13ee783a7572a9", "version": "1.79.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index 53161dad95138c..6351f6b599b831 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e67c523f8a5112b14aec2d7f931027848e9d424", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "ab5e09720b095a4dedf3a6c9c01b5512c67917a2", "version": "1.79.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index 6808d2a7be2d9d..83c1398ad23a94 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f685a59fbc75e930b74189fa71a740ca2a4eb60", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "d5d0f28a377b7508134bef9f354168e9aa49f1bb", "version": "1.79.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index 641695b8f4dcea..51dbb5077a4033 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfa271d39fd1a50822e9c72199164d383410bbe5", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "94340499eaf0d204a8000b09a4b7f58eeb12c84d", "version": "1.79.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index a5a1775bbd294b..873942c7e0c77f 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d050fa2a0189cd8ff8625e9ee6b6199b3a28785", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "48758ff038842f02fbf6f47c5f90afe1ae682a51", "version": "1.79.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 2a04d8dc65a75b..f7f86479cfc459 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c69ac60adcb765d3b35a18b2be37dd7ea21fa711", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "571d5f1a068664b1f31dddd3541b6a19bfdbec2d", "version": "1.79.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 0c6eda2662f112..8c0031bd69a3d1 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4be3065ec0871a76272899ff58c1e55aa9e387c1", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "866f9a4fce24354f73363d787352bcc2ff22d917", "version": "1.79.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index 9e2cc1176de70d..af929a5a43f905 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c77b533b461ca02f57c02480d0b49175fcd33305", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "bbb7a4fbca9a45b0166893128f343ed3f9bc099a", "version": "1.79.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index c3b4d1a886a9cb..94e45f745bd4ca 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72126937ced48f11d0b1bd0417b55c0bbbff80d0", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a75a80498bfc1134bb8d5808b5f8b457e4032908", "version": "1.79.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index fccdf477939e22..b7b6ee15e2f53f 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aba63dc45c18c5b2486a1597c57a8c8bc8c4332e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "c17a7256c1f86eab749e10b451dbf53d317afaf9", "version": "1.79.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index 9b60a984881e8e..43308672b266e7 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecc094cbf773842dc012128b15a0a8b33655a48a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "1790581b89b5cf96bd870854b2bc4b256032a9c9", "version": "1.79.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index be04912bbf0314..8380f3a9b77c06 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf4118e63efe0bc19f98f3639916e3dc565884ba", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "2a6c17a26c19ac770d39c549749a86f62b93ca36", "version": "1.79.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index d131db39e48c1b..86202bb1ce463c 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "306ab169b6f177e71d82cb08c77a8629337a1b6a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "ad5cb3defd7e6f0f2be69f7090d2f996e4d4d885", "version": "1.79.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json index 0048d1ddeb5b6b..27c61e7c7e4883 100644 --- a/versions/b-/boost-property-map-parallel.json +++ b/versions/b-/boost-property-map-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "addcd2668a3f5f1ce1dcd5f3b548077cd9c3a16c", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "9f8124a589753446efa038489607ddd868c7e2c4", "version": "1.79.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index db50c679f7826c..05b03f04ff50d4 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a784463d4425f1b9f97d5e469a27a8223f5f0b0", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "80eb3c867ca2f805d2379963d69c12f7f877bad0", "version": "1.79.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index 2ec9d39fd4ead2..f0bdae218edf59 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0993baf1328cd41a1f980b4e1147a38e44b7c23d", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f05a46d069778748274ff28002994e04d3654286", "version": "1.79.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index 9da129739e4bf5..0131dbe7a427ec 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df51ae90d5540b775b1f14bf796bd7e4f4b6529e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "26184f2fdf2a6c15a79964befeba82802d7d6afd", "version": "1.79.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index c19090704e2a9f..53ee1a5ca4daef 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81b98fdaf0c11a4b157b220a98d050fabead9e06", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "879641e4ff9cfca37db16a03f72b04afeed909c6", "version": "1.79.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index 2bea402d093808..299c10eaaf3bed 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37c146ee0ddbf30f5372bf434bca80f97d1a653e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "0d5885833470840d6af709f368a42df4c3b09df4", "version": "1.79.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 322c4d5362c5b4..f81e6064015553 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b341b99d2ab5ebdd7722ee83fe57c5cad255a2ef", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "8f8a09f7b75cca0fe3cd7995f234ee35f985c3cf", "version": "1.79.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 398ef4c9888abc..402fd13451aa72 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6372fd79a4e213f92ebe9e71be03fdf71b77d532", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "6c02cc8343df9ea692504b16db286eba1fc320a6", "version": "1.79.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index 09d2ac165e1087..7ccfc326fb83d8 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c39bc84eb02172bd336ad4c310a181ce983eae5", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "fff762e26af0f46863606c7fd088491dfcc84599", "version": "1.79.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index 54616732940cc6..c30f356f480266 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9474d4e6541e03de3c1636305bf1dbcbc46ac971", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "3c85cac76a643d538a52553a54353fbb818b3169", "version": "1.79.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index dad8cbb9bbd49f..5359141f5ae6c0 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ebe5bd52b65623fca07154f8dd993ae9bf7522f", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "bd0b9e457fc969fdac6b9ee36b77a26b3c680ad5", "version": "1.79.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 0ccbe805f8f768..d15538977a8b2d 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ca14abfbb7f576ae870202425068b603e48452f", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "49b26b133e2b9eb16d917930b2c697b58eff5530", "version": "1.79.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 9899a345939111..aa24138f740f56 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50e0e90565017dfa188314c53df5119c8fa3e5ce", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "ac39614e028fa51d8de1210c0a003ecde411e156", "version": "1.79.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 3ef5b8434ecfbe..afbe0ed1bf625b 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d6f15ab55ce24e64b53a1004d5286a2a6af1ba1", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "a27fe8833a067b072476368cdcbc1ae686236578", "version": "1.79.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 11b12507ccf697..0fe7345a8d67ae 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "566a672aaf52abdc07527d293f88772b3e28e079", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "aef44ba080120ebe8f5af25a6d019781323a5206", "version": "1.79.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index a17975d3e71945..a3c864ef736d70 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7846d029daf05be0a560dad09ac64a64850a297", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f6ab0c163ef679f14f84b6510c8508a90facf986", "version": "1.79.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index ecf115a8c0414b..885b43f588605b 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7b255db01f37243bdc87ffabeaf493dcb9de474", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b94b3b41ab4bb281041f40d876baf221c05818ce", "version": "1.79.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index 6a72e1ffad4646..05abdb2b061f04 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be28a0d59e37787052758401bd5ab59a0f70d9ca", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "74c73a3ccafccfc9e85fe3879ea90ff7a13ebcfd", "version": "1.79.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index fe5dc463929038..a73ce414e1d278 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74f1c93e41e9b732a47afc259b396c0812f266de", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "6a4bdffc6ef22bfee8942319cb5a69b2e85fe231", "version": "1.79.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 4f112333198c35..b7def5cbef2373 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2168810ccbabcae3d538f8679181ae300b815ac", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "0ddf64c066bcc3189d13bd7eedbaa646cdb073ff", "version": "1.79.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index 5f9279d71cf78d..96876a64224ee7 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41d7af8a2e26fd1f41dae61d62cb8484ea978884", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b6d892f7ec7ba87a98fd9bd2fced0c0ca6161fcd", "version": "1.79.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 2d44c3b144af28..db16cbc80365ef 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55582331cbe3fc0e46ca145196d341140511edad", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "673cf82169b2b1696d993477d47b2f94d4350a7f", "version": "1.79.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index eb573643336e05..f68052203bf5eb 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b58ce47fd0d910a9b436540cf87e0b06a1767fa3", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "575a5fac2b96da2ff39038a733fea5455f91caf4", "version": "1.79.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index 2afb9cbcf5dbf0..5cf15ad6e8289b 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b82eb711e6d0b9a580b7fd149b1bd4b95d9c9d1", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "1f59d2ba966f1e2c2ef5f23150c5a8dd348d98fa", "version": "1.79.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 4191ae07410eed..83746e0a7e4e81 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "198bd87002215340f09b4269e8d80dbb7f314c7e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "e5bca2d39362ef3978473a1d184f017ed277d1e5", "version": "1.79.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index 4ab31b8deca43d..eafa3eb4c88840 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7324e419ee3fa4d7871aae2cac389cb3eb2dda94", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "127affd76f8dea78857d11e147a2cd03d8e827e3", "version": "1.79.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index d08ee1097dc3f6..d933b35748a98d 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "010869a933ea4108c7cfb6ebc10d86ff823a1073", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "d40c962d08c08d397520ace757ef7aab055a59be", "version": "1.79.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 99e1b93545b5fc..c4428fee18088d 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ff821c116eab19736c1549d09245fbac968c7ec", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "1607edf60f1243503820e06b4d3e16c385aa691d", "version": "1.79.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 16c4d848e42d51..b6220aea913dec 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc5dca14265350c93bafac78b73c1305d514a9ea", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "ebd77c0ba62a3665404c4143e4208b387b57a5ca", "version": "1.79.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index c9e2bd3d255702..7403761b0da5c6 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "860575e6cabb9769a64a55d67b8734decfc0dc25", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "7e5682fee6727bada3b88221bd416edaa80f6a34", "version": "1.79.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 32275c106a0eb1..8fa56da922f483 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "845aab372d2f165939e1554598fcb6d7963119e8", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "027de695e13801dcc7a947fea766bd29b687e7ce", "version": "1.79.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 12c56edea4dbc8..7420d7726bf4d4 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4941b65ae10c7111efc790716e7ab44108718c0", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "c3b718eea1f62e7b4918b3c4f6a4be731d4085ce", "version": "1.79.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index e08969c220fd6e..7e9a93805acb46 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dabde40cb34f79fba07538d0dfe27e001fdd022d", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f5797832d5179682e09ba62f0f7cf25a58cbfe61", "version": "1.79.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 0fb9eb020d212b..cde0113b567c6f 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "139ead6a2f009c871512ff2313970a7ced6ba19a", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b4e2eff6204ba68938a99059b23d3abbd2e1dc55", "version": "1.79.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index e3a6b2583dc5a8..ee1858b0c022a4 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64116e3dd1e586ab99b4f39786b73fc6bf433565", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "7969a397a6c03205ec1c118834272183ff4201c7", "version": "1.79.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index 28458188160293..753114dcac0596 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7157d86a4332212ca5da2d3e4bcb980f59373c1f", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "81216888498f3c8f6563b991a1d601af139da128", "version": "1.79.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index aa3b3f22a39f0d..f5ec25031ad90c 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fe638c91ec64ab61220e4ece208a9d70ad9557f", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "7657da84dd6a03bc4130b2c3ff215f45a5ddd8c0", "version": "1.79.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index 91a61ecaa333fe..85f74d46adfc61 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eb27209522fff06b9aad5e4443312888cf680ce", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "e2d05f10364104d9b7de2383bcb105a1fd3fe975", "version": "1.79.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index e3f1bc493edeee..fa0b027a1df2bd 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94d24c25122f4aee516ae8df34e60450dc7a9dad", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "33f1a2b53e7c36f387866d1e84e0dd2aa1b21c4d", "version": "1.79.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index 55f0df6c30a56f..98dfe9ac08f62e 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a64980c42d17c231e1164e6dcd7f55361cf6bbca", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b73d98ab77d4de1a3e4f12bdd84869dfc3adedc0", "version": "1.79.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index c70a51a9fb6e5e..836fcfd1ecbf96 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9544b25d2474879b1dc04879bf6d48ac20b8ae1d", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "8eb91c7a3ad14393219ba020d3d26c39a325c626", "version": "1.79.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index 1d0deec2649ad9..2cc4de3d80a05e 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "346b3215925506cde0a4d8f2558434f812572094", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "dbf4e64381a3c6279ad5f91a7c64c8f5ca9ef145", "version": "1.79.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index 2ab0af97718bd4..f78dc3fc3d7f57 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "052552e2ffe5c387e6dfd6800509379143747b93", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "33b3da200705df22017f639acdc1e2eade79606e", "version": "1.79.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index 45816131a22afc..0d85b401ec119f 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bc906a591673c127a85b38092dac0ab850931e5", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b9af9e4791e65b001bbfb107eeecf819369a06b3", "version": "1.79.0", diff --git a/versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json index 410926a281bf30..ba0230c4a56eca 100644 --- a/versions/b-/boost-vcpkg-helpers.json +++ b/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "244bfc6425dfb6e1c0c8b556f6ab8786e394c246", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "0e96a2cb3400bcafd55070d18bdcab64808ada01", "version": "1.79.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index 4e8f9bfa16b4e8..b6544302584320 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f1ce668d0b408886328f3602b4ba2dcdc6e0f34", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "5d88c4a6cefe62b5d05e9fed932188a7049fe991", "version": "1.79.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index f7d56a49fac5ef..44aef0e45cb778 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b3867b5b587bc385e9c185e669651610af7ee0e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "d8db04f2186df7eacfe00e02666510ba3f750753", "version": "1.79.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index 0e34ff2c2a9428..7c2ddb2056666d 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "510961ace0ba15ccb5018734f6638f8af539258c", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "7f82a0041bb3b4ac1f3721afe5ba4e24e27c3a3c", "version": "1.79.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index 5821ac6cb15ce7..d6527b7fcc7892 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e226118acbf483b6f0fd12cf6037a961520140df", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "26cd8244e5c07efa76837461cd426c5f4ca25dab", "version": "1.79.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 04607903abc236..fd6a05a3f037dc 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "382723f52354a14670f68b46c89c1101c0310a4e", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "b65c58d6abe35bd1300b250d8d7519a7d56292b8", "version": "1.79.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 5d5f29777a1c08..86076e72ba6e74 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4e929db67c1d0b4c043ec1f1f1d1f1157029d99", + "version": "1.80.0", + "port-version": 0 + }, { "git-tree": "f742b459c69d004cd97fe8fd62e4b813224eba10", "version": "1.79.0", diff --git a/versions/baseline.json b/versions/baseline.json index 43b6254ff674f2..97f5c2854f5e5c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -537,139 +537,139 @@ "port-version": 0 }, "boost": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-accumulators": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-algorithm": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-align": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-any": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-array": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-asio": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-assert": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-assign": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-atomic": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-beast": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-bimap": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-bind": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-build": { - "baseline": "1.79.0", - "port-version": 1 + "baseline": "1.80.0", + "port-version": 0 }, "boost-callable-traits": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-chrono": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-compatibility": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-compute": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-concept-check": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-config": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-container": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-container-hash": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-context": { - "baseline": "1.79.0", - "port-version": 1 + "baseline": "1.80.0", + "port-version": 0 }, "boost-contract": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-conversion": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-convert": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-core": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-coroutine": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-crc": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-date-time": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-describe": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-detail": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-di": { @@ -677,467 +677,467 @@ "port-version": 0 }, "boost-dll": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-endian": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-exception": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-fiber": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-filesystem": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-flyweight": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-foreach": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-format": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-function": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-function-types": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-functional": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-fusion": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-geometry": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-gil": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-graph": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-hana": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-heap": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-histogram": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-hof": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-icl": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-integer": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-interprocess": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-interval": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-intrusive": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-io": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-iostreams": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-iterator": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-json": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lambda": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lambda2": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-leaf": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-local-function": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-locale": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-lockfree": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-log": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-logic": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-math": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-metaparse": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.79.0", - "port-version": 8 + "baseline": "1.80.0", + "port-version": 0 }, "boost-move": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-mp11": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-mpi": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-mpl": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-msm": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-multi-array": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-multi-index": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-nowide": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-odeint": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-optional": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-outcome": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-parameter": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-pfr": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-phoenix": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-polygon": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-pool": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-predef": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-process": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-program-options": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-property-map": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-property-map-parallel": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-property-tree": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-proto": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-python": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-qvm": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-random": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-range": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-ratio": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-rational": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-regex": { - "baseline": "1.79.0", - "port-version": 1 + "baseline": "1.80.0", + "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-serialization": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-signals2": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-sort": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-spirit": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-statechart": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-static-assert": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-static-string": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-system": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-test": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-thread": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-timer": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-tti": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-tuple": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-type-index": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-type-traits": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-typeof": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-ublas": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-uninstall": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-units": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-unordered": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-utility": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-uuid": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-variant": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-variant2": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-vcpkg-helpers": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-vmd": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-wave": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-winapi": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-xpressive": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boost-yap": { - "baseline": "1.79.0", + "baseline": "1.80.0", "port-version": 0 }, "boringssl": { From 8a5bbf44092a10d75b159b7e474eb033b8c0df39 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 25 Aug 2022 19:59:30 +0200 Subject: [PATCH 474/791] [hunspell] Update and fix (#26481) * Update to 1.7.1 * Minor portfile updates * Fix mingw * Add proper 'nls' feature * Patch for autotools subdirs control * Update versions * Add license field * Update versions --- ports/hunspell/0005-autotools-subdirs.patch | 36 ++++++++++ ports/hunspell/portfile.cmake | 74 +++++++++++---------- ports/hunspell/vcpkg.json | 13 ++-- versions/baseline.json | 4 +- versions/h-/hunspell.json | 5 ++ 5 files changed, 92 insertions(+), 40 deletions(-) create mode 100644 ports/hunspell/0005-autotools-subdirs.patch diff --git a/ports/hunspell/0005-autotools-subdirs.patch b/ports/hunspell/0005-autotools-subdirs.patch new file mode 100644 index 00000000000000..0a4320d5bf5b68 --- /dev/null +++ b/ports/hunspell/0005-autotools-subdirs.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index c0aae53..769aef5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS= po src man tests ++SUBDIRS= po src + + pkgconfdir = $(libdir)/pkgconfig + pkgconf_DATA = hunspell.pc +diff --git a/configure.ac b/configure.ac +index 358cb1d..152adef 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,6 +38,9 @@ dnl internationalization macros + AM_GNU_GETTEXT_VERSION(0.18) + AM_GNU_GETTEXT([external]) + ++AC_ARG_ENABLE(tools,[]) ++AM_CONDITIONAL(DISABLE_TOOLS, test x$enable_tools != xyes) ++ + AC_ARG_WITH(warnings,[ --with-warnings compile with warning messages],[ + AC_DEFINE(HUNSPELL_WARNING_ON,1,"Define if you need warning messages") + ]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 45b7703..27700af 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1 +1,5 @@ ++if DISABLE_TOOLS ++SUBDIRS=hunspell ++else + SUBDIRS=hunspell parsers tools ++endif diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index 6c82edd18b007a..61ab522afd32db 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -1,24 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hunspell/hunspell - REF v1.7.0 - SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903 + REF v1.7.1 + SHA512 472249309aecbbc58a025445781268867173e0651a6147f29644975ad65af043a1e2fbe91f2094934526889c7f9944739dc0a5f0d25328a77d22db1fd8f055ec HEAD_REF master PATCHES 0001_fix_unistd.patch 0002-disable-test.patch 0003-fix-win-build.patch 0004-add-win-arm64.patch + 0005-autotools-subdirs.patch ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools BUILD_TOOLS -) +file(REMOVE "${SOURCE_PATH}/README") #README is a symlink +configure_file("${SOURCE_PATH}/README.md" "${SOURCE_PATH}/README" COPYONLY) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(REMOVE "${SOURCE_PATH}/README") #README is a symlink - #architecture detection if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(HUNSPELL_ARCH Win32) @@ -30,10 +27,10 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) message(FATAL_ERROR "unsupported architecture") endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(HUNSPELL_CONFIGURATION _dll) else() - set(HUNSPELL_CONFIGURATION ) + set(HUNSPELL_CONFIGURATION "") endif() if("tools" IN_LIST FEATURES) @@ -51,49 +48,58 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) DEBUG_CONFIGURATION Debug${HUNSPELL_CONFIGURATION} ALLOW_ROOT_INCLUDES ) + vcpkg_copy_pdbs() + + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunvisapi.h") + else() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ENV{CFLAGS} "$ENV{CFLAGS} -DHUNSPELL_STATIC") set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} -DHUNSPELL_STATIC") endif() - if(NOT "tools" IN_LIST FEATURES) # Building the tools is not possible on windows! - file(READ "${SOURCE_PATH}/src/Makefile.am" _contents) - string(REPLACE " parsers tools" "" _contents "${_contents}") - file(WRITE "${SOURCE_PATH}/src/Makefile.am" "${_contents}") + vcpkg_list(SET options) + if("tools" IN_LIST FEATURES) + vcpkg_list(APPEND options "--enable-tools") + endif() + if("nls" IN_LIST FEATURES) + vcpkg_list(APPEND options "--enable-nls") + else() + set(ENV{AUTOPOINT} true) # true, the program + vcpkg_list(APPEND options "--disable-nls") endif() - vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG ADDITIONAL_MSYS_PACKAGES gzip + OPTIONS + ${options} + OPTIONS_DEBUG + --disable-tools ) - #install-pkgconfDATA: - vcpkg_build_make(BUILD_TARGET dist LOGFILE_ROOT build-dist) + if("nls" IN_LIST FEATURES) + vcpkg_build_make(BUILD_TARGET dist LOGFILE_ROOT build-dist) + endif() vcpkg_install_make() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") vcpkg_fixup_pkgconfig() + + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunspell/hunvisapi.h") endif() -vcpkg_copy_pdbs() if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if (VCPKG_TARGET_IS_WINDOWS) - set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunvisapi.h") - else() - set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunspell/hunvisapi.h") - endif() - vcpkg_replace_string( - ${HUNSPELL_EXPORT_HDR} - "#if defined(HUNSPELL_STATIC)" - "#if 1" - ) + vcpkg_replace_string("${HUNSPELL_EXPORT_HDR}" "#if defined(HUNSPELL_STATIC)" "#if 1") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright-lgpl) -file(INSTALL "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright-mpl) +vcpkg_install_copyright( + COMMENT "Hunspell is licensed under LGPL/GPL/MPL tri-license." + FILE_LIST + "${SOURCE_PATH}/license.hunspell" + "${SOURCE_PATH}/license.myspell" + "${SOURCE_PATH}/COPYING.MPL" + "${SOURCE_PATH}/COPYING" + "${SOURCE_PATH}/COPYING.LESSER" +) diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index ae1c6d393591a4..f5e602197a3751 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -1,17 +1,19 @@ { "name": "hunspell", - "version": "1.7.0", - "port-version": 8, + "version": "1.7.1", "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", + "license": "MPL-1.1 OR LGPL-2.1-or-later OR GPL-2.0-or-later", "supports": "!uwp", "dependencies": [ "libiconv" ], "features": { - "tools": { - "description": "Build hunspell tools", + "nls": { + "description": "Enable native language support", + "supports": "!windows | mingw", "dependencies": [ + "gettext", { "name": "gettext", "host": true, @@ -20,6 +22,9 @@ ] } ] + }, + "tools": { + "description": "Build hunspell tools" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 97f5c2854f5e5c..d59efeb374e9e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2877,8 +2877,8 @@ "port-version": 1 }, "hunspell": { - "baseline": "1.7.0", - "port-version": 8 + "baseline": "1.7.1", + "port-version": 0 }, "hwloc": { "baseline": "2.7.1", diff --git a/versions/h-/hunspell.json b/versions/h-/hunspell.json index 7477d316120ba7..b526cc9562cb06 100644 --- a/versions/h-/hunspell.json +++ b/versions/h-/hunspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3adb7d5162395e281e90173a290f16303c977f3b", + "version": "1.7.1", + "port-version": 0 + }, { "git-tree": "9beac8cd192fb54839925b083fa72e611d7bcfee", "version": "1.7.0", From a9dc9a4b32150e61518ad7b8ce963abeefd3261d Mon Sep 17 00:00:00 2001 From: Nursultan Zarlyk Date: Thu, 25 Aug 2022 23:36:41 +0200 Subject: [PATCH 475/791] [OpenBLAS] Upgrade to 0.3.21 and add arm64-windows support (#26396) * Upgrade OpenBLAS * Update OpenBLAS version * Add OpenBLAS dependents to ci.baseline Co-authored-by: Nursultan Zarlyk --- ports/openblas/fix-space-path.patch | 8 ++++---- ports/openblas/portfile.cmake | 10 +++++++--- ports/openblas/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 4 ++++ versions/baseline.json | 2 +- versions/o-/openblas.json | 5 +++++ 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ports/openblas/fix-space-path.patch b/ports/openblas/fix-space-path.patch index b782a994fe0f5b..e0944fadd6f59c 100644 --- a/ports/openblas/fix-space-path.patch +++ b/ports/openblas/fix-space-path.patch @@ -1,8 +1,8 @@ diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake -index 58ca1eb..e2f2134 100644 +index 60b7637..a8b34ef 100644 --- a/cmake/prebuild.cmake +++ b/cmake/prebuild.cmake -@@ -490,14 +490,14 @@ else(NOT CMAKE_CROSSCOMPILING) +@@ -1322,14 +1322,14 @@ else(NOT CMAKE_CROSSCOMPILING) set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build") set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}") @@ -19,9 +19,9 @@ index 58ca1eb..e2f2134 100644 - COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} + COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" ) - + if (NOT ${GETARCH_RESULT}) -@@ -518,14 +518,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA +@@ -1367,14 +1367,14 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build") set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}") diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 39a5dc94686de2..24da7a0124dad5 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF 0b678b19dc03f2a999d6e038814c4c50b9640a4e # v0.3.20 - SHA512 6e32f7dfc5dde46570873810c1da09d102f76ccfce41a5adbaeef2fccada54f9ab07e1ee541a6d55e138e6500392a6f55236f4f3a7766803358e5a6205334946 + REF b89fb708caa5a5a32de8f4306c4ff132e0228e9a # v0.3.21 + SHA512 495e885409f0c6178332cddd685f3c002dc92e7af251c4e4eb3da6935ef6e81565c2505d436245b9bf53ce58649764e0471dc43b7f5f30b6ed092366cbbc2d5c HEAD_REF develop PATCHES uwp.patch @@ -55,6 +55,10 @@ elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)) ) endif() +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + list(APPEND OPENBLAS_EXTRA_OPTIONS -DCORE=GENERIC) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" ${conf_opts} @@ -108,4 +112,4 @@ vcpkg_replace_string( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 1bc43d57359048..1cac7bff40ba3e 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,10 +1,10 @@ { "name": "openblas", - "version": "0.3.20", + "version": "0.3.21", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "license": "BSD-3-Clause", - "supports": "!(windows & arm)", + "supports": "!(arm & uwp)", "dependencies": [ { "name": "openblas", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dfbf59cf95061c..437438409a459e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -201,6 +201,7 @@ discord-rpc:x64-uwp=fail # requires g++11 discordcoreapi:x64-linux=fail dlib:arm-uwp=fail +dlib:arm64-windows=fail dlib:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail @@ -234,6 +235,7 @@ embree2:arm64-osx=skip embree2:arm64-osx=skip epsilon:arm-uwp=fail epsilon:x64-uwp=fail +faiss:arm64-windows=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail @@ -281,6 +283,7 @@ gsoap:x86-windows = skip gsoap:x64-windows-static = skip gsoap:x64-windows-static-md = skip +geogram:arm64-windows=fail # Port geotrans source ftp://ftp.nga.mil server # extremely slow may take several hours to download geotrans:x64-linux = skip @@ -1037,6 +1040,7 @@ shogun:x64-windows-static-md=skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail +simbody:arm64-windows=fail skia:arm-uwp=fail skia:x64-uwp=fail sleef:x86-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index d59efeb374e9e6..d932f6564e2f3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5185,7 +5185,7 @@ "port-version": 3 }, "openblas": { - "baseline": "0.3.20", + "baseline": "0.3.21", "port-version": 0 }, "opencascade": { diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 558bb03bf12f5a..b8eb31147b9dc2 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17b5c709377ee3e375a3b6b165ac9acb9752c3f6", + "version": "0.3.21", + "port-version": 0 + }, { "git-tree": "abd8d8b0d0286d963399d79e3e8b6f7f8e12117b", "version": "0.3.20", From 2dd429b67b5ad5cd5c9ebc65cc2c1936f1e67a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 26 Aug 2022 18:45:15 +0000 Subject: [PATCH 476/791] [nuget] Update to 6.2.1 (#26522) --- scripts/vcpkgTools.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index b7c986b1f4dfd3..e5cc7d15481cb1 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -95,22 +95,22 @@ 1a98beebd1bb6929cbe98b86a3b77fb1ae4508b86cdcb64696b20c3a3336a2b5c8518e19a21092f1c98a46202c048dba819dc52bef122485ac34b888b77e59b2 - 5.11.0 + 6.2.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe - 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + https://dist.nuget.org/win-x86-commandline/v6.2.1/nuget.exe + dbb8c13d93a8c0071f45b1fe733ee7a888078dcec5bbcb4dfb49ab8c3970c7513f608bd3bc80b0bfb4764a505ea017cac2ead3656e1a5aa7f3a770c8e3e35825 - 5.11.0 + 6.2.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe - 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + https://dist.nuget.org/win-x86-commandline/v6.2.1/nuget.exe + dbb8c13d93a8c0071f45b1fe733ee7a888078dcec5bbcb4dfb49ab8c3970c7513f608bd3bc80b0bfb4764a505ea017cac2ead3656e1a5aa7f3a770c8e3e35825 - 5.11.0 + 6.2.1 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe - 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 + https://dist.nuget.org/win-x86-commandline/v6.2.1/nuget.exe + dbb8c13d93a8c0071f45b1fe733ee7a888078dcec5bbcb4dfb49ab8c3970c7513f608bd3bc80b0bfb4764a505ea017cac2ead3656e1a5aa7f3a770c8e3e35825 0.11.0 From c87d5dc427b016ed9f9ae3d39a74253bb5328f63 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 26 Aug 2022 11:50:42 -0700 Subject: [PATCH 477/791] [boost-build] Fix incorrect hash (#26527) --- ports/boost-build/portfile.cmake | 2 +- ports/boost-build/vcpkg.json | 1 + versions/b-/boost-build.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index e0e3fad9d4788b..f14b3dc86f830a 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 9076732697f9d8f682b5857f6552b537e7745fedfcee3b82083d497a1f58a795ae73c652ab2a04340b9264155738f4eccfe33095bc996169a4e5117e641644fb + SHA512 11ac21b27c5c656951784734c6642a2d4efa185e074ec48561f2800203b639d4a628fec6d356bb733494889141327a7ac730ce127449bfc7d509d5d213216995 HEAD_REF master PATCHES 0002-fix-get-version.patch diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index beeff3345aa261..42e04cebdcb945 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-build", "version": "1.80.0", + "port-version": 1, "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "license": "BSL-1.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index ed49e092f25749..d527f3656919ed 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec5ac2fde8a696a243092c4039f4b34b68091859", + "version": "1.80.0", + "port-version": 1 + }, { "git-tree": "8b95798b4e7cc7d6697ff1eecc9261ba5d884828", "version": "1.80.0", diff --git a/versions/baseline.json b/versions/baseline.json index d932f6564e2f3a..962742f7d9c718 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -590,7 +590,7 @@ }, "boost-build": { "baseline": "1.80.0", - "port-version": 0 + "port-version": 1 }, "boost-callable-traits": { "baseline": "1.80.0", From e049c9cd9f70cd516768ab766503865c4c8d5732 Mon Sep 17 00:00:00 2001 From: Daniele Pallastrelli <5451767+daniele77@users.noreply.github.com> Date: Fri, 26 Aug 2022 20:53:08 +0200 Subject: [PATCH 478/791] [cli] Update the version to 2.0.2 (#26411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [cli] Update the version to 1.1.1 * [cli] Update the version to 1.2.1 * [cli] Update the version to 1.2.1: fix PR requests * [aricpp] create a new port (#17162) * [cli] run the command: ./vcpkg x-add-version --all * [aricpp] change request for #18048 * Update ports/aricpp/portfile.cmake * [aricpp] change request for #18048 * Update ports/aricpp/vcpkg.json * Update ports/aricpp/vcpkg.json * Update versions/a-/aricpp.json * Update versions/a-/aricpp.json * [aricpp] port-version -> 0 * [cli] v. 2.0 * [cli] Update ports/cli/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/cli/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [cli] bump port version * Update versions/c-/cli.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [cli] Update the version to 2.0.1 * [cli] Update the version to 2.0.1 * [cli] Update the version to 2.0.1 * update version * update version * use version not version-semver * overwrite version * add license * update version * [cli] update port-version * format * add version Co-authored-by: Daniele Pallastrelli Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: nicole mazzuca Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: FrankXie --- ports/cli/portfile.cmake | 4 ++-- ports/cli/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cli.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake index 0ab65b1a92516c..f80c55f821fc97 100644 --- a/ports/cli/portfile.cmake +++ b/ports/cli/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/cli - REF v2.0.1 - SHA512 cf91512bb960ead60b7a2a021e3851b998a2228f482a1a7921acb3e2ab4ff10e542c6c910997326b3e059cef7509223ec34077ce545d9af29d8903e8fecfd5ac + REF v2.0.2 + SHA512 5a9b96ec59c6b51733c906b1e1815e4fb2cc645599b81a15a3cb0220fd9360bbc3f8e5fdab063c0050188c587e1448cac0629d96437181ddf86555165b79f812 HEAD_REF master ) diff --git a/ports/cli/vcpkg.json b/ports/cli/vcpkg.json index 472af76a5fc16b..357e663dac4aca 100644 --- a/ports/cli/vcpkg.json +++ b/ports/cli/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cli", - "version": "2.0.1", + "version": "2.0.2", "description": "A library for interactive command line interfaces in modern C++", "homepage": "https://github.com/daniele77/cli", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 962742f7d9c718..d58bcabc527630 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1433,7 +1433,7 @@ "port-version": 5 }, "cli": { - "baseline": "2.0.1", + "baseline": "2.0.2", "port-version": 0 }, "cli11": { diff --git a/versions/c-/cli.json b/versions/c-/cli.json index 1c705d9ba73961..3e0b9f99055e52 100644 --- a/versions/c-/cli.json +++ b/versions/c-/cli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72fd89f268dc5d3318561366f54ee6aed341669f", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "25a075116903bfd73e5a1e4f63638955c1a52732", "version": "2.0.1", From 99d30139e93469bc1bbd1f8c8a2eb477c03b61b0 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 26 Aug 2022 13:55:08 -0500 Subject: [PATCH 479/791] [jasper] disable opengl feature on ios, allowing it to build (#26472) * [jasper] don't include opengl feature on ios * ./vcpkg x-add-version --all * add license: null to indiate a license not in SPDX * ./vcpkg x-add-version --all --- ports/jasper/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/j-/jasper.json | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json index ff001a2a7ea8de..92429c1502554f 100644 --- a/ports/jasper/vcpkg.json +++ b/ports/jasper/vcpkg.json @@ -1,9 +1,10 @@ { "name": "jasper", "version": "2.0.33", - "port-version": 5, + "port-version": 6, "description": "Open source implementation of the JPEG-2000 Part-1 standard", "homepage": "https://github.com/mdadams/jasper", + "license": null, "dependencies": [ "libjpeg-turbo", { @@ -28,7 +29,7 @@ "features": [ "opengl" ], - "platform": "!(windows & arm) & !uwp" + "platform": "!(windows & arm) & !uwp & !ios" } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index d58bcabc527630..db673c18e5807f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3102,7 +3102,7 @@ }, "jasper": { "baseline": "2.0.33", - "port-version": 5 + "port-version": 6 }, "jbig2dec": { "baseline": "0.19", diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index 3adc9500bd7b13..f13ac321fe0220 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb8dca022aa130726431991cc9c70cc3162ea657", + "version": "2.0.33", + "port-version": 6 + }, { "git-tree": "e5220ea6a54e25d777f853a2c77196be67da02f3", "version": "2.0.33", From 754cc25428e0832d1086a669d62eff1d33330787 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 26 Aug 2022 14:03:37 -0500 Subject: [PATCH 480/791] [jxrlib] fix iOS build (#26506) * [jxrlib] fix iOS build * ./vcpkg x-add-version --all * [jxrlib] fix deprecated functions, add license * ./vcpkg x-add-version --all * [jxrlib] fix absolute paths * ./vcpkg x-add-version --all --- ports/jxrlib/portfile.cmake | 19 +++++++++---------- ports/jxrlib/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/j-/jxrlib.json | 5 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index a15541b9964a0c..cdfe1fd1c7926d 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -8,28 +8,27 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) -if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux) +if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES iOS) # The file guiddef.h is part of the Windows SDK, # we then remove the local copy shipped with jxrlib - file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h) + file(REMOVE "${SOURCE_PATH}/common/include/guiddef.h") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) #install FindJXR.cmake file -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/jxr) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jxrlib/vcpkg.json b/ports/jxrlib/vcpkg.json index bdd2c9eb1e5237..5e350632995b2b 100644 --- a/ports/jxrlib/vcpkg.json +++ b/ports/jxrlib/vcpkg.json @@ -1,7 +1,14 @@ { "name": "jxrlib", "version": "2019.10.9", - "port-version": 3, + "port-version": 4, "description": "Open source implementation of the jpegxr image format standard.", - "homepage": "https://github.com/4creators/jxrlib" + "homepage": "https://github.com/4creators/jxrlib", + "license": "BSD-2-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index db673c18e5807f..08bc2e3d7c086b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3170,7 +3170,7 @@ }, "jxrlib": { "baseline": "2019.10.9", - "port-version": 3 + "port-version": 4 }, "kangaru": { "baseline": "4.3.0", diff --git a/versions/j-/jxrlib.json b/versions/j-/jxrlib.json index 4995aa67e2a8db..9689aa86e1f1ce 100644 --- a/versions/j-/jxrlib.json +++ b/versions/j-/jxrlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faadd72c2d406fce9c076c025285aa692995a8b5", + "version": "2019.10.9", + "port-version": 4 + }, { "git-tree": "2070ec06331c3cf93574ec82fa22791e3ba6172f", "version": "2019.10.9", From 083e31d80b16df070d9aac4d8cfb9fd30a593171 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 27 Aug 2022 03:11:07 +0800 Subject: [PATCH 481/791] Add tclap support (#26530) --- ports/opencc/fix-dependencies.patch | 9 +++++++-- ports/opencc/portfile.cmake | 1 + ports/opencc/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/opencc.json | 5 +++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/opencc/fix-dependencies.patch b/ports/opencc/fix-dependencies.patch index 401de5145718ba..bbdcf10217f17a 100644 --- a/ports/opencc/fix-dependencies.patch +++ b/ports/opencc/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 11d14e4..fde4b7b 100644 +index 11d14e4..8180f21 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -137,6 +137,11 @@ set_target_properties( +@@ -137,6 +137,16 @@ set_target_properties( 1.1 ) @@ -10,6 +10,11 @@ index 11d14e4..fde4b7b 100644 + find_package(RapidJSON CONFIG REQUIRED) + target_link_libraries(libopencc PRIVATE rapidjson) +endif() ++ ++if(USE_SYSTEM_TCLAP) ++ find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h") ++ target_include_directories(libopencc PUBLIC ${TCLAP_INCLUDE_DIRS}) ++endif() + # Installation diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index 7b34399f1ded0f..011972bbc1f88b 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_cmake_configure( -DBUILD_DOCUMENTATION=OFF -DENABLE_GTEST=OFF -DUSE_SYSTEM_RAPIDJSON=ON + -DUSE_SYSTEM_TCLAP=ON ) vcpkg_cmake_install( diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index e4a42458f148b4..d38937130d974b 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,13 +1,14 @@ { "name": "opencc", "version": "1.1.4", - "port-version": 1, + "port-version": 2, "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "homepage": "https://github.com/BYVoid/OpenCC", "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ "rapidjson", + "tclap", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 08bc2e3d7c086b..214fdfdc8ef782 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5194,7 +5194,7 @@ }, "opencc": { "baseline": "1.1.4", - "port-version": 1 + "port-version": 2 }, "opencensus-cpp": { "baseline": "2021-08-26", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index b8627179336e28..fb8782bd2f0ca5 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2339a48f2758995166b42d82c9eb22c880190ac3", + "version": "1.1.4", + "port-version": 2 + }, { "git-tree": "bfa36e95a55659eb27edc3ba561b3c06b202ff76", "version": "1.1.4", From de7091ee2447e7450a63331e4560762e394f568c Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Fri, 26 Aug 2022 21:15:49 +0200 Subject: [PATCH 482/791] [cocoyaxi] Upstream changed repo name (#26514) * [cocoyaxi] Fix SHA * Fix upstream repo name * version Co-authored-by: Neo Ko --- ports/cocoyaxi/portfile.cmake | 14 ++++++++------ ports/cocoyaxi/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/cocoyaxi.json | 5 +++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ports/cocoyaxi/portfile.cmake b/ports/cocoyaxi/portfile.cmake index 309011b71284fb..54895bcdc05bed 100644 --- a/ports/cocoyaxi/portfile.cmake +++ b/ports/cocoyaxi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO idealvin/cocoyaxi - REF 3fd22601de4d7a06548ca4d24ac36b4f82cde8c5 #v2.0.3 - SHA512 15a7fbd934b44ffd981067c18a66bf07423d8ded102d0c15b79c2f451192f17541b9c1a3d4eb913d9f8c7a55e051e4e1968e16a1113fa81038b3ad9534c57874 + REPO idealvin/coost + REF v2.0.3 + SHA512 b6d38181a8da7dd06cc6ee9c0310ebbc87db5fc0e82e1deb9afba7813d0741fed194887770c55a9a1c61ad677b365cac5ba4f0cf3f32ee376d86c6822d9e30c4 HEAD_REF master ) @@ -10,16 +10,18 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - libcurl WITH_LIBCURL - openssl WITH_OPENSSL + libcurl WITH_LIBCURL + openssl WITH_OPENSSL ) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} -DSTATIC_VS_CRT=${STATIC_CRT} - DISABLE_PARALLEL_CONFIGURE + MAYBE_UNUSED_VARIABLES + STATIC_VS_CRT ) vcpkg_cmake_install() diff --git a/ports/cocoyaxi/vcpkg.json b/ports/cocoyaxi/vcpkg.json index 37ecc51c7ed051..44577d782876c3 100644 --- a/ports/cocoyaxi/vcpkg.json +++ b/ports/cocoyaxi/vcpkg.json @@ -1,9 +1,10 @@ { "name": "cocoyaxi", "version-semver": "2.0.3", - "port-version": 2, + "port-version": 3, "description": "A go-style coroutine library in C++11 and more", "homepage": "https://github.com/idealvin/cocoyaxi", + "license": "MIT", "supports": "!uwp & !(arm & windows)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 214fdfdc8ef782..25f8e88a4435b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1502,7 +1502,7 @@ }, "cocoyaxi": { "baseline": "2.0.3", - "port-version": 2 + "port-version": 3 }, "coin": { "baseline": "4.0.0", diff --git a/versions/c-/cocoyaxi.json b/versions/c-/cocoyaxi.json index 55eaafec097b0d..9239da7219a9c4 100644 --- a/versions/c-/cocoyaxi.json +++ b/versions/c-/cocoyaxi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a71b5c50ae0dfa1791b446e7af707cdb080f36d5", + "version-semver": "2.0.3", + "port-version": 3 + }, { "git-tree": "991d1f948e96ec46e60f5d6925a825d63599eb44", "version-semver": "2.0.3", From 024a041b665c1f966d9da32eedbb2337dc00f09c Mon Sep 17 00:00:00 2001 From: daljit97 Date: Fri, 26 Aug 2022 20:30:53 +0100 Subject: [PATCH 483/791] [matchit] Add first draft port (#26499) * Add first draft port for matchit * Adjust formatting * Add version for matchit * Update matchit to v1.0.1 * Run vcpkg x-add-version for v1.0.1 * Fix typo in command for copying license file * Remove installation of redudant files * Add usage instructions * Update license info in vcpkg.json * FIX: revert license change info to libzippp Previous commit incorrectly change the license for the port libzippp. This commit fixes that. * Run vcpkg x-add-version * Update ports/matchit/portfile.cmake Change HEAD_REF to main Co-authored-by: Bowen Fu * Run vcpkg xdg-version * Add command for installing usage file * Run vcpkg x-add-version * Update matchit.json * Use quoted variables in portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Run x-add-version Co-authored-by: Bowen Fu Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/matchit/portfile.cmake | 23 +++++++++++++++++++++++ ports/matchit/usage | 4 ++++ ports/matchit/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/m-/matchit.json | 9 +++++++++ 5 files changed, 57 insertions(+) create mode 100644 ports/matchit/portfile.cmake create mode 100644 ports/matchit/usage create mode 100644 ports/matchit/vcpkg.json create mode 100644 versions/m-/matchit.json diff --git a/ports/matchit/portfile.cmake b/ports/matchit/portfile.cmake new file mode 100644 index 00000000000000..531a7dd592a99f --- /dev/null +++ b/ports/matchit/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BowenFu/matchit.cpp + REF v1.0.1 + SHA512 60edc6a392f5629391fa9e3ff09b7b98a0a782919a066ad2999eabb58e60f38bd50e080037b1276c5bca986f81ca0dfff2914816d46458b7b4e1c947a6134169 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/matchit") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/matchit/usage b/ports/matchit/usage new file mode 100644 index 00000000000000..a7697e0af02332 --- /dev/null +++ b/ports/matchit/usage @@ -0,0 +1,4 @@ +The package matchit provides CMake targets: + + find_package(matchit CONFIG REQUIRED) + target_link_libraries(main PRIVATE matchit::matchit) diff --git a/ports/matchit/vcpkg.json b/ports/matchit/vcpkg.json new file mode 100644 index 00000000000000..3228734cbc5ba3 --- /dev/null +++ b/ports/matchit/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "matchit", + "version": "1.0.1", + "description": "matchit is a pattern matching library for C++17 with macro-free APIs", + "homepage": "https://github.com/BowenFu/matchit.cpp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 25f8e88a4435b0..2a355baa4e9f2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4520,6 +4520,10 @@ "baseline": "2022-03-02", "port-version": 0 }, + "matchit": { + "baseline": "1.0.1", + "port-version": 0 + }, "materialx": { "baseline": "1.38.4", "port-version": 0 diff --git a/versions/m-/matchit.json b/versions/m-/matchit.json new file mode 100644 index 00000000000000..1bcabadf65b59f --- /dev/null +++ b/versions/m-/matchit.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1076ccb795a41c9ac08c17b06a295043695ed6ab", + "version": "1.0.1", + "port-version": 0 + } + ] +} From 316323019266ff54be39e0cb2c2de9caaa94cf75 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 26 Aug 2022 22:08:05 +0200 Subject: [PATCH 484/791] [vcpkg baseline][libxdamage,libxext,libxfixes] add ports (#26486) * [libxdamage] add port * [libxext] add port * [libxfixes] add port * v db * [libx11] try fixing crosscompilation on windows. * retry * move to manual-tools * touch doesn't work need the original obj file * retry touch * touch doesn't seem to work. * v db --- ports/libx11/portfile.cmake | 18 +++++++++++++++++- ports/libx11/vcpkg.json | 5 +++++ ports/libxdamage/portfile.cmake | 30 ++++++++++++++++++++++++++++++ ports/libxdamage/vcpkg.json | 14 ++++++++++++++ ports/libxext/portfile.cmake | 31 +++++++++++++++++++++++++++++++ ports/libxext/vcpkg.json | 12 ++++++++++++ ports/libxfixes/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/libxfixes/vcpkg.json | 12 ++++++++++++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 14 +++++++++++++- versions/l-/libx11.json | 5 +++++ versions/l-/libxdamage.json | 9 +++++++++ versions/l-/libxext.json | 9 +++++++++ versions/l-/libxfixes.json | 9 +++++++++ 14 files changed, 195 insertions(+), 4 deletions(-) create mode 100644 ports/libxdamage/portfile.cmake create mode 100644 ports/libxdamage/vcpkg.json create mode 100644 ports/libxext/portfile.cmake create mode 100644 ports/libxext/vcpkg.json create mode 100644 ports/libxfixes/portfile.cmake create mode 100644 ports/libxfixes/vcpkg.json create mode 100644 versions/l-/libxdamage.json create mode 100644 versions/l-/libxext.json create mode 100644 versions/l-/libxfixes.json diff --git a/ports/libx11/portfile.cmake b/ports/libx11/portfile.cmake index 52449bbe530993..51a5c24d8e808d 100644 --- a/ports/libx11/portfile.cmake +++ b/ports/libx11/portfile.cmake @@ -61,6 +61,13 @@ vcpkg_configure_make( ${OPTIONS} ) +if(VCPKG_CROSSCOMPILING) + file(GLOB FOR_BUILD_FILES "${CURRENT_HOST_INSTALLED_DIR}/manual-tools/${PORT}/*") + file(COPY ${FOR_BUILD_FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util") + if(NOT VCPKG_BUILD_TYPE) + file(COPY ${FOR_BUILD_FILES} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/util") + endif() +endif() vcpkg_install_make() vcpkg_fixup_pkgconfig() @@ -73,8 +80,17 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(NOT VCPKG_CROSSCOMPILING) + file(READ "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" config_contents) + string(REGEX MATCH "ac_cv_objext=[^\n]+" objsuffix "${config_contents}") + string(REPLACE "ac_cv_objext=" "." objsuffix "${objsuffix}") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util/makekeys${VCPKG_TARGET_EXECUTABLE_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/util/makekeys${objsuffix}" DESTINATION "${CURRENT_PACKAGES_DIR}/manual-tools/${PORT}") endif() +endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" - "${CURRENT_PACKAGES_DIR}/share/x11/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file + "${CURRENT_PACKAGES_DIR}/share/x11/vcpkg-cmake-wrapper.cmake" @ONLY) + diff --git a/ports/libx11/vcpkg.json b/ports/libx11/vcpkg.json index 4f68d076b46e20..f48ef72d817c03 100644 --- a/ports/libx11/vcpkg.json +++ b/ports/libx11/vcpkg.json @@ -1,11 +1,16 @@ { "name": "libx11", "version": "1.7.3.1", + "port-version": 1, "description": "The X Window System is a network-transparent window system that was designed at MIT.", "homepage": "https://www.x.org/wiki/", "license": "MIT", "dependencies": [ "bzip2", + { + "name": "libx11", + "host": true + }, { "name": "libxslt", "host": true diff --git a/ports/libxdamage/portfile.cmake b/ports/libxdamage/portfile.cmake new file mode 100644 index 00000000000000..44ed2a42e19e92 --- /dev/null +++ b/ports/libxdamage/portfile.cmake @@ -0,0 +1,30 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxdamage + REF 977b04cd69738806e0b48fcf5c725763d065f06d # 1.1.5 + SHA512 79c3a4c63f6c50c39d324183b98ad7e70235aed1c8385acf2f593739c71e7929119448be3e15dffd276b32e4fbb056508deeb35f450f74b85c101047f68d4339 + HEAD_REF master # branch name +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxdamage/vcpkg.json b/ports/libxdamage/vcpkg.json new file mode 100644 index 00000000000000..dc86f1ee794536 --- /dev/null +++ b/ports/libxdamage/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxdamage", + "version": "1.1.5", + "description": "X Damage Extension library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxdamage", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxfixes", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/libxext/portfile.cmake b/ports/libxext/portfile.cmake new file mode 100644 index 00000000000000..a116f6fd0de816 --- /dev/null +++ b/ports/libxext/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxext + REF ebb167f34a3514783966775fb12573c4ed209625 # 1.3.4 + SHA512 509cb67ad9dba37adbcc49dca6e9803b318f62e8e2b981ccf73ce328a8104e94615312c5914b480ba04e28d208cd93d8a71b3e6e2ef1a4e5615aa2a3f9ba19e7 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS xorg_cv_malloc0_returns_null=yes +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxext/vcpkg.json b/ports/libxext/vcpkg.json new file mode 100644 index 00000000000000..ed49330c742ad8 --- /dev/null +++ b/ports/libxext/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxext", + "version": "1.3.4", + "description": "Xlib-based library for common extensions to the X11 protocol", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxext", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/libxfixes/portfile.cmake b/ports/libxfixes/portfile.cmake new file mode 100644 index 00000000000000..0441be999c4099 --- /dev/null +++ b/ports/libxfixes/portfile.cmake @@ -0,0 +1,29 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxfixes + REF 6fe3bd64dd82f704ed91478acb4c99ab5c00be16 # 6.0.0 + SHA512 429e65f4183d92cee1380273a23be9bf157bdd19e01e164d8b9058a2a54601af8f4556888302a2cad062c2cfc4b3a37d6b8f5b7ac6bdd6b5c069c7b791422201 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxfixes/vcpkg.json b/ports/libxfixes/vcpkg.json new file mode 100644 index 00000000000000..a079b2264dd155 --- /dev/null +++ b/ports/libxfixes/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxfixes", + "version": "6.0.0", + "description": "Xlib-based library for the XFIXES Extension", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfixes", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros", + "xproto" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 437438409a459e..f77b936a7c6698 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1198,8 +1198,6 @@ xalan-c:x64-windows-static=fail xalan-c:arm64-windows=fail xerces-c:arm-uwp=fail xerces-c:x64-uwp=fail -# Crosscompiling libx11 requires additional steps and patches to the Makefiles. -libx11:arm64-windows=fail xmlsec:arm-uwp=fail xmlsec:x64-uwp=fail yara:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2a355baa4e9f2e..ead246c2c90099 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4274,12 +4274,16 @@ }, "libx11": { "baseline": "1.7.3.1", - "port-version": 0 + "port-version": 1 }, "libxau": { "baseline": "1.0.9", "port-version": 0 }, + "libxdamage": { + "baseline": "1.1.5", + "port-version": 0 + }, "libxdiff": { "baseline": "0.23", "port-version": 2 @@ -4288,6 +4292,14 @@ "baseline": "1.1.3", "port-version": 0 }, + "libxext": { + "baseline": "1.3.4", + "port-version": 0 + }, + "libxfixes": { + "baseline": "6.0.0", + "port-version": 0 + }, "libxlsxwriter": { "baseline": "1.1.4", "port-version": 0 diff --git a/versions/l-/libx11.json b/versions/l-/libx11.json index fe64a753250d6b..9e71dbb6c76c36 100644 --- a/versions/l-/libx11.json +++ b/versions/l-/libx11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e69bacce69d31cc63b4c1f6c5637ba204289a496", + "version": "1.7.3.1", + "port-version": 1 + }, { "git-tree": "1347521fb39c2ccfd11521a3e641854537799ca4", "version": "1.7.3.1", diff --git a/versions/l-/libxdamage.json b/versions/l-/libxdamage.json new file mode 100644 index 00000000000000..2c9916b6e75ba0 --- /dev/null +++ b/versions/l-/libxdamage.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "87138386fc68780b661be1216e8bb2e334071702", + "version": "1.1.5", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxext.json b/versions/l-/libxext.json new file mode 100644 index 00000000000000..5ffa055aed3e06 --- /dev/null +++ b/versions/l-/libxext.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e67774822086eb3d56334159f5aad5579643b5d3", + "version": "1.3.4", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxfixes.json b/versions/l-/libxfixes.json new file mode 100644 index 00000000000000..538847ac65febc --- /dev/null +++ b/versions/l-/libxfixes.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1f0262e8d5145c540a26a4740b62c84794244586", + "version": "6.0.0", + "port-version": 0 + } + ] +} From e85b5bb95a14ff7e014601e88a8dc2fea6798e33 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 26 Aug 2022 23:07:10 +0200 Subject: [PATCH 485/791] [wayland] add ports for wayland. (#26475) * add wayland * format manifest * uncomment the library guard * v db * add missing policy * v db --- ports/wayland-protocols/portfile.cmake | 36 ++++++++++++++ ports/wayland-protocols/vcpkg.json | 10 ++++ ports/wayland/portfile.cmake | 65 ++++++++++++++++++++++++++ ports/wayland/tests.patch | 30 ++++++++++++ ports/wayland/vcpkg.json | 17 +++++++ versions/baseline.json | 8 ++++ versions/w-/wayland-protocols.json | 9 ++++ versions/w-/wayland.json | 9 ++++ 8 files changed, 184 insertions(+) create mode 100644 ports/wayland-protocols/portfile.cmake create mode 100644 ports/wayland-protocols/vcpkg.json create mode 100644 ports/wayland/portfile.cmake create mode 100644 ports/wayland/tests.patch create mode 100644 ports/wayland/vcpkg.json create mode 100644 versions/w-/wayland-protocols.json create mode 100644 versions/w-/wayland.json diff --git a/ports/wayland-protocols/portfile.cmake b/ports/wayland-protocols/portfile.cmake new file mode 100644 index 00000000000000..402c598562427d --- /dev/null +++ b/ports/wayland-protocols/portfile.cmake @@ -0,0 +1,36 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO wayland/wayland-protocols + REF cd153943618bcf157896a6d0f1154d0ad62078a7 #1.23 + SHA512 aae49d168e467d554ada638887511fa696a9fae900c93067d97f9e3d405068dc87883933f09ca2a3ef8a04631fdcffb629c178ec6e4c247f0c2ff6c1aaaaa952 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I ${CURRENT_INSTALLED_DIR}/share/wayland/aclocal/") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig") + file(INSTALL "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/") + file(INSTALL "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/pkgconfig/") +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/wayland-protocols/vcpkg.json b/ports/wayland-protocols/vcpkg.json new file mode 100644 index 00000000000000..b85b39d12f87c2 --- /dev/null +++ b/ports/wayland-protocols/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "wayland-protocols", + "version": "1.23", + "description": "wayland-protocols contains Wayland protocols that add functionality not available in the Wayland core protocol.", + "homepage": "https://wayland.freedesktop.org", + "license": "MIT", + "dependencies": [ + "wayland" + ] +} diff --git a/ports/wayland/portfile.cmake b/ports/wayland/portfile.cmake new file mode 100644 index 00000000000000..effb14119101e2 --- /dev/null +++ b/ports/wayland/portfile.cmake @@ -0,0 +1,65 @@ +if(NOT X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_WAYLAND_LIBRARIES") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO wayland/wayland + REF e60398b1755bfcdf09f040d3769131fe0d9762fc #1.19.0 + SHA512 f2f7dd9ff71e99cf3621ab45160f59b679de763e3fdef6fcef7e14947ad43ed7a86845a213c75bb7117fdda11a51035566225a12d3eb33e8c3fe2e4456eb801d + HEAD_REF master + PATCHES tests.patch +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -Ddtd_validation=false + -Ddocumentation=false + -Dtests=false +) +vcpkg_install_meson() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/" AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-private${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-util${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/" AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-private${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/${VCPKG_TARGET_STATIC_LIBRARY_PREFIX}wayland-util${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wayland-scanner${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wayland-scanner${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/aclocal" "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/wayland-scanner.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "bindir=\${prefix}/bin" "bindir=\${prefix}/tools/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/wayland-scanner.pc") +if(EXISTS "${_file}") + file(READ "${_file}" _contents) + string(REPLACE "bindir=\${prefix}/bin" "bindir=\${prefix}/../tools/${PORT}" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") +endif() +endif() diff --git a/ports/wayland/tests.patch b/ports/wayland/tests.patch new file mode 100644 index 00000000000000..b58d55e2d75451 --- /dev/null +++ b/ports/wayland/tests.patch @@ -0,0 +1,30 @@ +diff --git a/meson.build b/meson.build +index 11c35fa67..26d69ade5 100644 +--- a/meson.build ++++ b/meson.build +@@ -91,7 +91,9 @@ subdir('src') + if get_option('libraries') + subdir('cursor') + subdir('egl') +- subdir('tests') ++ if get_option('tests') ++ subdir('tests') ++ endif + if get_option('documentation') + subdir('doc') + endif +diff --git a/meson_options.txt b/meson_options.txt +index de588d137..dc6ea1d8a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -10,6 +10,10 @@ option('documentation', + description: 'Build the documentation (requires Doxygen, dot, xmlto, xsltproc)', + type: 'boolean', + value: 'true') ++option('tests', ++ description: 'Build the tests', ++ type: 'boolean', ++ value: 'true') + option('dtd_validation', + description: 'Validate the protocol DTD (requires libxml2)', + type: 'boolean', diff --git a/ports/wayland/vcpkg.json b/ports/wayland/vcpkg.json new file mode 100644 index 00000000000000..2cb6f90cac82cd --- /dev/null +++ b/ports/wayland/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "wayland", + "version": "1.19.0", + "description": "Core Wayland window system code and protocol", + "homepage": "https://wayland.freedesktop.org", + "license": "MIT", + "supports": "!(windows | osx)", + "dependencies": [ + "expat", + "libffi", + "libxml2", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ead246c2c90099..85d6b838a6d46d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7648,6 +7648,14 @@ "baseline": "5.5.0", "port-version": 0 }, + "wayland": { + "baseline": "1.19.0", + "port-version": 0 + }, + "wayland-protocols": { + "baseline": "1.23", + "port-version": 0 + }, "websocketpp": { "baseline": "0.8.2", "port-version": 2 diff --git a/versions/w-/wayland-protocols.json b/versions/w-/wayland-protocols.json new file mode 100644 index 00000000000000..8407bb223c5e02 --- /dev/null +++ b/versions/w-/wayland-protocols.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c50a34c552f4b5bc2b867c5732ad0c27cfa8996a", + "version": "1.23", + "port-version": 0 + } + ] +} diff --git a/versions/w-/wayland.json b/versions/w-/wayland.json new file mode 100644 index 00000000000000..eca73e1770c70d --- /dev/null +++ b/versions/w-/wayland.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "353490d29b62e597126db445b5f2a49301002f5b", + "version": "1.19.0", + "port-version": 0 + } + ] +} From 8a991b8d86d37385b2e3f31ea8ec98f8b59d988a Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 29 Aug 2022 17:56:19 +0200 Subject: [PATCH 486/791] [anyrpc] Add MinGW support (#25901) * [anyrpc] Add MinGW support * Add note --- ports/anyrpc/mingw.patch | 216 ++++++++++++++++++++++++++++++++++++ ports/anyrpc/portfile.cmake | 2 + ports/anyrpc/vcpkg.json | 1 + versions/a-/anyrpc.json | 5 + versions/baseline.json | 2 +- 5 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 ports/anyrpc/mingw.patch diff --git a/ports/anyrpc/mingw.patch b/ports/anyrpc/mingw.patch new file mode 100644 index 00000000000000..e2a8e5428b685b --- /dev/null +++ b/ports/anyrpc/mingw.patch @@ -0,0 +1,216 @@ +diff --color -ur a/cmake/FindLog4cplus.cmake b/cmake/FindLog4cplus.cmake +--- a/cmake/FindLog4cplus.cmake 2020-01-13 18:31:55.000000000 +0100 ++++ b/cmake/FindLog4cplus.cmake 2022-07-19 19:35:41.701935383 +0200 +@@ -61,12 +61,12 @@ + + endif () + ++# needed to use find_package_handle_standard_args ++include(FindPackageHandleStandardArgs) ++ + if (LOG4CPLUS_INCLUDE_DIR) + # set the correct variable name for the header directories + set(LOG4CPLUS_INCLUDE_DIRS ${LOG4CPLUS_INCLUDE_DIR}) +- +- # needed to use find_package_handle_standard_args +- include(FindPackageHandleStandardArgs) + + if (LOG4CPLUS_LIBRARY_RELEASE AND LOG4CPLUS_LIBRARY_DEBUG) + # set the libaries varible to use the release and debug versions +diff --color -ur a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake +--- a/cmake/FindMsgpack.cmake 2020-01-13 18:31:55.000000000 +0100 ++++ b/cmake/FindMsgpack.cmake 2022-07-19 19:35:41.702935385 +0200 +@@ -61,13 +61,13 @@ + + endif () + ++# needed to use find_package_handle_standard_args ++include(FindPackageHandleStandardArgs) ++ + if (MSGPACK_INCLUDE_DIR) + # set the correct variable name for the header directories + set(MSGPACK_INCLUDE_DIRS ${MSGPACK_INCLUDE_DIR}) + +- # needed to use find_package_handle_standard_args +- include(FindPackageHandleStandardArgs) +- + if (MSGPACK_LIBRARY_RELEASE AND MSGPACK_LIBRARY_DEBUG) + # set the libaries varible to use the release and debug versions + find_package_handle_standard_args(MSGPACK DEFAULT_MSG MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY_RELEASE MSGPACK_LIBRARY_DEBUG) +diff --color -ur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2020-01-13 18:31:55.000000000 +0100 ++++ b/CMakeLists.txt 2022-07-19 19:36:01.112980511 +0200 +@@ -63,6 +63,7 @@ + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc" ) + elseif (MINGW) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__STRICT_ANSI__" ) ++ add_definitions( -D _POSIX_THREAD_SAFE_FUNCTIONS ) + elseif (BUILD_WITH_ADDRESS_SANITIZE) + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer" ) + SET( ASAN_LIBRARY asan ) +diff --color -ur a/example/CMakeLists.txt b/example/CMakeLists.txt +--- a/example/CMakeLists.txt 2020-01-13 18:31:55.000000000 +0100 ++++ b/example/CMakeLists.txt 2022-07-19 19:35:41.696935371 +0200 +@@ -48,5 +48,13 @@ + + # Add the necessary external library references + target_link_libraries( ${SOURCEFILE} anyrpc ${ASAN_LIBRARY} ${LOG4CPLUS_LIBRARIES} ${MSGPACK_LIBRARIES}) ++ ++ if (WIN32) ++ target_compile_definitions(${SOURCEFILE} ++ PRIVATE ++ WINVER=0x0A00 ++ _WIN32_WINNT=0x0A00 ++ ) ++ endif () + endforeach () + +diff --color -ur a/include/anyrpc/connection.h b/include/anyrpc/connection.h +--- a/include/anyrpc/connection.h 2020-01-13 18:31:55.000000000 +0100 ++++ b/include/anyrpc/connection.h 2022-07-19 19:35:41.698935376 +0200 +@@ -22,11 +22,7 @@ + #define ANYRPC_CONNECTION_H_ + + #if defined(ANYRPC_THREADING) +-# if defined(__MINGW32__) +-# include "internal/mingw.thread.h" +-# else +-# include +-# endif // defined(__MINGW32__) ++# include + #endif // defined(ANYRPC_THREADING) + + #if defined(ANYRPC_REGEX) +diff --color -ur a/include/anyrpc/internal/time.h b/include/anyrpc/internal/time.h +--- a/include/anyrpc/internal/time.h 2020-01-13 18:31:55.000000000 +0100 ++++ b/include/anyrpc/internal/time.h 2022-07-19 19:35:41.698935376 +0200 +@@ -32,10 +32,6 @@ + int gettimeofday(struct timeval * tp, struct timezone * tzp); + #endif + +-#if defined(__MINGW32__) +-struct tm* localtime_r(const time_t *timep, struct tm *result); +-#endif +- + //! Compute the difference between the two times in milliseconds + ANYRPC_API int MilliTimeDiff(struct timeval &time1, struct timeval &time2); + +diff --color -ur a/include/anyrpc/server.h b/include/anyrpc/server.h +--- a/include/anyrpc/server.h 2020-01-13 18:31:55.000000000 +0100 ++++ b/include/anyrpc/server.h 2022-07-19 19:35:41.699935378 +0200 +@@ -22,24 +22,9 @@ + #define ANYRPC_SERVER_H_ + + #if defined(ANYRPC_THREADING) +-# if defined(__MINGW32__) +-// These constants are not defined for mingw but are needed in the following libraries +-# ifndef EOWNERDEAD +-# define EOWNERDEAD 133 /* File too big */ +-# endif +-# ifndef EPROTO +-# define EPROTO 134 /* Protocol error */ +-# endif +- +-# include "internal/mingw.thread.h" +-# include +-# include "internal/mingw.mutex.h" +-# include "internal/mingw.condition_variable.h" +-# else +-# include +-# include +-# include +-# endif //defined(__MINGW32__) ++# include ++# include ++# include + #endif //defined(ANYRPC_THREADING) + + namespace anyrpc +diff --color -ur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2020-01-13 18:31:55.000000000 +0100 ++++ b/src/CMakeLists.txt 2022-07-19 19:35:41.697935374 +0200 +@@ -57,6 +57,12 @@ + # Need the winsock library for Windows + if (WIN32) + target_link_libraries(anyrpc ws2_32) ++ ++ target_compile_definitions(anyrpc ++ PRIVATE ++ WINVER=0x0A00 ++ _WIN32_WINNT=0x0A00 ++ ) + endif () + + set_target_properties( anyrpc PROPERTIES VERSION ${ANYRPC_VERSION} SOVERSION ${ANYRPC_VERSION_MAJOR} ) +diff --color -ur a/src/internal/time.cpp b/src/internal/time.cpp +--- a/src/internal/time.cpp 2020-01-13 18:31:55.000000000 +0100 ++++ b/src/internal/time.cpp 2022-07-19 19:35:41.699935378 +0200 +@@ -26,11 +26,8 @@ + #include + #endif + +-#if defined(_MSC_VER) +-#elif defined(__MINGW32__) +-#include +-#else +-#include ++#if !defined(_MSC_VER) ++# include + #endif + + namespace anyrpc +@@ -57,16 +54,6 @@ + } + #endif + +-#if defined(__MINGW32__) +-struct tm* localtime_r(const time_t *timep, struct tm *result) +-{ +- // with Windows localtime is threadsafe since the pointer is to thread local storage +- struct tm *t=localtime(timep); +- memcpy(result,t,sizeof(struct tm)); +- return result; +-} +-#endif +- + int MilliTimeDiff( struct timeval &time1, struct timeval &time2 ) + { + return (time1.tv_sec - time2.tv_sec) * 1000 + (time1.tv_usec - time2.tv_usec)/1000; +diff --color -ur a/src/socket.cpp b/src/socket.cpp +--- a/src/socket.cpp 2020-01-13 18:31:55.000000000 +0100 ++++ b/src/socket.cpp 2022-07-19 19:35:41.701935383 +0200 +@@ -98,7 +98,7 @@ + int Socket::SetKeepAliveInterval(int startTime, int interval, int probeCount) + { + log_debug( "SetKeepAliveInterval: startTime=" << startTime << ", interval=" << interval << ", probeCount=" << probeCount); +-#if defined(_MSC_VER) ++#if defined(_MSC_VER) || defined(__MINGW32__) + DWORD outBytes; + tcp_keepalive tcp_ka; + tcp_ka.onoff = 1; +@@ -109,7 +109,7 @@ + if (result < 0) + log_debug( "SetKeepAliveInterval: result = " << result ); + return result; +-#elif defined(__MINGW32__) || defined(__CYGWIN__) ++#elif defined(__CYGWIN__) + // don't see how this can be performed right now + #elif (__APPLE__) + int result = setsockopt( fd_, IPPROTO_TCP, TCP_KEEPALIVE, (char*)&startTime, sizeof(startTime) ); +@@ -554,15 +554,11 @@ + + port = ntohs(receiveAddr.sin_port); + +-#if defined(__MINGW32__) +- // should be thread-safe since it would use the Windows call +- ipAddress = inet_ntoa(receiveAddr.sin_addr); +-#else + // Only need this buffer to perform the address conversion in a thread-safe call + const unsigned bufferLength = 100; + char addrBuffer[bufferLength]; + ipAddress = inet_ntop(AF_INET,&receiveAddr.sin_addr, addrBuffer, bufferLength); +-#endif ++ + log_debug("Udp Receive: address=" << ipAddress << ", port=" << port); + + eof = (numBytes == 0); diff --git a/ports/anyrpc/portfile.cmake b/ports/anyrpc/portfile.cmake index 3090d2db9cfec8..666fa016639263 100644 --- a/ports/anyrpc/portfile.cmake +++ b/ports/anyrpc/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( SHA512 8c674d29e80ec2522d6c1ec959663958ab4e1bf1135727c3c2aaa19e62a81ddbbd1e6a46f3e4679ee02894ad2ab26e70ca7e1e6c8750f3289994311069221b53 HEAD_REF master FILE_DISAMBIGUATOR 1 + PATCHES + mingw.patch # Remove this when https://github.com/sgieseking/anyrpc/pull/46 is released ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) diff --git a/ports/anyrpc/vcpkg.json b/ports/anyrpc/vcpkg.json index 02ffac66d9dc0a..a9bc22ada64c53 100644 --- a/ports/anyrpc/vcpkg.json +++ b/ports/anyrpc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "anyrpc", "version-date": "2021-08-24", + "port-version": 1, "description": "A multiprotocol remote procedure call system for C++.", "homepage": "https://github.com/sgieseking/anyrpc" } diff --git a/versions/a-/anyrpc.json b/versions/a-/anyrpc.json index 62639f3f0cc696..d1cfc15bcd5240 100644 --- a/versions/a-/anyrpc.json +++ b/versions/a-/anyrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e257a3e62f570c677889ee84e28b96536159e324", + "version-date": "2021-08-24", + "port-version": 1 + }, { "git-tree": "5f4ca4180fb5021b85ae6d4c5ad7b7e15f89b367", "version-date": "2021-08-24", diff --git a/versions/baseline.json b/versions/baseline.json index 85d6b838a6d46d..79ece669252b98 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -106,7 +106,7 @@ }, "anyrpc": { "baseline": "2021-08-24", - "port-version": 0 + "port-version": 1 }, "aom": { "baseline": "3.2.0", From 427f956bd584f2ebb51c1b50779be172af469305 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 29 Aug 2022 20:22:42 +0200 Subject: [PATCH 487/791] [opencv4,dv-processing] no absolute paths (#26586) --- ports/dv-processing/portfile.cmake | 7 ++----- ports/dv-processing/vcpkg.json | 1 + ports/opencv4/portfile.cmake | 1 - ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/d-/dv-processing.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 7 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ports/dv-processing/portfile.cmake b/ports/dv-processing/portfile.cmake index 1d6fe944184598..20ab20e4f01a8d 100644 --- a/ports/dv-processing/portfile.cmake +++ b/ports/dv-processing/portfile.cmake @@ -36,9 +36,6 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME "dv-processing" CONFIG_PATH "share/dv-proc file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if (VCPKG_TARGET_IS_WINDOWS) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") -else() - vcpkg_fixup_pkgconfig() -endif() +vcpkg_fixup_pkgconfig(SKIP_CHECK) + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dv-processing/vcpkg.json b/ports/dv-processing/vcpkg.json index e7c86827a97950..b95c1ac9ff66e1 100644 --- a/ports/dv-processing/vcpkg.json +++ b/ports/dv-processing/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dv-processing", "version": "1.5.1", + "port-version": 1, "description": "Generic algorithms for event cameras.", "homepage": "https://gitlab.com/inivation/dv/dv-processing", "license": "Apache-2.0", diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 67c440c4b2f59b..5694c5c53e55c4 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -382,7 +382,6 @@ vcpkg_cmake_configure( -DOPENCV_DLLVERSION=4 -DOPENCV_DEBUG_POSTFIX=d -DOPENCV_GENERATE_SETUPVARS=OFF - -DOPENCV_GENERATE_PKGCONFIG=ON # Do not build docs/examples -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index c77f11d7ea6a5e..43ecb005c3e0b6 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.6.0", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 79ece669252b98..fc278380042474 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2014,7 +2014,7 @@ }, "dv-processing": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "dx": { "baseline": "1.0.1", @@ -5250,7 +5250,7 @@ }, "opencv4": { "baseline": "4.6.0", - "port-version": 2 + "port-version": 3 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/d-/dv-processing.json b/versions/d-/dv-processing.json index 48beff248ba28e..ba576787ab51d5 100644 --- a/versions/d-/dv-processing.json +++ b/versions/d-/dv-processing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d2e7b2c11eaa6b13ce5b08447411a885adc2036", + "version": "1.5.1", + "port-version": 1 + }, { "git-tree": "5fb27b7a8c1ee9bd01035958e7b3b3a487a89dd8", "version": "1.5.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 59035e59c2a5b0..eee5dcb2d92468 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18c563d48f8245b3d1e0879ecdc6c37097a89b3c", + "version": "4.6.0", + "port-version": 3 + }, { "git-tree": "57554ec83d4e4667344f005a1f61be8164cbf58a", "version": "4.6.0", From 8f9a4f2de9da93e5509a326aaca49aa7b917d0cb Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Tue, 30 Aug 2022 02:33:30 +0800 Subject: [PATCH 488/791] [opencc] De-vendor darts (#26581) * Add tclap support * Add darts support --- ports/opencc/fix-dependencies.patch | 9 +++++++-- ports/opencc/portfile.cmake | 1 + ports/opencc/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/opencc.json | 5 +++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/opencc/fix-dependencies.patch b/ports/opencc/fix-dependencies.patch index bbdcf10217f17a..31e33a2e391e1d 100644 --- a/ports/opencc/fix-dependencies.patch +++ b/ports/opencc/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 11d14e4..8180f21 100644 +index 11d14e4..0fa3e1e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -137,6 +137,16 @@ set_target_properties( +@@ -137,6 +137,21 @@ set_target_properties( 1.1 ) @@ -15,6 +15,11 @@ index 11d14e4..8180f21 100644 + find_path(TCLAP_INCLUDE_DIRS "tclap/Arg.h") + target_include_directories(libopencc PUBLIC ${TCLAP_INCLUDE_DIRS}) +endif() ++ ++if(USE_SYSTEM_DARTS) ++ find_path(DARTS_INCLUDE_DIRS "darts.h") ++ target_include_directories(libopencc PUBLIC ${DARTS_INCLUDE_DIRS}) ++endif() + # Installation diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index 011972bbc1f88b..dc000f7ea86aae 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_cmake_configure( -DENABLE_GTEST=OFF -DUSE_SYSTEM_RAPIDJSON=ON -DUSE_SYSTEM_TCLAP=ON + -DUSE_SYSTEM_DARTS=ON ) vcpkg_cmake_install( diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index d38937130d974b..49833f4832bf0c 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,12 +1,13 @@ { "name": "opencc", "version": "1.1.4", - "port-version": 2, + "port-version": 3, "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)", "homepage": "https://github.com/BYVoid/OpenCC", "license": "Apache-2.0", "supports": "!(arm | uwp)", "dependencies": [ + "darts-clone", "rapidjson", "tclap", { diff --git a/versions/baseline.json b/versions/baseline.json index fc278380042474..6ff980f20b9591 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5210,7 +5210,7 @@ }, "opencc": { "baseline": "1.1.4", - "port-version": 2 + "port-version": 3 }, "opencensus-cpp": { "baseline": "2021-08-26", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index fb8782bd2f0ca5..8ee07aa68a6c06 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "463a25b4f9bfe6a259042a54cdd813ae7f96f4c9", + "version": "1.1.4", + "port-version": 3 + }, { "git-tree": "2339a48f2758995166b42d82c9eb22c880190ac3", "version": "1.1.4", From 9d44c159a4b522d23c70031a29936803df7307f9 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt <7577172+hmoffatt@users.noreply.github.com> Date: Tue, 30 Aug 2022 04:34:28 +1000 Subject: [PATCH 489/791] [Flat] Add new port (#26577) * new port flat: flat containers library * add flat library * add versions --- ports/flat/portfile.cmake | 15 +++++++++++++++ ports/flat/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/f-/flat.json | 9 +++++++++ 4 files changed, 35 insertions(+) create mode 100644 ports/flat/portfile.cmake create mode 100644 ports/flat/vcpkg.json create mode 100644 versions/f-/flat.json diff --git a/ports/flat/portfile.cmake b/ports/flat/portfile.cmake new file mode 100644 index 00000000000000..dc88ecd87c952c --- /dev/null +++ b/ports/flat/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO pubby/flat + REF 8c187b9f4435a7c86eacb5e21ec9f36119722827 + SHA512 1731b0f5c78a5a509e168ff632b18d3a4f5d772839b80239188613bc0313637dd62ce90511fee65497ce3e462de441bef00649836d82445761d9340e26036808 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/ + DESTINATION ${CURRENT_PACKAGES_DIR}/include/flat + FILES_MATCHING PATTERN "*.hpp") + +file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt + DESTINATION ${CURRENT_PACKAGES_DIR}/share/flat + RENAME copyright) diff --git a/ports/flat/vcpkg.json b/ports/flat/vcpkg.json new file mode 100644 index 00000000000000..b98dc6ce4a8da0 --- /dev/null +++ b/ports/flat/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "flat", + "version-date": "2022-06-10", + "description": "Flat Containers Library", + "homepage": "https://github.com/pubby/flat", + "license": "BSL-1.0" +} diff --git a/versions/baseline.json b/versions/baseline.json index 6ff980f20b9591..2323ae07105330 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2296,6 +2296,10 @@ "baseline": "0.3", "port-version": 4 }, + "flat": { + "baseline": "2022-06-10", + "port-version": 0 + }, "flatbuffers": { "baseline": "2.0.6", "port-version": 0 diff --git a/versions/f-/flat.json b/versions/f-/flat.json new file mode 100644 index 00000000000000..4f4c1b48a67060 --- /dev/null +++ b/versions/f-/flat.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0e7a31d2afadc58f808facb7381a039d5f72eb36", + "version-date": "2022-06-10", + "port-version": 0 + } + ] +} From 10ad7b25927cf861a6eb6c23bf1bb7300a294755 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 29 Aug 2022 20:36:07 +0200 Subject: [PATCH 490/791] [lcm] Disable examples and docs (#26568) * [lcm] Disable examples and docs * Test tools on Windows * Copy tools * version * TOOL_NAMES * version --- ports/lcm/disable-docs.patch | 12 ++++++++++++ ports/lcm/portfile.cmake | 22 ++++++---------------- ports/lcm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lcm.json | 5 +++++ 5 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 ports/lcm/disable-docs.patch diff --git a/ports/lcm/disable-docs.patch b/ports/lcm/disable-docs.patch new file mode 100644 index 00000000000000..c69b903826acf0 --- /dev/null +++ b/ports/lcm/disable-docs.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d3a4c2..90833e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,7 +39,6 @@ if(LCM_ENABLE_EXAMPLES) + endif() + + # Documentation (Main, C/C++, .NET) +-add_subdirectory(docs) + + # Java + lcm_option( diff --git a/ports/lcm/portfile.cmake b/ports/lcm/portfile.cmake index d9a22f178a0261..6b5246b3b9968e 100644 --- a/ports/lcm/portfile.cmake +++ b/ports/lcm/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( only-install-one-flavor.patch fix-build-error.patch glib.link.patch + disable-docs.patch ) vcpkg_cmake_configure( @@ -16,7 +17,9 @@ vcpkg_cmake_configure( -DLCM_ENABLE_JAVA=OFF -DLCM_ENABLE_LUA=OFF -DLCM_ENABLE_PYTHON=OFF + -DLCM_ENABLE_GO=OFF -DLCM_ENABLE_TESTS=OFF + -DLCM_ENABLE_EXAMPLES=OFF -DLCM_INSTALL_M4MACROS=OFF -DLCM_INSTALL_PKGCONFIG=OFF ) @@ -29,29 +32,16 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lcm" "${CURRENT_PACKAGES_DIR}/lib/lcm") endif() +vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/aclocal") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/java") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe) -if(EXES) - file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/lcm) - file(REMOVE ${EXES}) -endif() -file(GLOB DEBUG_EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(DEBUG_EXES) - file(REMOVE ${DEBUG_EXES}) -endif() +vcpkg_copy_tools(TOOL_NAMES lcm-gen lcm-logger lcm-logplayer AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lcm) - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lcm/vcpkg.json b/ports/lcm/vcpkg.json index d67f988b4d689e..d450b1c6b98f6a 100644 --- a/ports/lcm/vcpkg.json +++ b/ports/lcm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lcm", "version": "1.4.0", - "port-version": 3, + "port-version": 4, "description": [ "Lightweight Communications and Marshalling (LCM)", "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages." diff --git a/versions/baseline.json b/versions/baseline.json index 2323ae07105330..901ba7beda898f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3434,7 +3434,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 3 + "port-version": 4 }, "lcms": { "baseline": "2.12", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index ae97c7e6f22f61..b96eabc770961e 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4277e71373ff869df31475afceb6b2e6881e4650", + "version": "1.4.0", + "port-version": 4 + }, { "git-tree": "0fda8029241e6ff01935878156cd1c9cd2f3fe68", "version": "1.4.0", From 70bf557bab41c0e8ec5c20b66dd28a3f3f7f95eb Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 29 Aug 2022 20:39:33 +0200 Subject: [PATCH 491/791] [vcpkg baseline][opencensus-cpp] De-vendor dependencies (#26567) * [opencensus-cpp] De-vendor dependencies * version --- ports/opencensus-cpp/fix-install.patch | 37 +++++++++++++++++--------- ports/opencensus-cpp/portfile.cmake | 3 ++- ports/opencensus-cpp/vcpkg.json | 9 +++++-- versions/baseline.json | 2 +- versions/o-/opencensus-cpp.json | 5 ++++ 5 files changed, 39 insertions(+), 17 deletions(-) diff --git a/ports/opencensus-cpp/fix-install.patch b/ports/opencensus-cpp/fix-install.patch index 1a49c3be2e54c4..bca8ea1e68810c 100644 --- a/ports/opencensus-cpp/fix-install.patch +++ b/ports/opencensus-cpp/fix-install.patch @@ -1,23 +1,32 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ecec53..07162ed 100644 +index 0ecec53..45d994c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -29,7 +29,7 @@ project( - option(FUZZER "Either OFF or e.g. -fsanitize=fuzzer,address" OFF) +@@ -38,7 +38,13 @@ enable_testing() - if(NOT CMAKE_CXX_STANDARD) -- set(CMAKE_CXX_STANDARD 11) -+ set(CMAKE_CXX_STANDARD 14) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - endif() + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) + +-include(OpenCensusDeps) ++find_package(absl CONFIG REQUIRED) ++find_package(prometheus-cpp CONFIG REQUIRED) ++ ++if(BUILD_TESTING) ++ find_package(GTest CONFIG REQUIRED) ++ find_package(benchmark CONFIG REQUIRED) ++endif() + + include(OpenCensusHelpers) diff --git a/cmake/OpenCensusHelpers.cmake b/cmake/OpenCensusHelpers.cmake -index 8fdfe96..53bc877 100644 +index 8fdfe96..6667085 100644 --- a/cmake/OpenCensusHelpers.cmake +++ b/cmake/OpenCensusHelpers.cmake -@@ -37,6 +37,13 @@ function(opencensus_test NAME SRC) +@@ -35,8 +35,15 @@ function(opencensus_test NAME SRC) + set(_NAME "opencensus_${NAME}") + add_executable(${_NAME} ${SRC}) prepend_opencensus(DEPS "${ARGN}") - target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main) +- target_link_libraries(${_NAME} "${DEPS}" gmock gtest_main) ++ target_link_libraries(${_NAME} "${DEPS}" GTest::gmock GTest::gtest_main) add_test(NAME ${_NAME} COMMAND ${_NAME}) + + install( @@ -29,10 +38,12 @@ index 8fdfe96..53bc877 100644 endif() endfunction() -@@ -50,6 +57,13 @@ function(opencensus_benchmark NAME SRC) +@@ -49,7 +56,14 @@ function(opencensus_benchmark NAME SRC) + set(_NAME "opencensus_${NAME}") add_executable(${_NAME} ${SRC}) prepend_opencensus(DEPS "${ARGN}") - target_link_libraries(${_NAME} "${DEPS}" benchmark) +- target_link_libraries(${_NAME} "${DEPS}" benchmark) ++ target_link_libraries(${_NAME} "${DEPS}" benchmark::benchmark) + + install( + TARGETS ${_NAME} diff --git a/ports/opencensus-cpp/portfile.cmake b/ports/opencensus-cpp/portfile.cmake index 8eb170f180d4b5..b6348136a75463 100644 --- a/ports/opencensus-cpp/portfile.cmake +++ b/ports/opencensus-cpp/portfile.cmake @@ -4,7 +4,8 @@ vcpkg_from_github( REF 62d8281899a1cfd1084793f64295329a6b5d22b3 # 2021-08-26 SHA512 35df40d7e5ce933384fe6ba4ac2d704e0801ac47765fca97ea3f8d787886abe5c588855c3aac5745f047c1c8f2047e1f69b62340dd702042a61c3dc430ca36b4 HEAD_REF master - PATCHES fix-install.patch + PATCHES + fix-install.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/opencensus-cpp/vcpkg.json b/ports/opencensus-cpp/vcpkg.json index c990ad46f3158d..db888711ff5b0c 100644 --- a/ports/opencensus-cpp/vcpkg.json +++ b/ports/opencensus-cpp/vcpkg.json @@ -1,13 +1,14 @@ { "name": "opencensus-cpp", "version-date": "2021-08-26", - "port-version": 1, + "port-version": 2, "description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.", "homepage": "https://github.com/census-instrumentation/opencensus-cpp", "license": "Apache-2.0", "supports": "!windows", "dependencies": [ "abseil", + "prometheus-cpp", { "name": "vcpkg-cmake", "host": true @@ -15,7 +16,11 @@ ], "features": { "test": { - "description": "Build test" + "description": "Build test", + "dependencies": [ + "benchmark", + "gtest" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 901ba7beda898f..d82618974615d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5218,7 +5218,7 @@ }, "opencensus-cpp": { "baseline": "2021-08-26", - "port-version": 1 + "port-version": 2 }, "opencl": { "baseline": "2.2", diff --git a/versions/o-/opencensus-cpp.json b/versions/o-/opencensus-cpp.json index a73bffd886f8a1..f36008d7a25f30 100644 --- a/versions/o-/opencensus-cpp.json +++ b/versions/o-/opencensus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12e85bfcbf3ecda837c873e30ca6e872e3a5fa89", + "version-date": "2021-08-26", + "port-version": 2 + }, { "git-tree": "043d8a451b507daa585a8a716cf297421912d3d4", "version-date": "2021-08-26", From 6d77eb5a5f452093a54c763640efdf6e42cc6c49 Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Mon, 29 Aug 2022 11:52:43 -0700 Subject: [PATCH 492/791] Update to 1.22.2 (#26539) --- ports/libtcod/portfile.cmake | 4 ++-- ports/libtcod/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libtcod.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index 0fb9abcfd9a7bc..a4ee5f67c9590b 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.22.1 - SHA512 75fd804f4c970da6ffc084c896ab5e6d76527bf4e20d471ee50ac4e186e94e5a8dc8b68757f9bb46667147e2d3b2925f111749d3c865f3e82765b9de88d21e90 + REF 1.22.2 + SHA512 c02b6bb205f610416ea6cd9bdeb89a6976141e03a2cd2c44838f0d35edf2544e61af86d2ba904c6a913bbc3754592eed6063b732277bede55b79ffe3b983ee4d HEAD_REF main ) diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index 32bf8c8be0a03d..e4f0bde6d21c9a 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version": "1.22.1", + "version": "1.22.2", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", diff --git a/versions/baseline.json b/versions/baseline.json index d82618974615d8..895a47288c25fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4165,7 +4165,7 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.22.1", + "baseline": "1.22.2", "port-version": 0 }, "libtess2": { diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index 54060046406ea9..c605268d0d8aa6 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8a26dfda1df684c3d88697b774c3e0a9c91f9b9", + "version": "1.22.2", + "port-version": 0 + }, { "git-tree": "08ac6efab8aa18d3c8e4bde44914495640e451a9", "version": "1.22.1", From ca2807e8f9eec210761f06ff93ad0f6c32a04f42 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 29 Aug 2022 20:53:49 +0200 Subject: [PATCH 493/791] [gmp] Remove docs (#26559) * [gmp] Remove docs * version --- ports/gmp/portfile.cmake | 3 ++- ports/gmp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gmp.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 36a19daf0c4b7e..00abc340a96996 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -76,8 +76,9 @@ if(NOT VCPKG_CROSSCOMPILING) endif() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/info") # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index c30e55be5cbff3..1398c8233d1808 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version": "6.2.1", - "port-version": 12, + "port-version": 13, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "license": "LGPL-3.0-only OR GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 895a47288c25fd..521a480b1b75cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2646,7 +2646,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 12 + "port-version": 13 }, "gmsh": { "baseline": "4.9.0", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 76537850b81129..8fd6673aae8147 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28b5b46e27a69da50c1cd0a8be5d0a32cbca120b", + "version": "6.2.1", + "port-version": 13 + }, { "git-tree": "53a7476d7dc1a0a00be2ef9578ba87c3bc13f06f", "version": "6.2.1", From 2ab1624cf0726ce70735eaaa484f94dac7461dc2 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 29 Aug 2022 21:05:47 +0200 Subject: [PATCH 494/791] [cgal] Remove docs (#26558) * [cgal] Remove docs * version --- ports/cgal/portfile.cmake | 9 +++++---- ports/cgal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cgal.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 32ef646978f3aa..b210c6f6692a7d 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -49,15 +49,16 @@ else() endforeach() endif() -file(INSTALL "${SOURCE_PATH}/Installation/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/man") -file( - COPY +set(LICENSES + "${SOURCE_PATH}/Installation/LICENSE" "${SOURCE_PATH}/Installation/LICENSE.BSL" "${SOURCE_PATH}/Installation/LICENSE.RFL" "${SOURCE_PATH}/Installation/LICENSE.GPL" "${SOURCE_PATH}/Installation/LICENSE.LGPL" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) +vcpkg_install_copyright(FILE_LIST ${LICENSES}) + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index 3f1dd69539df53..c1bf8fca9ac6f0 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgal", "version": "5.5", + "port-version": 1, "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 521a480b1b75cd..e4d4305aadef1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1338,7 +1338,7 @@ }, "cgal": { "baseline": "5.5", - "port-version": 0 + "port-version": 1 }, "cgicc": { "baseline": "3.2.19", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index b61a078011d6a9..1a3e4c311b158d 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ef909832bf3d0f379a471e143e8eb5c9aa938cd", + "version": "5.5", + "port-version": 1 + }, { "git-tree": "7cbf69841400a6d51bc3db55b35524a22efcafd1", "version": "5.5", From ed0279d48dba2c42672b7cb80dd16f7e404aa276 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 29 Aug 2022 21:06:37 +0200 Subject: [PATCH 495/791] [libnice] Fix license (#26560) * [libnice] Fix license * version --- ports/libnice/portfile.cmake | 11 +++++++---- ports/libnice/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libnice.json | 5 +++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ports/libnice/portfile.cmake b/ports/libnice/portfile.cmake index 1f859664780d39..58ed00f0589cc0 100644 --- a/ports/libnice/portfile.cmake +++ b/ports/libnice/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_gitlab( ) vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dgtk_doc=disabled #Enable generating the API reference (depends on GTK-Doc) -Dintrospection=disabled #Enable GObject Introspection (depends on GObject)' @@ -35,6 +35,9 @@ vcpkg_copy_pdbs() vcpkg_copy_tools(TOOL_NAMES stunbdc stund AUTO_CLEAN) vcpkg_fixup_pkgconfig() -file(COPY "${SOURCE_PATH}/COPYING.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY "${SOURCE_PATH}/COPYING.MPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/COPYING" + "${SOURCE_PATH}/COPYING.LGPL" + "${SOURCE_PATH}/COPYING.MPL" +) diff --git a/ports/libnice/vcpkg.json b/ports/libnice/vcpkg.json index 59acb444cd527b..4a278f10d10f52 100644 --- a/ports/libnice/vcpkg.json +++ b/ports/libnice/vcpkg.json @@ -1,9 +1,10 @@ { "name": "libnice", "version": "0.1.18", + "port-version": 1, "description": "Libnice is an implementation of the IETF's Interactive Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal Utilities for NAT (STUN) standard (RFC 5389).", "homepage": "https://nice.freedesktop.org", - "license": "LGPL-2.1-only", + "license": "LGPL-2.1-only AND MPL-1.1", "dependencies": [ "glib", { diff --git a/versions/baseline.json b/versions/baseline.json index e4d4305aadef1d..8b2bbcea072cf4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3906,7 +3906,7 @@ }, "libnice": { "baseline": "0.1.18", - "port-version": 0 + "port-version": 1 }, "libnoise": { "baseline": "1.0.0", diff --git a/versions/l-/libnice.json b/versions/l-/libnice.json index 199e05f67008fe..8e64beb7f8a6d4 100644 --- a/versions/l-/libnice.json +++ b/versions/l-/libnice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e15c3356146049f0dffd9aef46786677bb4b007e", + "version": "0.1.18", + "port-version": 1 + }, { "git-tree": "0317c7f34e075c4ebad894b0a6fffed8657f93e5", "version": "0.1.18", From f571b30b86701b1a3a708df11061bf25b7d1b823 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 29 Aug 2022 22:19:20 +0200 Subject: [PATCH 496/791] [cpuid] Fix library linkage (#26545) * [cpuid] Fix linkage * Fix Windows build * version --- ports/cpuid/fix-build.patch | 23 +++++++++++++++++++++++ ports/cpuid/portfile.cmake | 11 +++++++---- ports/cpuid/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/cpuid.json | 5 +++++ 5 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 ports/cpuid/fix-build.patch diff --git a/ports/cpuid/fix-build.patch b/ports/cpuid/fix-build.patch new file mode 100644 index 00000000000000..c855b07bd85814 --- /dev/null +++ b/ports/cpuid/fix-build.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08e78d4..9e84c7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,5 +26,3 @@ endif(UNIX) + + # Include subdirectories + add_subdirectory(libcpuid) +-add_subdirectory(cpuid_tool) +-add_subdirectory(tests) +diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt +index 7031650..9355436 100644 +--- a/libcpuid/CMakeLists.txt ++++ b/libcpuid/CMakeLists.txt +@@ -12,7 +12,7 @@ if("${MSVC_CXX_ARCHITECTURE_ID}" MATCHES "x64") + list(APPEND cpuid_sources masm-x64.asm) + endif() + +-if(UNIX) ++if(0) + add_library(cpuid SHARED ${cpuid_sources}) + else() + add_library(cpuid ${cpuid_sources}) diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index 6f38ec89bb7fa4..9428b11850b321 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -6,6 +8,8 @@ vcpkg_from_github( REF 179fbcb713566c2084a1903729b6eebba68a4424 #0.5.1 SHA512 76eef8147a9ed2f116ddfd07ab95f76126bee0e23d0e6b5be54d157a1456b769fb698a4799a43c5f81ac12368d76fe8904bff735a698342ad8ee41d43e72645b HEAD_REF master + PATCHES + fix-build.patch ) vcpkg_cmake_configure( @@ -17,11 +21,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpuid) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index 1e77b381c83f0e..bc12faef4305da 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,9 +1,10 @@ { "name": "cpuid", "version": "0.5.1", - "port-version": 3, + "port-version": 4, "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", + "license": "MIT", "supports": "(x86 | x64) & !uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 8b2bbcea072cf4..2c8724b793ca32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1690,7 +1690,7 @@ }, "cpuid": { "baseline": "0.5.1", - "port-version": 3 + "port-version": 4 }, "cpuinfo": { "baseline": "2022-07-19", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index 097f9d93f739ac..358477a2e122c0 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffa19cf0fffa902983c32201f6f7b9cd36222c23", + "version": "0.5.1", + "port-version": 4 + }, { "git-tree": "aa97f1bac97c79fa1595ed1a4b141c209fc375e8", "version": "0.5.1", From e034b9ffb4274e67b90db5112ba5440f7cb471b1 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 29 Aug 2022 22:28:42 +0200 Subject: [PATCH 497/791] [nanogui] Respect VCPKG_LIBRARY_LINKAGE on Linux (#26549) * [nanogui] Respect VCPKG_LIBRARY_LINKAGE on Linux * version --- ports/nanogui/portfile.cmake | 18 ++++++++++-------- ports/nanogui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nanogui.json | 5 +++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ports/nanogui/portfile.cmake b/ports/nanogui/portfile.cmake index 390f54bd454951..0d331896d6d2d4 100644 --- a/ports/nanogui/portfile.cmake +++ b/ports/nanogui/portfile.cmake @@ -1,14 +1,14 @@ -if (VCPKG_HOST_IS_WINDOWS) - set(USE_GLAD -DNANOGUI_USE_GLAD=ON) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_HOST_IS_WINDOWS) + set(USE_GLAD -DNANOGUI_USE_GLAD=ON) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) else() - set(USE_GLAD -DNANOGUI_USE_GLAD=OFF) + set(USE_GLAD -DNANOGUI_USE_GLAD=OFF) endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wjakob/nanogui - REF e9ec8a1a9861cf578d9c6e85a6420080aa715c03 #Commits on Sep 23, 2019 + REF e9ec8a1a9861cf578d9c6e85a6420080aa715c03 # Commits on Sep 23, 2019 SHA512 36c93bf977862ced2df4030211e2b83625e60a11fc9fdb6c1f2996bb234758331d3f41a7fbafd25a5bca0239ed9bac9c93446a4a7fac4c5e6d7943af2be3e14a HEAD_REF master PATCHES @@ -17,15 +17,18 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS -FEATURES - "example" NANOGUI_BUILD_EXAMPLE + FEATURES + "example" NANOGUI_BUILD_EXAMPLE ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DNANOGUI_EIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 -DEIGEN_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/eigen3 + -DNANOGUI_BUILD_SHARED=${BUILD_SHARED} ${USE_GLAD} ) @@ -33,5 +36,4 @@ vcpkg_cmake_install() 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) diff --git a/ports/nanogui/vcpkg.json b/ports/nanogui/vcpkg.json index a53f09f69b8dfe..cc8325a9a7757c 100644 --- a/ports/nanogui/vcpkg.json +++ b/ports/nanogui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanogui", "version-date": "2019-09-23", - "port-version": 4, + "port-version": 5, "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", "homepage": "https://github.com/wjakob/nanogui", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 2c8724b793ca32..565b43960fd249 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4898,7 +4898,7 @@ }, "nanogui": { "baseline": "2019-09-23", - "port-version": 4 + "port-version": 5 }, "nanomsg": { "baseline": "1.1.5", diff --git a/versions/n-/nanogui.json b/versions/n-/nanogui.json index 332617a16955aa..a7117eac6b81f8 100644 --- a/versions/n-/nanogui.json +++ b/versions/n-/nanogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba52e521c1d71e2e1c855913e9a1b437920a9fc9", + "version-date": "2019-09-23", + "port-version": 5 + }, { "git-tree": "7b0c7f8295a21f967bfd880956f6d51b98d26874", "version-date": "2019-09-23", From f4efe379113f5e172500aed1541ced879d24f0c7 Mon Sep 17 00:00:00 2001 From: Jamlys Lee Date: Tue, 30 Aug 2022 04:40:31 +0800 Subject: [PATCH 498/791] [libpng] fix mips64 support (#26265) * [libpng]fix mips64 support * [libpng]update port version * [libpng]update versiond database * fix msa support for mips * update port version database Co-authored-by: Jamlys Lee --- ports/libpng/fix-msa-support-for-mips.patch | 25 +++++++++++++++++++++ ports/libpng/portfile.cmake | 1 + ports/libpng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpng.json | 5 +++++ 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 ports/libpng/fix-msa-support-for-mips.patch diff --git a/ports/libpng/fix-msa-support-for-mips.patch b/ports/libpng/fix-msa-support-for-mips.patch new file mode 100644 index 00000000000000..b3290a0fd3380b --- /dev/null +++ b/ports/libpng/fix-msa-support-for-mips.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6c1d632..a2a0d0d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,8 +158,8 @@ endif() + # set definitions and sources for MIPS + if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR + CMAKE_SYSTEM_PROCESSOR MATCHES "mips64el*") +- set(PNG_MIPS_MSA_POSSIBLE_VALUES on off) +- set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations: ++ set(PNG_MIPS_MSA_POSSIBLE_VALUES on off check) ++ set(PNG_MIPS_MSA "check" CACHE STRING "Enable MIPS_MSA optimizations: + off: disable the optimizations") + set_property(CACHE PNG_MIPS_MSA PROPERTY STRINGS + ${PNG_MIPS_MSA_POSSIBLE_VALUES}) +@@ -173,6 +173,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "mipsel*" OR + mips/filter_msa_intrinsics.c) + if(${PNG_MIPS_MSA} STREQUAL "on") + add_definitions(-DPNG_MIPS_MSA_OPT=2) ++ else() ++ add_definitions(-DPNG_MIPS_MSA_CHECK_SUPPORTED) + endif() + else() + add_definitions(-DPNG_MIPS_MSA_OPT=0) + \ No newline at end of file diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index f9bf9f4b2583e6..7f681a915efa5e 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -43,6 +43,7 @@ vcpkg_from_github( fix-export-targets.patch pkgconfig.patch macos-arch-fix.patch + fix-msa-support-for-mips.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PNG_SHARED) diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json index 8ff5901531a5df..74c0dbcb0b1260 100644 --- a/ports/libpng/vcpkg.json +++ b/ports/libpng/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpng", "version": "1.6.37", - "port-version": 18, + "port-version": 19, "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", "homepage": "https://github.com/glennrp/libpng", "license": "libpng-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 565b43960fd249..51ac198b533997 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3990,7 +3990,7 @@ }, "libpng": { "baseline": "1.6.37", - "port-version": 18 + "port-version": 19 }, "libpopt": { "baseline": "1.16", diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json index da868b875a1739..782224d16e049d 100644 --- a/versions/l-/libpng.json +++ b/versions/l-/libpng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85dc7678690f09c78cc366b1f13498c41be51aff", + "version": "1.6.37", + "port-version": 19 + }, { "git-tree": "5e3ec787e7c6f09dd162648b700aeb712af0ffd2", "version": "1.6.37", From abb15f0b40446adc32f511e2929946b79f6b0b8e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 29 Aug 2022 15:30:16 -0700 Subject: [PATCH 499/791] Update vcpkg-tool to 2022-08-24 (#26507) * Update vcpkg-tool to 2022-08-24 https://github.com/microsoft/vcpkg-tool/releases/tag/2022-08-24 * Add `--no-print-usage` note to docs. --- docs/commands/install.md | 4 ++++ scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/commands/install.md b/docs/commands/install.md index 2d78b768584229..6db460d34cf37b 100644 --- a/docs/commands/install.md +++ b/docs/commands/install.md @@ -179,6 +179,10 @@ Writes out a NuGet `packages.config`-formatted file for use with [Binary Caching This option can be used in conjunction with `--dry-run` to obtain the list of NuGet packages required from [Binary Caching][] without building or installing any packages. This enables the NuGet command line to be invoked separately for advanced scenarios, such as using alternate protocols to acquire the `.nupkg` files. +### `--no-print-usage` + +Suppress generation of usage text printed at the end of installation. + [Asset Caching]: ../users/assetcaching.md [Binary Caching]: ../users/binarycaching.md [Manifest Mode]: ../users/manifests.md diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 931e04c0a5aed2..15966cb7f94ca2 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-07-21' +$versionDate = '2022-08-24' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 55a7750bbfdc5a..12a9aecd184767 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-07-21" +vcpkgToolReleaseTag="2022-08-24" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="96a90380c086c50047fcaf19c48fc025e78e2c408fc06d44fad1e4d08a2309619ec36afcf5e5029c0574ce179f25b796537e3499b0909338a2a848e16fff2e6a" + vcpkgToolReleaseSha="5a5c7af982612d19a5bacf220a356e84a6be2058835e749279c0ac438ee22f23ca3b2e268d390f1b854a56d979b571a62b9cf812ff7087949205efa2988cc29e" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="2221e135b4551943ad4a23a5aa19c44a2c1d843437f9eb3f30ce8bb3aa4a61abe7059527b13a4118060aacf874aa87896f840106abd382409db5440e1eedc460" + vcpkgToolReleaseSha="337ddbb19d8c94c67c7bb3a6b30c11e7cf585e95d2d09ea2b99d4fda8228e0ef2badc0559d2357da8931eb34c68ec807c959f8bbf9cd282b3d6167a8eb536dff" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="1bcda61ffcf03069b45cc501c369d23caeab14288bd1971a61213342f8bbfd042e13e85c816b05912b51d1ca0f4fe03811f547ab7bd0d7fbc60b2f700fd1400a" + vcpkgToolReleaseSha="6fc396b53bbe2aeecbd8f4e8a01b5d0fc1304eaa68d5552570de7c2f2176e44e6d5c5ca0ccfe76b50e6d954686c7ec0fc4bf679fd91143bf11952c470be4fde4" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="6677a4d214c07195032d3e2ccbd7c6a627cef0d2c1d5b206149bcc7320a328ee0856ec5fb439d51f313a37e53399634968ff7450b38329e989b158f6e34c5e2c" + vcpkgToolReleaseSha="a1f934ead84bf5a0526aee05dfb34153313432d078ecfcf122cdd4b68fc06ccc3fe9935d5c94deb696c5678ed173c0b0e7f172b4a896144390171412bb45774d" fi # Do the download or build. From 9bba2861b873536bb686c8e7e40646b33215a5b8 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Tue, 30 Aug 2022 01:26:10 +0200 Subject: [PATCH 500/791] [nghttp3] Add new Port (#26497) * Add nghttp3 port * nghttp3: update homepage Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * nghttp3: use main branch with fix for build with UWP ARM 32bits * nghttp3: add licence (MIT) Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/nghttp3/portfile.cmake | 41 ++++++++++++++++++++++++++++++++++++ ports/nghttp3/vcpkg.json | 13 ++++++++++++ versions/baseline.json | 4 ++++ versions/n-/nghttp3.json | 9 ++++++++ 4 files changed, 67 insertions(+) create mode 100644 ports/nghttp3/portfile.cmake create mode 100644 ports/nghttp3/vcpkg.json create mode 100644 versions/n-/nghttp3.json diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake new file mode 100644 index 00000000000000..75aee6458ef593 --- /dev/null +++ b/ports/nghttp3/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ngtcp2/nghttp3 + REF 635a532c8ff98cdbd6c141f85583632919102912 #v0.7.0 + GH-84 for fix UWP ARM 32 bits build + SHA512 d81a6b5c89a0c7065b76342f9ccfac6c39700ab2ff9822361b341235b96363b0582440282bdb19f8abd9231890baddf076ff955a3f535d564b87d13f319d4318 + HEAD_REF main +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ENABLE_STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIB) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_LIB_ONLY=ON + "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" + "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" + "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" +) +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/doc" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(APPEND "${CURRENT_PACKAGES_DIR}/include/nghttp3/version.h" [[ +]]) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json new file mode 100644 index 00000000000000..d374f3c35aeb0c --- /dev/null +++ b/ports/nghttp3/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nghttp3", + "version": "0.7.0", + "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", + "homepage": "https://github.com/ngtcp2/nghttp3", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 51ac198b533997..7d35b5dbbc9500 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4980,6 +4980,10 @@ "baseline": "1.49.0", "port-version": 0 }, + "nghttp3": { + "baseline": "0.7.0", + "port-version": 0 + }, "ngspice": { "baseline": "37", "port-version": 0 diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json new file mode 100644 index 00000000000000..72f1eb132c3a79 --- /dev/null +++ b/versions/n-/nghttp3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f71e5ffcb5802adeb997b151ea1277662ff9b03f", + "version": "0.7.0", + "port-version": 0 + } + ] +} From 754b45e09005e8e2a1505fc8b19238d5b52c329e Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Tue, 30 Aug 2022 01:37:12 +0200 Subject: [PATCH 501/791] [ncnn] New Port (#26557) * [ncnn] Add new port * [ncnn] Add new port * update version * add ncnn options * update vcpkg.json to constraint supported platforms * Add a new final line * update version * Update ports/ncnn/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * fixed ncnn install error * Update to latest upstream version * Fixup pc files * version * unsupported on Windows arm * version Co-authored-by: holylong Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/ncnn/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/ncnn/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/n-/ncnn.json | 9 +++++++++ 4 files changed, 60 insertions(+) create mode 100644 ports/ncnn/portfile.cmake create mode 100644 ports/ncnn/vcpkg.json create mode 100644 versions/n-/ncnn.json diff --git a/ports/ncnn/portfile.cmake b/ports/ncnn/portfile.cmake new file mode 100644 index 00000000000000..50b7f193652825 --- /dev/null +++ b/ports/ncnn/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tencent/ncnn + REF 20220729 + SHA512 0df877ee42edc32faa6891c8b234fc21064b18c1dc8c612b43757daf5f912530f3d015c783e6e199c2884616a88137d10f9c899528000f25e9d0881f028a9586 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DNCNN_BUILD_TOOLS=OFF + -DNCNN_BUILD_EXAMPLES=OFF + -DNCNN_BUILD_BENCHMARK=OFF + -DNCNN_SHARED_LIB=${BUILD_SHARED} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ncnn) +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ncnn/vcpkg.json b/ports/ncnn/vcpkg.json new file mode 100644 index 00000000000000..362a7c90e21859 --- /dev/null +++ b/ports/ncnn/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ncnn", + "version": "20220729", + "description": "ncnn is a high-performance neural network inference computing framework.", + "homepage": "https://github.com/Tencent/ncnn", + "license": "BSD-3-Clause", + "supports": "!(windows & arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7d35b5dbbc9500..0f091f0a0f19ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4940,6 +4940,10 @@ "baseline": "2.4.6", "port-version": 2 }, + "ncnn": { + "baseline": "20220729", + "port-version": 0 + }, "ncurses": { "baseline": "6.3", "port-version": 1 diff --git a/versions/n-/ncnn.json b/versions/n-/ncnn.json new file mode 100644 index 00000000000000..ef0cf20d1f39bc --- /dev/null +++ b/versions/n-/ncnn.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e87afd4b85016896dc6903f9e65e1d239e614b0b", + "version": "20220729", + "port-version": 0 + } + ] +} From 96c35a683eed6695172ebe30d752654d9c0658e6 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt <7577172+hmoffatt@users.noreply.github.com> Date: Tue, 30 Aug 2022 09:38:21 +1000 Subject: [PATCH 502/791] [Argon2] Add new port (#24747) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * start of argon2 port * continue development * attempt to compile with optimization * add feature to enable hardware optimizations * fix symbol visibility * set symbol visibility * add pkg-config * use libs.private for threading * use last release * start of argon2 port * continue development * attempt to compile with optimization * add feature to enable hardware optimizations * fix symbol visibility * set symbol visibility * add pkg-config * use libs.private for threading * use last release * publish the command line tool * Argon2 port * add version info for argon2 * use preferred vcpkg cmake functions * update version * fix compile of x64-windows-static * update version * Update ports/argon2/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/argon2/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * install pdbs Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * add argon2 licence * use target-specific functions for link libraries * use upstream pkgconfig file * export library for cmake * update version hash * don't use deprecated vcpkg_fixup_cmake_targets * fix cmake integration * update version * fix thread.c includes when building on mingw32 * export header path and thread dependency properly * don't export the argon2_tool * fix output clash between library and tool on mingw * use declspec for symbol visibility with mingw * update version * fix missing PDBs for library due to tool/library filename clash * update argon2 version * quote filenames for safety Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * update arong2 version * note upstream PR for visibility patch * always build with hardware optimizations if supported by compiler * update argon2 version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/argon2/CMakeLists.txt | 83 +++++++++++++++++++ ports/argon2/portfile.cmake | 31 +++++++ ports/argon2/thread-header.patch | 12 +++ .../argon2/unofficial-libargon2-config.cmake | 6 ++ ports/argon2/vcpkg.json | 22 +++++ ports/argon2/visibility.patch | 46 ++++++++++ versions/a-/argon2.json | 9 ++ versions/baseline.json | 4 + 8 files changed, 213 insertions(+) create mode 100644 ports/argon2/CMakeLists.txt create mode 100644 ports/argon2/portfile.cmake create mode 100644 ports/argon2/thread-header.patch create mode 100644 ports/argon2/unofficial-libargon2-config.cmake create mode 100644 ports/argon2/vcpkg.json create mode 100644 ports/argon2/visibility.patch create mode 100644 versions/a-/argon2.json diff --git a/ports/argon2/CMakeLists.txt b/ports/argon2/CMakeLists.txt new file mode 100644 index 00000000000000..88b7f7e753b738 --- /dev/null +++ b/ports/argon2/CMakeLists.txt @@ -0,0 +1,83 @@ +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) + +project(argon2) + +set(ARGON2_VERSION 20190702) + +option(BUILD_SHARED_LIBS "Build using shared libraries" ON) + +if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang") + OR (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") +endif() + +find_package(Threads REQUIRED) + +set(ARGON2_HEADERS + include/argon2.h +) + +set (ARGON2_SRC + "src/argon2.c" + "src/core.c" + "src/blake2/blake2b.c" + "src/thread.c" + "src/encoding.c" +) + +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) + +message(STATUS "Checking support for hardware optimization:") +try_compile(WITH_OPTIMIZATIONS + ${CMAKE_CURRENT_BINARY_DIR}/optimization + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/opt.c + CMAKE_FLAGS -DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}/include + OUTPUT_VARIABLE OUTPUT_TEST_SUPPORT_OPTIMIZATION) + +message(STATUS "Build with hardware optimization? ${WITH_OPTIMIZATIONS}") + +if (WITH_OPTIMIZATIONS) + list(APPEND ARGON2_SRC "src/opt.c") +else() + list(APPEND ARGON2_SRC "src/ref.c") +endif() + +add_library(libargon2 ${ARGON2_SRC}) +target_include_directories(libargon2 PUBLIC $ $ PRIVATE src) +target_link_libraries(libargon2 Threads::Threads) +target_compile_definitions(libargon2 PUBLIC "A2_VISCTL") +set_target_properties(libargon2 PROPERTIES OUTPUT_NAME argon2) + +add_executable(argon2_tool ${ARGON2_SRC} src/run.c) +target_include_directories(argon2_tool PRIVATE include src) +target_compile_definitions(argon2_tool PUBLIC "A2_VISCTL") +target_link_libraries(argon2_tool Threads::Threads) + +install(FILES ${ARGON2_HEADERS} DESTINATION include) + +set(PREFIX ${CMAKE_INSTALL_PREFIX}) +set(UPSTREAM_VER 20190702) +if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(EXTRA_LIBS "-lrt -ldl") +endif () + +configure_file ("${CMAKE_SOURCE_DIR}/libargon2.pc.in" "${PROJECT_BINARY_DIR}/libargon2.pc" @ONLY) +install (FILES "${CMAKE_CURRENT_BINARY_DIR}/libargon2.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") + +install(TARGETS libargon2 + EXPORT unofficial-libargon2 + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(EXPORT unofficial-libargon2 + NAMESPACE unofficial::argon2:: + DESTINATION "share/unofficial-libargon2" +) + +install(TARGETS argon2_tool + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/ports/argon2/portfile.cmake b/ports/argon2/portfile.cmake new file mode 100644 index 00000000000000..54da71466f2e30 --- /dev/null +++ b/ports/argon2/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO P-H-C/phc-winner-argon2 + REF 20190702 + SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f + HEAD_REF master + PATCHES + visibility.patch + thread-header.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-libargon2 PACKAGE_NAME unofficial-libargon2) + +vcpkg_copy_tools(TOOL_NAMES argon2_tool AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${PORT}/argon2_tool${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/argon2${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-libargon2/unofficial-libargon2-config.cmake" @ONLY) diff --git a/ports/argon2/thread-header.patch b/ports/argon2/thread-header.patch new file mode 100644 index 00000000000000..4edcf7a8b336d7 --- /dev/null +++ b/ports/argon2/thread-header.patch @@ -0,0 +1,12 @@ +diff --git a/src/thread.h b/src/thread.h +index d4ca10c..43bd542 100644 +--- a/src/thread.h ++++ b/src/thread.h +@@ -19,6 +19,7 @@ + #define ARGON2_THREAD_H + + #if !defined(ARGON2_NO_THREADS) ++#include + + /* + Here we implement an abstraction layer for the simpĺe requirements diff --git a/ports/argon2/unofficial-libargon2-config.cmake b/ports/argon2/unofficial-libargon2-config.cmake new file mode 100644 index 00000000000000..2723beed5bdce0 --- /dev/null +++ b/ports/argon2/unofficial-libargon2-config.cmake @@ -0,0 +1,6 @@ +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) + include(CMakeFindDependencyMacro) + find_dependency(Threads) +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libargon2.cmake") diff --git a/ports/argon2/vcpkg.json b/ports/argon2/vcpkg.json new file mode 100644 index 00000000000000..9a6b0e1d7d96fe --- /dev/null +++ b/ports/argon2/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "argon2", + "version": "20190702", + "description": "Password-hashing library.", + "homepage": "https://github.com/P-H-C/phc-winner-argon2", + "license": "Apache-2.0 OR CC0-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "hwopt": { + "description": "Enable SSE2/AVX2/AVX512 optimizations if supported on architecture" + } + } +} diff --git a/ports/argon2/visibility.patch b/ports/argon2/visibility.patch new file mode 100644 index 00000000000000..53bcce7e1ac1ef --- /dev/null +++ b/ports/argon2/visibility.patch @@ -0,0 +1,46 @@ +Fix symbol visibility across build triplets. +Submitted upstream in https://github.com/P-H-C/phc-winner-argon2/pull/262 + + +diff --git a/include/argon2.h b/include/argon2.h +index 3980bb3..2738960 100644 +--- a/include/argon2.h ++++ b/include/argon2.h +@@ -27,15 +27,29 @@ extern "C" { + #endif + + /* Symbols visibility control */ +-#ifdef A2_VISCTL +-#define ARGON2_PUBLIC __attribute__((visibility("default"))) +-#define ARGON2_LOCAL __attribute__ ((visibility ("hidden"))) +-#elif _MSC_VER +-#define ARGON2_PUBLIC __declspec(dllexport) +-#define ARGON2_LOCAL ++#if defined(_WIN32) ++ #if defined(A2_VISCTL) ++ #if defined(_MSC_VER) || defined(__MINGW32__) ++ #define ARGON2_PUBLIC __declspec(dllexport) ++ #else ++ #define ARGON2_PUBLIC __attribute__ ((dllexport)) ++ #endif ++ #else ++ #if defined(_MSC_VER) || defined(__MINGW32__) ++ #define ARGON2_PUBLIC __declspec(dllimport) ++ #else ++ #define ARGON2_PUBLIC /*__attribute__ ((dllimport))*/ ++ #endif ++ #endif ++ #define ARGON2_LOCAL + #else +-#define ARGON2_PUBLIC +-#define ARGON2_LOCAL ++ #if defined(A2_VISCTL) ++ #define ARGON2_PUBLIC __attribute__ ((visibility ("default"))) ++ #define ARGON2_LOCAL __attribute__ ((visibility ("hidden"))) ++ #else ++ #define ARGON2_PUBLIC ++ #define ARGON2_LOCAL ++ #endif + #endif + + /* diff --git a/versions/a-/argon2.json b/versions/a-/argon2.json new file mode 100644 index 00000000000000..c13b5d1183f577 --- /dev/null +++ b/versions/a-/argon2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3a15f9b44e7ae1ef03f6f92a5552bc85951fd3a1", + "version": "20190702", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0f091f0a0f19ab..8132c0897f9e3b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -144,6 +144,10 @@ "baseline": "1.3.2", "port-version": 0 }, + "argon2": { + "baseline": "20190702", + "port-version": 0 + }, "argparse": { "baseline": "2.2", "port-version": 0 From f688b2e29676bfa3a02ead4b7096c589f8af8180 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 30 Aug 2022 02:30:53 +0200 Subject: [PATCH 503/791] [vcpkg] add updated compile wrapper for clang-cl (#26340) * add updated compile wrapper for clang-cl * patch msys instead of adding the complete wrapper * remove doubled line * fix issue with direct packages --- scripts/cmake/vcpkg_acquire_msys.cmake | 30 +++++++++++++++---- .../compile_wrapper_consider_clang-cl.patch | 12 ++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 scripts/msys/compile_wrapper_consider_clang-cl.patch diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 6fd681afa88d2f..b27d552665729b 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -36,8 +36,10 @@ endfunction() # - Z_VCPKG_MSYS_ARCHIVES # - Z_VCPKG_MSYS_TOTAL_HASH # - Z_VCPKG_MSYS_PACKAGES +# - Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE +# - Z_VCPKG_MSYS_${arg_NAME}_PATCHES function(z_vcpkg_acquire_msys_declare_package) - cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "NAME;URL;SHA512" "DEPS;PATCHES") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "internal error: z_vcpkg_acquire_msys_declare_package passed extra args: ${arg_UNPARSED_ARGUMENTS}") @@ -68,9 +70,15 @@ function(z_vcpkg_acquire_msys_declare_package) FILENAME "${filename}" ) - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${archive}") + list(APPEND Z_VCPKG_MSYS_ARCHIVES "${arg_NAME}") set(Z_VCPKG_MSYS_ARCHIVES "${Z_VCPKG_MSYS_ARCHIVES}" PARENT_SCOPE) + set(Z_VCPKG_MSYS_${arg_NAME}_ARCHIVE "${archive}" PARENT_SCOPE) + set(Z_VCPKG_MSYS_${arg_NAME}_PATCHES "${arg_PATCHES}" PARENT_SCOPE) string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${arg_SHA512}") + foreach(patch IN LISTS arg_PATCHES) + file(SHA512 "${patch}" patch_sha) + string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${patch_sha}") + endforeach() set(Z_VCPKG_MSYS_TOTAL_HASH "${Z_VCPKG_MSYS_TOTAL_HASH}" PARENT_SCOPE) endif() endfunction() @@ -86,8 +94,8 @@ function(vcpkg_acquire_msys out_msys_root) message(WARNING "vcpkg_acquire_msys was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - set(Z_VCPKG_MSYS_TOTAL_HASH) - set(Z_VCPKG_MSYS_ARCHIVES) + set(Z_VCPKG_MSYS_TOTAL_HASH "") + set(Z_VCPKG_MSYS_ARCHIVES "") set(Z_VCPKG_MSYS_PACKAGES "${arg_PACKAGES}") @@ -118,7 +126,10 @@ function(vcpkg_acquire_msys out_msys_root) SHA512 "${sha512}" FILENAME "${filename}" ) - list(APPEND Z_VCPKG_MSYS_ARCHIVES "${archive}") + string(REGEX MATCH "^(([^-]+(-[^0-9][^-]*)*)-.+\.pkg\.tar\.(xz|zst))$" pkg_name "${filename}") + set(pkg_name "${CMAKE_MATCH_2}") + list(APPEND Z_VCPKG_MSYS_ARCHIVES "${pkg_name}") + set(Z_VCPKG_MSYS_${pkg_name}_ARCHIVE "${archive}") string(APPEND Z_VCPKG_MSYS_TOTAL_HASH "${sha512}") endforeach() endif() @@ -264,6 +275,7 @@ function(vcpkg_acquire_msys out_msys_root) URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-3-any.pkg.tar.zst" SHA512 77a195a9fe8680bee55c04b8ecc0e9ee43e2d89607c745098dfac4687f4f853885cabbb005202d70e9a9cdf9facf6849cc47c6b2f25573b5af8201696d926c72 DEPS perl + PATCHES "${SCRIPTS}/msys/compile_wrapper_consider_clang-cl.patch" ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-2-x86_64.pkg.tar.zst" @@ -492,11 +504,17 @@ This can be resolved by explicitly passing URL/SHA pairs to DIRECT_PACKAGES.") foreach(archive IN LISTS Z_VCPKG_MSYS_ARCHIVES) vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive}" + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${Z_VCPKG_MSYS_${archive}_ARCHIVE}" LOGNAME "msys-${TARGET_TRIPLET}-${index}" WORKING_DIRECTORY "${path_to_root}.tmp" ) math(EXPR index "${index} + 1") + if(Z_VCPKG_MSYS_${archive}_PATCHES) + z_vcpkg_apply_patches( + SOURCE_PATH "${path_to_root}.tmp" + PATCHES ${Z_VCPKG_MSYS_${archive}_PATCHES} + ) + endif() endforeach() file(RENAME "${path_to_root}.tmp" "${path_to_root}") endif() diff --git a/scripts/msys/compile_wrapper_consider_clang-cl.patch b/scripts/msys/compile_wrapper_consider_clang-cl.patch new file mode 100644 index 00000000000000..c3666ecc9b680d --- /dev/null +++ b/scripts/msys/compile_wrapper_consider_clang-cl.patch @@ -0,0 +1,12 @@ +diff --git a/usr/share/automake-1.16/compile b/usr/share/automake-1.16/compile +index 2078fc833..dfc946593 100755 +--- a/usr/share/automake-1.16/compile ++++ b/usr/share/automake-1.16/compile +@@ -256,6 +256,7 @@ EOF + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ ++ clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; From af908b85aff7d37f188d3c1b69ff84ba28a3a681 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:32:04 -0700 Subject: [PATCH 504/791] [skia] Update to 0.36.0 (#26419) * [skia] Update to 0.36.0 * x-add-version * fix Linux build error * x-add-version --- ports/skia/portfile.cmake | 28 ++++++++++++++++------------ ports/skia/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/skia.json | 5 +++++ 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 915189d62b9f3e..1f4f3296e579bc 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://github.com/google/skia - REF 3aa7f602018816ab3f009f1b8d359ccde752e1de + REF f86f242886692a18f5adc1cf9cbd6740cd0870fd PATCHES "use_vcpkg_fontconfig.patch" ) @@ -10,7 +10,11 @@ vcpkg_from_git( vcpkg_find_acquire_program(PYTHON3) vcpkg_replace_string("${SOURCE_PATH}/.gn" "script_executable = \"python3\"" "script_executable = \"${PYTHON3}\"") -vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python" "command = \"$shell '${PYTHON3}'") +if(VCPKG_TARGET_IS_LINUX) + vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python3" "command = \"$shell '${PYTHON3}'") +else() + vcpkg_replace_string("${SOURCE_PATH}/gn/toolchain/BUILD.gn" "command = \"$shell python" "command = \"$shell '${PYTHON3}'") +endif() function(checkout_in_path PATH URL REF) if(EXISTS "${PATH}") @@ -173,17 +177,17 @@ if(CMAKE_HOST_WIN32) checkout_in_path("${EXTERNALS}/spirv-cross" "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - "6a67891418a3f08be63f92726e049dc788e46f5b" + "61c603f3baa5270e04bcfb6acf83c654e3c57679" ) checkout_in_path("${EXTERNALS}/spirv-headers" "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" - "82becc8a8a92e509d3d8d635889da0a3c17d0606" + "0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" ) checkout_in_path("${EXTERNALS}/spirv-tools" "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" - "cb96abbf7affd986016f17dd09f9f971138a922b" + "0073a1fa36f7c52ad3d58059cb5d5de8efa825ad" ) checkout_in_path("${EXTERNALS}/d3d12allocator" @@ -214,22 +218,22 @@ They can be installed on Debian based systems via checkout_in_path("${EXTERNALS}/spirv-cross" "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - "6a67891418a3f08be63f92726e049dc788e46f5b" + "61c603f3baa5270e04bcfb6acf83c654e3c57679" ) checkout_in_path("${EXTERNALS}/spirv-headers" "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git" - "82becc8a8a92e509d3d8d635889da0a3c17d0606" + "0bcc624926a25a2a273d07877fd25a6ff5ba1cfb" ) checkout_in_path("${EXTERNALS}/spirv-tools" "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git" - "cb96abbf7affd986016f17dd09f9f971138a922b" + "0073a1fa36f7c52ad3d58059cb5d5de8efa825ad" ) checkout_in_path("${EXTERNALS}/tint" "https://dawn.googlesource.com/tint" - "b612c505939bf86c80a55c193b93c41ed0f252a1" + "200492e32b94f042d9942154fb4fa7f93bb8289a" ) checkout_in_path("${EXTERNALS}/jinja2" @@ -245,12 +249,12 @@ They can be installed on Debian based systems via ## Remove checkout_in_path("${EXTERNALS}/vulkan-headers" "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" - "76f00ef6cbb1886eb1162d1fa39bee8b51e22ee8" + "c896e2f920273bfee852da9cca2a356bc1c2031e" ) checkout_in_path("${EXTERNALS}/vulkan-tools" "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" - "ef20059aea7ec24d0842edca2f75255eaa33a7b0" + "d55c7aaf041af331bee8c22fb448a6ff4c797f73" ) checkout_in_path("${EXTERNALS}/abseil-cpp" @@ -261,7 +265,7 @@ They can be installed on Debian based systems via ## REMOVE ^ checkout_in_path("${EXTERNALS}/dawn" "https://dawn.googlesource.com/dawn.git" - "e6d4598d36157639606a780164c425c6bffb93f6" + "30fa0d8d2ced43e44baa522dd4bd4684b14a3099" ) vcpkg_find_acquire_program(GIT) diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 39414acf3f1d67..803246125caa37 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "skia", - "version-date": "2022-04-15", - "port-version": 1, + "version": "0.36.0", "description": [ "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", diff --git a/versions/baseline.json b/versions/baseline.json index 8132c0897f9e3b..6a87bc66027196 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6729,8 +6729,8 @@ "port-version": 0 }, "skia": { - "baseline": "2022-04-15", - "port-version": 1 + "baseline": "0.36.0", + "port-version": 0 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 429212d01103b6..759ae504a546cf 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "960a3abb9c3b4736a73b06e65a47123798bf29f9", + "version": "0.36.0", + "port-version": 0 + }, { "git-tree": "99590977282f5689ae6f9d6e6f6b13fc8cbfd625", "version-date": "2022-04-15", From f9b5f5406ba01b8394961e2654f242f784e8f348 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 31 Aug 2022 22:34:35 +0200 Subject: [PATCH 505/791] [sdl2] update to 2.24.0 (#26436) --- .../ffmpeg/0021-fix-sdl2-version-check.patch | 13 ++ ports/ffmpeg/portfile.cmake | 1 + ports/ffmpeg/vcpkg.json | 2 +- ports/magnum/005-fix-find-sdl2.patch | 13 ++ ports/magnum/portfile.cmake | 1 + ports/magnum/vcpkg.json | 2 +- ports/ogre/fix-cmake-feature-summary.patch | 14 ++ ports/ogre/portfile.cmake | 1 + ports/ogre/vcpkg.json | 2 +- ...-creation-of-pkg-cfg-file-on-windows.patch | 41 +++--- ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch | 5 +- ...disable-sdlmain-target-search-on-uwp.patch | 34 ----- ports/sdl2/0004-Define-crt-macros.patch | 15 -- ...efined-symbol-errors-in-non-threaded.patch | 129 ------------------ ports/sdl2/portfile.cmake | 21 ++- ports/sdl2/vcpkg.json | 3 +- versions/baseline.json | 10 +- versions/f-/ffmpeg.json | 5 + versions/m-/magnum.json | 5 + versions/o-/ogre.json | 5 + versions/s-/sdl2.json | 5 + 21 files changed, 114 insertions(+), 213 deletions(-) create mode 100644 ports/ffmpeg/0021-fix-sdl2-version-check.patch create mode 100755 ports/magnum/005-fix-find-sdl2.patch create mode 100644 ports/ogre/fix-cmake-feature-summary.patch delete mode 100644 ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch delete mode 100644 ports/sdl2/0004-Define-crt-macros.patch delete mode 100644 ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch diff --git a/ports/ffmpeg/0021-fix-sdl2-version-check.patch b/ports/ffmpeg/0021-fix-sdl2-version-check.patch new file mode 100644 index 00000000000000..c26a155c62dce2 --- /dev/null +++ b/ports/ffmpeg/0021-fix-sdl2-version-check.patch @@ -0,0 +1,13 @@ +diff --git a/configure b/configure +index 2829d79..697a504 100755 +--- a/configure ++++ b/configure +@@ -6589,7 +6589,7 @@ fi + + if enabled sdl2; then + SDL2_CONFIG="${cross_prefix}sdl2-config" +- test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 2.1.0" SDL_events.h SDL_PollEvent ++ test_pkg_config sdl2 "sdl2 >= 2.0.1 sdl2 < 3.0.0" SDL_events.h SDL_PollEvent + if disabled sdl2 && "${SDL2_CONFIG}" --version > /dev/null 2>&1; then + sdl2_cflags=$("${SDL2_CONFIG}" --cflags) + sdl2_extralibs=$("${SDL2_CONFIG}" --libs) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index c7dabdf4b1dbfc..1ab26da6d8112e 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -25,6 +25,7 @@ vcpkg_from_github( 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch 0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch 0020-fix-aarch64-libswscale.patch + 0021-fix-sdl2-version-check.patch ) if (SOURCE_PATH MATCHES " ") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index d7adcd54329df0..183285411c4863 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 16, + "port-version": 17, "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." diff --git a/ports/magnum/005-fix-find-sdl2.patch b/ports/magnum/005-fix-find-sdl2.patch new file mode 100755 index 00000000000000..83173b60f18578 --- /dev/null +++ b/ports/magnum/005-fix-find-sdl2.patch @@ -0,0 +1,13 @@ +diff --git a/src/Magnum/Platform/CMakeLists.txt b/src/Magnum/Platform/CMakeLists.txt +index f1b404f..19babf4 100644 +--- a/src/Magnum/Platform/CMakeLists.txt ++++ b/src/Magnum/Platform/CMakeLists.txt +@@ -292,7 +292,7 @@ endif() + + # SDL2 application + if(WITH_SDL2APPLICATION) +- find_package(SDL2) ++ find_package(SDL2 CONFIG REQUIRED) + if(NOT SDL2_FOUND) + message(FATAL_ERROR "SDL2 library, required by Sdl2Application, was not found. Set WITH_SDL2APPLICATION to OFF to skip building it.") + endif() diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index b4b486a4310019..2f1a092669d1e3 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( 002-sdl-includes.patch 003-fix-FindGLFW.patch 004-fix-FindOpenAL.patch + 005-fix-find-sdl2.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json index 936ab52ea347b2..26c23155fda574 100644 --- a/ports/magnum/vcpkg.json +++ b/ports/magnum/vcpkg.json @@ -1,7 +1,7 @@ { "name": "magnum", "version-string": "2020.06", - "port-version": 10, + "port-version": 11, "description": "C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "license": null, diff --git a/ports/ogre/fix-cmake-feature-summary.patch b/ports/ogre/fix-cmake-feature-summary.patch new file mode 100644 index 00000000000000..56b75faa7e1065 --- /dev/null +++ b/ports/ogre/fix-cmake-feature-summary.patch @@ -0,0 +1,14 @@ +diff --git a/CMake/FeatureSummary.cmake b/CMake/OgreFeatureSummary.cmake +similarity index 100% +rename from CMake/FeatureSummary.cmake +rename to CMake/OgreFeatureSummary.cmake +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb86305..abbd5c4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -505,4 +505,4 @@ include(Packaging) + + + # Show feature summary +-include(FeatureSummary) ++include(OgreFeatureSummary) diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 0ffc7f0c4709d1..1c79e71c3c45d6 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_from_github( fix-dependency.patch disable-dependency-qt.patch fix-pkgconfig.patch + fix-cmake-feature-summary.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index 11504a6d24494d..c1bbf065c49af6 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ogre", "version": "1.12.9", - "port-version": 9, + "port-version": 10, "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", diff --git a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch index 967b433aa67b53..e72b3a91680d1c 100644 --- a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch +++ b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch @@ -1,26 +1,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 644715a..6eacfb8 100644 +index aa36eb02c..feb8a3b35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2670,8 +2670,6 @@ endif() - configure_file("${SDL2_SOURCE_DIR}/include/SDL_revision.h.cmake" - "${SDL2_BINARY_DIR}/include/SDL_revision.h") +@@ -2833,8 +2833,6 @@ foreach(_hdr IN LISTS SDL2_INCLUDE_FILES) + endforeach() + list(APPEND SDL_GENERATED_HEADERS ${SDL2_COPIED_INCLUDE_FILES}) -if(NOT WINDOWS OR CYGWIN OR MINGW) - set(prefix ${CMAKE_INSTALL_PREFIX}) + file(RELATIVE_PATH bin_prefix_relpath "${CMAKE_INSTALL_FULL_BINDIR}" "${CMAKE_INSTALL_PREFIX}") - set(exec_prefix "\${prefix}") -@@ -2705,7 +2703,7 @@ Libs.private:") - set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) - listtostrrev(SDL_LIBS _SDL_LIBS) - set(SDL_LIBS ${_SDL_LIBS}) -- else() -+ elseif(NOT WINDOWS_STORE) - listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") - set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) - list(REMOVE_DUPLICATES SDL_STATIC_LIBS) -@@ -2726,7 +2724,6 @@ Libs.private:") +@@ -2861,6 +2859,7 @@ Libs.private:") + endif() + + # Clean up the different lists ++ if(NOT WINDOWS_STORE) + listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") + set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) + list(REMOVE_DUPLICATES SDL_STATIC_LIBS) +@@ -2870,6 +2869,7 @@ Libs.private:") + set(SDL_LIBS ${_SDL_LIBS}) + listtostr(SDL_CFLAGS _SDL_CFLAGS "") + set(SDL_CFLAGS ${_SDL_CFLAGS}) ++ endif() + + # MESSAGE(STATUS "SDL_LIBS: ${SDL_LIBS}") + # MESSAGE(STATUS "SDL_STATIC_LIBS: ${SDL_STATIC_LIBS}") +@@ -2882,7 +2882,6 @@ Libs.private:") "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) @@ -28,9 +35,9 @@ index 644715a..6eacfb8 100644 macro(check_add_debug_flag FLAG SUFFIX) check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX}) -@@ -3075,6 +3072,7 @@ if(NOT SDL2_DISABLE_INSTALL) - # TODO: what about the .spec file? Is it only needed for RPM creation? +@@ -3310,6 +3309,7 @@ if(NOT SDL2_DISABLE_INSTALL) install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/aclocal") + install(FILES "LICENSE.txt" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/licenses/${PROJECT_NAME}") endif() + install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig") endif() diff --git a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch index b7c56c14bff212..20765aabc5c3cf 100644 --- a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch +++ b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch @@ -1,6 +1,8 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa36eb02c..c01ee2e4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1342,12 +1342,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS AND NOT HAIKU) +@@ -1434,11 +1434,6 @@ elseif(UNIX AND NOT APPLE AND NOT RISCOS AND NOT HAIKU) set(HAVE_FCITX TRUE) endif() @@ -8,7 +10,6 @@ - if(IBUS_FOUND) - set(HAVE_IBUS_IBUS_H TRUE) - target_include_directories(sdl-build-options INTERFACE "${IBUS_INCLUDE_DIRS}") -- list(APPEND EXTRA_LIBS ${IBUS_LIBRARIES}) - endif() if (HAVE_IBUS_IBUS_H OR HAVE_FCITX) diff --git a/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch b/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch deleted file mode 100644 index e24057c3e42041..00000000000000 --- a/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/SDL2Config.cmake -+++ b/SDL2Config.cmake -@@ -46,6 +46,7 @@ foreach(prop ${relprops}) - endif() - endforeach() - -+if(NOT WINDOWS_STORE) - foreach(prop ${relprops}) - get_target_property(sdl2mainimplib SDL2::SDL2main ${prop}) - if(sdl2mainimplib) -@@ -53,6 +54,7 @@ foreach(prop ${relprops}) - break() - endif() - endforeach() -+endif() - - foreach(prop ${dbgprops}) - get_target_property(sdl2implibdbg SDL2::SDL2 ${prop}) -@@ -62,6 +64,7 @@ foreach(prop ${dbgprops}) - endif() - endforeach() - -+if(NOT WINDOWS_STORE) - foreach(prop ${dbgprops}) - get_target_property(sdl2mainimplibdbg SDL2::SDL2main ${prop}) - if(sdl2mainimplibdbg) -@@ -69,6 +72,7 @@ foreach(prop ${dbgprops}) - break() - endif() - endforeach() -+endif() - - if( sdl2implib AND sdl2mainimplib AND sdl2implibdbg AND sdl2mainimplibdbg ) - # we have both release and debug builds of SDL2 and SDL2main, so use this ugly diff --git a/ports/sdl2/0004-Define-crt-macros.patch b/ports/sdl2/0004-Define-crt-macros.patch deleted file mode 100644 index ac8f185a7c8b4c..00000000000000 --- a/ports/sdl2/0004-Define-crt-macros.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -602,6 +602,11 @@ if(USE_GCC OR USE_CLANG) - list(APPEND EXTRA_CFLAGS -fcolor-diagnostics) - endif() - endif() - endif() -+if(MSVC) -+ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_DEPRECATE") -+ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_NONSTDC_NO_DEPRECATE") -+ target_compile_definitions(sdl-build-options INTERFACE "-D_CRT_SECURE_NO_WARNINGS") -+endif() - - if(SDL_ASSEMBLY) - diff --git a/ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch b/ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch deleted file mode 100644 index 974acf88fac244..00000000000000 --- a/ports/sdl2/0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff --git a/src/video/emscripten/SDL_emscriptenframebuffer.c b/src/video/emscripten/SDL_emscriptenframebuffer.c -index 372c6f5ac85..03fea04efa3 100644 ---- a/src/video/emscripten/SDL_emscriptenframebuffer.c -+++ b/src/video/emscripten/SDL_emscriptenframebuffer.c -@@ -59,10 +59,19 @@ int Emscripten_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * form - return 0; - } - --static void --Emscripten_UpdateWindowFramebufferWorker(SDL_Surface* surface) -+int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects) - { -- EM_ASM_INT({ -+ SDL_Surface *surface; -+ -+ SDL_WindowData *data = (SDL_WindowData *) window->driverdata; -+ surface = data->surface; -+ if (!surface) { -+ return SDL_SetError("Couldn't find framebuffer surface for window"); -+ } -+ -+ /* Send the data to the display */ -+ -+ MAIN_THREAD_EM_ASM({ - var w = $0; - var h = $1; - var pixels = $2; -@@ -147,31 +156,7 @@ Emscripten_UpdateWindowFramebufferWorker(SDL_Surface* surface) - } - - SDL2.ctx.putImageData(SDL2.image, 0, 0); -- return 0; - }, surface->w, surface->h, surface->pixels); --} -- --int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects) --{ -- SDL_Surface *surface; -- -- SDL_WindowData *data = (SDL_WindowData *) window->driverdata; -- surface = data->surface; -- if (!surface) { -- return SDL_SetError("Couldn't find framebuffer surface for window"); -- } -- -- /* Send the data to the display */ -- -- if (emscripten_is_main_runtime_thread()) { -- Emscripten_UpdateWindowFramebufferWorker(surface); -- } else { -- emscripten_sync_run_in_main_runtime_thread( -- EM_FUNC_SIG_VI, -- Emscripten_UpdateWindowFramebufferWorker, -- (uint32_t)surface -- ); -- } - - if (emscripten_has_asyncify() && SDL_GetHintBoolean(SDL_HINT_EMSCRIPTEN_ASYNCIFY, SDL_TRUE)) { - /* give back control to browser for screen refresh */ -diff --git a/src/video/emscripten/SDL_emscriptenmouse.c b/src/video/emscripten/SDL_emscriptenmouse.c -index e4148072503..38e394ac104 100644 ---- a/src/video/emscripten/SDL_emscriptenmouse.c -+++ b/src/video/emscripten/SDL_emscriptenmouse.c -@@ -63,10 +63,20 @@ Emscripten_CreateDefaultCursor() - return Emscripten_CreateCursorFromString("default", SDL_FALSE); - } - --static const char* --Emscripten_GetCursorUrl(int w, int h, int hot_x, int hot_y, void* pixels) -+ -+static SDL_Cursor* -+Emscripten_CreateCursor(SDL_Surface* surface, int hot_x, int hot_y) - { -- return (const char *)EM_ASM_INT({ -+ const char *cursor_url = NULL; -+ SDL_Surface *conv_surf; -+ -+ conv_surf = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_ABGR8888, 0); -+ -+ if (!conv_surf) { -+ return NULL; -+ } -+ -+ cursor_url = (const char *)MAIN_THREAD_EM_ASM_INT({ - var w = $0; - var h = $1; - var hot_x = $2; -@@ -114,40 +124,7 @@ Emscripten_GetCursorUrl(int w, int h, int hot_x, int hot_y, void* pixels) - stringToUTF8(url, urlBuf, url.length + 1); - - return urlBuf; -- }, w, h, hot_x, hot_y, pixels); --} -- --static SDL_Cursor* --Emscripten_CreateCursor(SDL_Surface* surface, int hot_x, int hot_y) --{ -- const char *cursor_url = NULL; -- SDL_Surface *conv_surf; -- -- conv_surf = SDL_ConvertSurfaceFormat(surface, SDL_PIXELFORMAT_ABGR8888, 0); -- -- if (!conv_surf) { -- return NULL; -- } -- -- if (emscripten_is_main_runtime_thread()) { -- cursor_url = Emscripten_GetCursorUrl( -- surface->w, -- surface->h, -- hot_x, -- hot_y, -- conv_surf->pixels -- ); -- } else { -- cursor_url = (const char *)emscripten_sync_run_in_main_runtime_thread( -- EM_FUNC_SIG_IIIIIII, -- Emscripten_GetCursorUrl, -- surface->w, -- surface->h, -- hot_x, -- hot_y, -- conv_surf->pixels -- ); -- } -+ }, surface->w, surface->h, hot_x, hot_y, conv_surf->pixels); - - SDL_FreeSurface(conv_surf); - diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index b53309d73fbcb0..9083b898280984 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,16 +1,13 @@ -set(SDL2_VERSION 2.0.20) +set(SDL2_VERSION 2.24.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL - REF 53dea9830964eee8b5c2a7ee0a65d6e268dc78a1 #vrelease-2.0.22 - SHA512 809ac18aeb739cfc6558dc11a7b3abbdad62a8e651ae2bfc157f26947b0df063a34c117ea8bd003428b5618fa6ce21a655fda073f1ef15aa34bc4a442a578523 + REF 8c9beb0c873f6ca5efbd88f1ad2648bfc793b2ac #vrelease-2.24.0 + SHA512 7936fc3de9920eafe399f5b2af7bf87d479d4ba8c4a7957da90f3a90316dc7a6b8619ffd7a2c198d298d390e1235e00f9bd36fe3f04102bdff351b96c2ade59e HEAD_REF master PATCHES 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0002-sdl2-skip-ibus-on-linux.patch - 0003-sdl2-disable-sdlmain-target-search-on-uwp.patch - 0004-Define-crt-macros.patch - 0005-emscripten-fix-undefined-symbol-errors-in-non-threaded.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -44,6 +41,9 @@ vcpkg_cmake_configure( -DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT} -DSDL_LIBC=ON -DSDL_HIDAPI_JOYSTICK=ON + -DSDL_TEST=OFF + MAYBE_UNUSED_VARIABLES + SDL_FORCE_STATIC_VCRT ) vcpkg_cmake_install() @@ -103,6 +103,15 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2-static ") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2d " "-lSDL2-staticd ") + endif() +endif() + vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index fa8ec39c64fa71..6440727e26e91b 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2", - "version": "2.0.22", - "port-version": 3, + "version": "2.24.0", "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 6a87bc66027196..960ceb72ac6dc8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2262,7 +2262,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 16 + "port-version": 17 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -4486,7 +4486,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 10 + "port-version": 11 }, "magnum-extras": { "baseline": "2020.06", @@ -5166,7 +5166,7 @@ }, "ogre": { "baseline": "1.12.9", - "port-version": 9 + "port-version": 10 }, "ogre-next": { "baseline": "2.3.1", @@ -6573,8 +6573,8 @@ "port-version": 4 }, "sdl2": { - "baseline": "2.0.22", - "port-version": 3 + "baseline": "2.24.0", + "port-version": 0 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 94e5cb1e6dce6f..0e438c990b1f18 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "197609d70edc506c0257721d873b1eb3b93ba4b8", + "version": "4.4.1", + "port-version": 17 + }, { "git-tree": "0aee15f22c29078cc18d6324f3f622ef6e94deba", "version": "4.4.1", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index 60a8cfca5ea24e..4257e7602181d2 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6431ca1de3d870f6489764786af14b7230fa29f", + "version-string": "2020.06", + "port-version": 11 + }, { "git-tree": "13edb110eb5bc10f3591616c0fb64e7bc4b2ce9f", "version-string": "2020.06", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 1979c25b9c4caf..4aca6405120494 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea03f2d3fd45123a688cd9fb177bcb9bab30a795", + "version": "1.12.9", + "port-version": 10 + }, { "git-tree": "24ad8730cbc30e48c816ce6bca6abfb6cf1851fc", "version": "1.12.9", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index a6b9279a342e14..f47842658c7fc1 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbd3f6b2c738602adc3b3aa7c314212bff79b620", + "version": "2.24.0", + "port-version": 0 + }, { "git-tree": "69c64474577715f87366d9374b0483256f305f1e", "version": "2.0.22", From 87ed56ca348833b24670078d7600935bc4c6688b Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 1 Sep 2022 05:36:38 +0900 Subject: [PATCH 506/791] [gdk-pixbuf] update to 2.42.9 (#26534) * [gdk-pixbuf] update to 2.42.9 (microsoft#26533) * [gdk-pixbuf] don't build the test suite (microsoft#26533) We're not running nor installing the test suite, so there's no point in building it, either * [gdk-pixbuf] Blacklist x64-windows-static (microsoft#26533) Fails to build over here. In fact, 2.42.8 also fails over here, so it's probably not a regression. * [gdk-pixbuf] Regenerate version registries (microsoft#26533) --- ports/gdk-pixbuf/portfile.cmake | 5 +++-- ports/gdk-pixbuf/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 3 +++ versions/baseline.json | 4 ++-- versions/g-/gdk-pixbuf.json | 5 +++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index f084b6d976d117..32b48a539d693e 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -1,12 +1,12 @@ set(GDK_PIXBUF_VERSION 2.42) -set(GDK_PIXBUF_PATCH 8) +set(GDK_PIXBUF_PATCH 9) vcpkg_from_gitlab( GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/gdk-pixbuf REF "${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}" - SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c + SHA512 3406f47b413fe3860df410a0cc0076ce47d10605b39347105690c85616739e67e5dfd0804efcad758614b0c8d1369e410b9efaa704a234bfd19686b82595b9e1 HEAD_REF master PATCHES fix_build_error_windows.patch @@ -26,6 +26,7 @@ vcpkg_configure_meson( -Djpeg=enabled # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used -Dintrospection=disabled # Whether to generate the API introspection data (requires GObject-Introspection) -Drelocatable=true # Whether to enable application bundle relocation support + -Dtests=false -Dinstalled_tests=false -Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows) -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index 7d28530fdb8c52..0efd7ae5af61fd 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdk-pixbuf", - "version": "2.42.8", - "port-version": 3, + "version": "2.42.9", "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-only", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f77b936a7c6698..68a97129e85193 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -277,6 +277,9 @@ functions-framework-cpp:x64-uwp=fail # VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 gazebo:x64-windows=fail gazebo:x64-linux=fail + +gdk-pixbuf:x64-windows-static=fail +gdk-pixbuf:x64-windows-static-md=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip gsoap:x86-windows = skip diff --git a/versions/baseline.json b/versions/baseline.json index 960ceb72ac6dc8..6a139d69bf5231 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2509,8 +2509,8 @@ "port-version": 1 }, "gdk-pixbuf": { - "baseline": "2.42.8", - "port-version": 3 + "baseline": "2.42.9", + "port-version": 0 }, "gemmlowp": { "baseline": "2021-09-28", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index 5acd6f7b1d7371..d721f0276a74a4 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4d20ae662c74ed3f4bfec74bb57a68747564c96", + "version": "2.42.9", + "port-version": 0 + }, { "git-tree": "6662972ebf092397b1d94122ecfc754f0b81eeee", "version": "2.42.8", From ef2a101499a1d91987bf284ae538cd20a041bf39 Mon Sep 17 00:00:00 2001 From: Hamish Moffatt <7577172+hmoffatt@users.noreply.github.com> Date: Thu, 1 Sep 2022 06:37:08 +1000 Subject: [PATCH 507/791] [flat] update to 2022-08-30 (#26589) * [flat] new upstream version * [flat] update version --- ports/flat/portfile.cmake | 4 ++-- ports/flat/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/flat.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/flat/portfile.cmake b/ports/flat/portfile.cmake index dc88ecd87c952c..3cc80336b04f2c 100644 --- a/ports/flat/portfile.cmake +++ b/ports/flat/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pubby/flat - REF 8c187b9f4435a7c86eacb5e21ec9f36119722827 - SHA512 1731b0f5c78a5a509e168ff632b18d3a4f5d772839b80239188613bc0313637dd62ce90511fee65497ce3e462de441bef00649836d82445761d9340e26036808 + REF 7ddca21388ad45d5b830d836b256d47d1289315f + SHA512 eecb9683c681e46e166140c491536f87ec78c6ed456ad0295f2b53631c377c6356fea6bb8a2d17ca27457807a03f9e188bf27b3ff489d78624ab997957279cf3 HEAD_REF master ) diff --git a/ports/flat/vcpkg.json b/ports/flat/vcpkg.json index b98dc6ce4a8da0..87ac782b59cff7 100644 --- a/ports/flat/vcpkg.json +++ b/ports/flat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "flat", - "version-date": "2022-06-10", + "version-date": "2022-08-30", "description": "Flat Containers Library", "homepage": "https://github.com/pubby/flat", "license": "BSL-1.0" diff --git a/versions/baseline.json b/versions/baseline.json index 6a139d69bf5231..fc7c5361615579 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2301,7 +2301,7 @@ "port-version": 4 }, "flat": { - "baseline": "2022-06-10", + "baseline": "2022-08-30", "port-version": 0 }, "flatbuffers": { diff --git a/versions/f-/flat.json b/versions/f-/flat.json index 4f4c1b48a67060..7c710f9a078aad 100644 --- a/versions/f-/flat.json +++ b/versions/f-/flat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c433fd060ea2d62e51b5301cec47da8c1a922acb", + "version-date": "2022-08-30", + "port-version": 0 + }, { "git-tree": "0e7a31d2afadc58f808facb7381a039d5f72eb36", "version-date": "2022-06-10", From 079a19c9bb4e65a63ceba135927ff53fec1f4d23 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 31 Aug 2022 23:44:21 +0300 Subject: [PATCH 508/791] openexr: Bump version to 2.5.8, clean patches and fix ARM (#26503) * openexr: Bump to 2.5.8 The x-add-version and patch fixes will be in next commits. * openexr: vcpkg.json: Use "version" instead of "version-string" * openexr: vcpkg.json: Add SPDX license identifier * openexr: Clean 0001*-find_package patch As upstream has cleaned it up already. * openexr: Clean 0002-fixup_cmake_exports** patch from old whitespace fix The upstream was already fixed it. * openexr: Drop symlinks and find-pkg patches as it were handled at upstream * openexr: Fix ARM build See upstream fix for details in openexr/openexr#1216: https://github.com/AcademySoftwareFoundation/openexr/pull/1216 * openexr: Migrate the old function to new vcpkg-cmake-config helpers * openexr/portfile: Add comment about version for commit revision * openexr: Update baseline via `vcpkg x-add-version openexr' --- .../0001-remove_find_package_macro.patch | 49 ----------------- .../0002-fixup_cmake_exports_path.patch | 9 ---- ...003-fix-arm-intrin-detection-pr-1216.patch | 13 +++++ ports/openexr/0003-remove_symlinks.patch | 40 -------------- ...ig-lib-suffix-for-cmake-debug-builds.patch | 54 ------------------- ports/openexr/portfile.cmake | 16 +++--- ports/openexr/vcpkg.json | 14 +++-- versions/baseline.json | 4 +- versions/o-/openexr.json | 5 ++ 9 files changed, 38 insertions(+), 166 deletions(-) create mode 100644 ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch delete mode 100644 ports/openexr/0003-remove_symlinks.patch delete mode 100644 ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch diff --git a/ports/openexr/0001-remove_find_package_macro.patch b/ports/openexr/0001-remove_find_package_macro.patch index 967e89a83c7e3f..fb7d331c7c8e82 100644 --- a/ports/openexr/0001-remove_find_package_macro.patch +++ b/ports/openexr/0001-remove_find_package_macro.patch @@ -1,52 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 111a603..109394f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,22 +25,12 @@ endif() - project(OpenEXRMetaProject) - - --# An "official" way to make this a super-project --# basically overrides the find_package to not find anything --# for stuff we're including locally --set(as_subproject IlmBase OpenEXR) --macro(find_package) -- if(NOT "${ARGV0}" IN_LIST as_subproject) -- _find_package(${ARGV}) -- endif() --endmacro() -- - - # If you want to use ctest to configure, build and - # upload the results, cmake has builtin support for - # submitting to CDash, or any server who speaks the - # same protocol --# -+# - # These settings will need to be set for your environment, - # and then a script such as the example in - # -@@ -51,7 +41,7 @@ endmacro() - # cmake -S cmake/SampleCTestScript.cmake - # - # [or whatever you name the file you edit] --# -+# - #set(CTEST_PROJECT_NAME "OpenEXR") - #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC") - #set(CTEST_DROP_METHOD "http") # there are others... -diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt -index 390b27f..87b2d01 100644 ---- a/OpenEXR/CMakeLists.txt -+++ b/OpenEXR/CMakeLists.txt -@@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake) - - # Everyone depends on IlmBase, and we currently rely on - # the version matched with our release --find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG) - - # generates config headers, package config files - add_subdirectory(config) diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake index 5116726..34c7c87 100644 --- a/OpenEXR/config/OpenEXRSetup.cmake diff --git a/ports/openexr/0002-fixup_cmake_exports_path.patch b/ports/openexr/0002-fixup_cmake_exports_path.patch index e39bd3792ff8a7..07c0991a4fc583 100644 --- a/ports/openexr/0002-fixup_cmake_exports_path.patch +++ b/ports/openexr/0002-fixup_cmake_exports_path.patch @@ -28,15 +28,6 @@ diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt index b52ad0d..3dc6d22 100644 --- a/OpenEXR/config/CMakeLists.txt +++ b/OpenEXR/config/CMakeLists.txt -@@ -19,7 +19,7 @@ int main() - sysconf(_SC_NPROCESSORS_ONLN); - } - " OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN --) -+) - - check_cxx_source_compiles( - " @@ -100,7 +100,7 @@ endif() include(CMakePackageConfigHelpers) configure_package_config_file(OpenEXRConfig.cmake.in diff --git a/ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch b/ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch new file mode 100644 index 00000000000000..f018ab44248647 --- /dev/null +++ b/ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch @@ -0,0 +1,13 @@ +diff --git a/src/lib/OpenEXR/ImfSimd.h b/src/lib/OpenEXR/ImfSimd.h +index 810e7ccc3..9bb4e11ae 100644 +--- a/OpenEXR/IlmImf/ImfSimd.h ++++ b/OpenEXR/IlmImf/ImfSimd.h +@@ -14,7 +14,7 @@ + + + // GCC and Visual Studio SSE2 compiler flags +-#if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE) ++#if defined __SSE2__ || (_MSC_VER >= 1300 && (_M_IX86 || _M_X64)) + #define IMF_HAVE_SSE2 1 + #endif + diff --git a/ports/openexr/0003-remove_symlinks.patch b/ports/openexr/0003-remove_symlinks.patch deleted file mode 100644 index 89b9c53f3c96fc..00000000000000 --- a/ports/openexr/0003-remove_symlinks.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake -index 44254a7..1f5d2a6 100644 ---- a/IlmBase/config/LibraryDefine.cmake -+++ b/IlmBase/config/LibraryDefine.cmake -@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname) - if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(WIN32) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") -- else() -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") -- endif() -- set(verlibname) -- set(baselibname) - endif() - - if(ILMBASE_BUILD_BOTH_STATIC_SHARED) -diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake -index a9561dc..42853af 100644 ---- a/OpenEXR/config/LibraryDefine.cmake -+++ b/OpenEXR/config/LibraryDefine.cmake -@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname) - if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(WIN32) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") -- else() -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")") -- endif() -- set(verlibname) -- set(baselibname) - endif() - - if(OPENEXR_BUILD_BOTH_STATIC_SHARED) diff --git a/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch b/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch deleted file mode 100644 index 83ab73a217c776..00000000000000 --- a/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6cd6b32af052563e4cd5114a1d279736d1d8653a Mon Sep 17 00:00:00 2001 -From: "Matthias C. M. Troffaes" -Date: Tue, 1 Jun 2021 08:06:45 +0100 -Subject: [PATCH] Use CMAKE__POSTFIX for .pc file lib suffix. - -Signed-off-by: Matthias C. M. Troffaes ---- - IlmBase/config/CMakeLists.txt | 3 ++- - OpenEXR/config/CMakeLists.txt | 3 ++- - PyIlmBase/config/CMakeLists.txt | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt -index d9c5ae449..dfebb43bd 100644 ---- a/IlmBase/config/CMakeLists.txt -+++ b/IlmBase/config/CMakeLists.txt -@@ -78,7 +78,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) - set(exec_prefix "\${prefix}") - set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -- set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -+ set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - if(TARGET Threads::Threads) - # hrm, can't use properties as they end up as generator expressions - # which don't seem to evaluate -diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt -index 8386e3a0e..039190cd9 100644 ---- a/OpenEXR/config/CMakeLists.txt -+++ b/OpenEXR/config/CMakeLists.txt -@@ -77,7 +77,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) - set(exec_prefix "\${prefix}") - set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") - set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") -- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -+ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - if(TARGET Threads::Threads) - # hrm, can't use properties as they end up as generator expressions - # which don't seem to evaluate -diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt -index 1872c89e7..a4139bcfd 100644 ---- a/PyIlmBase/config/CMakeLists.txt -+++ b/PyIlmBase/config/CMakeLists.txt -@@ -18,7 +18,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG) - set(exec_prefix ${CMAKE_INSTALL_BINDIR}) - set(libdir ${CMAKE_INSTALL_LIBDIR}) - set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) -- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) -+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -+ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) - string(REPLACE ".in" "" pcout ${pcinfile}) - configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY) - install( diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index aac8fea5528019..b5a4edf552ce95 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -5,27 +5,25 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO openexr/openexr - REF ed64d5467dee9763f28baf300f7699e6288b9f5f - SHA512 549d37ed1ef4d1ff7e732d583f7213ee15c7f92625aea9fd65345e4c5b854902c02e5940d0692b1af5ae0a02abf46aaefea2662db2389d1b2fb4264a373baac2 + REF 918b8f543e81b5a1e1aca494ab7352ca280afc9e # v2.5.8 + SHA512 7c4a22779718cb1a8962d53d0817a0b3cba90fc9ad4c6469e845bdfbf9ae8be8e43905ad8672955838976caeffd7dabcc6ea9c1f00babef0d5dfc8b5e058cce9 HEAD_REF master PATCHES 0001-remove_find_package_macro.patch 0002-fixup_cmake_exports_path.patch - 0003-remove_symlinks.patch - 0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1032 + 0003-fix-arm-intrin-detection-pr-1216.patch ) -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} OPTIONS -DCMAKE_DEBUG_POSTFIX=_d -DPYILMBASE_ENABLE=FALSE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/ilmbase TARGET_PATH share/ilmbase) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(PACKAGE_NAME ilmbase CONFIG_PATH share/ilmbase) vcpkg_fixup_pkgconfig() file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index 637485f3887bb3..d75f02dd48386c 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,11 +1,19 @@ { "name": "openexr", - "version-string": "2.5.0", - "port-version": 4, + "version": "2.5.8", "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", - "supports": "!uwp & !(arm & windows)", + "license": "BSD-3-Clause", + "supports": "!uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index fc7c5361615579..2bc4c95093a303 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5273,8 +5273,8 @@ "port-version": 1 }, "openexr": { - "baseline": "2.5.0", - "port-version": 4 + "baseline": "2.5.8", + "port-version": 0 }, "opengl": { "baseline": "2022-03-14", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index 7d188528a7183e..80ae86c3c22541 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c4594196b46cfaa3d93cd5aff01060acab0ba9f", + "version": "2.5.8", + "port-version": 0 + }, { "git-tree": "40df682add8b267e718dac8ea78a2bcb47006048", "version-string": "2.5.0", From dd66c57b832b5d3cdec2fad669535c79d26c704d Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 31 Aug 2022 22:47:00 +0200 Subject: [PATCH 509/791] [vcpkg baseline][gstreamer] Fix interference with libx11 on Windows (#26574) * [gstreamer] Fix interference with libx11 on Windows * Add feature x11 * version * set x11 flag * version --- ports/gstreamer/plugins-base-x11.patch | 13 +++++++++++++ ports/gstreamer/portfile.cmake | 17 ++++++++++++++++- ports/gstreamer/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 ports/gstreamer/plugins-base-x11.patch diff --git a/ports/gstreamer/plugins-base-x11.patch b/ports/gstreamer/plugins-base-x11.patch new file mode 100644 index 00000000000000..9860308a9730b0 --- /dev/null +++ b/ports/gstreamer/plugins-base-x11.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 9b00253a0f..e3c3a0d920 100644 +--- a/meson.build ++++ b/meson.build +@@ -316,7 +316,7 @@ else + gtk_quartz_dep = dependency('', required : false) + endif + +-core_conf.set('HAVE_X11', x11_dep.found()) ++core_conf.set('HAVE_X11', false) + core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) + + if gio_dep.type_name() == 'pkgconfig' diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index c247ff86e2c4d4..9e7a57aa0420db 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_from_github( PATCHES gstreamer-disable-no-unused.patch fix-clang-cl-gstreamer.patch ) if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch) + list(APPEND PLUGIN_BASE_PATCHES plugins-base-use-zlib.patch plugin-base-disable-no-unused.patch plugins-base-x11.patch) list(APPEND PLUGIN_GOOD_PATCHES plugins-good-use-zlib.patch) list(APPEND PLUGIN_UGLY_PATCHES plugins-ugly-disable-doc.patch) endif() @@ -137,6 +137,12 @@ else() set(PLUGIN_GOOD_FLAC disabled) endif() +if ("x11" IN_LIST FEATURES) + set(PLUGIN_BASE_X11 enabled) +else() + set(PLUGIN_BASE_X11 disabled) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBRARY_LINKAGE "shared") else() @@ -148,6 +154,13 @@ vcpkg_find_acquire_program(GIT) get_filename_component(GIT_DIR "${GIT}" DIRECTORY) vcpkg_add_to_path("${GIT_DIR}") +if(VCPKG_TARGET_IS_WINDOWS) + set(PLUGIN_BASE_WIN + -Dgst-plugins-base:xvideo=disabled + -Dgst-plugins-base:xshm=disabled + -Dgst-plugins-base:gl_winsys=win32) +endif() + # # check scripts/cmake/vcpkg_configure_meson.cmake # --wrap-mode=nodownload @@ -189,6 +202,8 @@ vcpkg_configure_meson( -Dgst-plugins-base:orc=disabled -Dgst-plugins-base:pango=disabled -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} + -Dgst-plugins-base:x11=${PLUGIN_BASE_X11} + ${PLUGIN_BASE_WIN} # gst-plugins-good -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-good:qt5=disabled diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 0c7b5d83d14e9b..27928755a8a2ad 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,10 +1,10 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 6, + "port-version": 7, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", - "license": "LGPL-2.0", + "license": "LGPL-2.0-only", "supports": "!linux & !uwp", "dependencies": [ { @@ -131,6 +131,13 @@ "libraw" ] }, + "x11": { + "description": "Use x11 window system", + "supports": "!windows", + "dependencies": [ + "libx11" + ] + }, "x264": { "description": "Colon separated list of additional x264 library paths, e.g. for 10-bit version", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index 2bc4c95093a303..f755ed810781f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2746,7 +2746,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 6 + "port-version": 7 }, "gtest": { "baseline": "1.12.1", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index f475f0a1ba9894..41d9611d7896cd 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88e3063c417fe72ab1532ad99494b71c8037d8b5", + "version": "1.19.2", + "port-version": 7 + }, { "git-tree": "245207bd8010181848ffaad5822f2492f2cb2b38", "version": "1.19.2", From c96b24ce576434e59e25f288e67b61b694464334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 31 Aug 2022 20:48:17 +0000 Subject: [PATCH 510/791] [vcpkg baseline][nghttp3] Fix configure when cunit was installed (#26604) * [vcpkg baseline][nghttp3] Fix configure when cunit was installed * version --- ports/nghttp3/portfile.cmake | 4 ++++ ports/nghttp3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nghttp3.json | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index 75aee6458ef593..e106f91b7c1c06 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -14,9 +14,13 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_LIB_ONLY=ON + -DBUILD_TESTING=OFF "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" + -DCMAKE_DISABLE_FIND_PACKAGE_CUnit=ON + MAYBE_UNUSED_VARIABLES + BUILD_TESTING ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index d374f3c35aeb0c..642dc07553b6c6 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nghttp3", "version": "0.7.0", + "port-version": 1, "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index f755ed810781f0..55765096cdd849 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4990,7 +4990,7 @@ }, "nghttp3": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "ngspice": { "baseline": "37", diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 72f1eb132c3a79..86df12c31f573d 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf61122128fd277764b9319577d2ed3636c1d0d0", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "f71e5ffcb5802adeb997b151ea1277662ff9b03f", "version": "0.7.0", From c4ac478f67b73b158c9104016907d313a8e77ca4 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Wed, 31 Aug 2022 13:56:12 -0700 Subject: [PATCH 511/791] [crashpad] Install chromeos_buildflags.h (#26593) * [crashpad] Install chromeos_buildflags.h * x-add-version --- ports/crashpad/portfile.cmake | 3 +++ ports/crashpad/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/crashpad.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index f1d39295cc21f8..62b1eddd83a611 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -111,6 +111,9 @@ install_headers("${SOURCE_PATH}/util") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/base") install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") + # remove empty directories file(REMOVE_RECURSE "${PACKAGES_INCLUDE_DIR}/util/net/testdata" diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 171b990505932c..bc02923447b678 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crashpad", "version-date": "2022-04-16", - "port-version": 2, + "port-version": 3, "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/versions/baseline.json b/versions/baseline.json index 55765096cdd849..4aed079f186082 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1706,7 +1706,7 @@ }, "crashpad": { "baseline": "2022-04-16", - "port-version": 2 + "port-version": 3 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index e6f7c633756dbe..2d7b0a2fd5efdb 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1338388a039df55d6812726dd2e638684a19509", + "version-date": "2022-04-16", + "port-version": 3 + }, { "git-tree": "52ddbe860d52d69d2c0f80001528f9edf961e58b", "version-date": "2022-04-16", From 1623a385d38a12b2b9633e2f376a96be580349a1 Mon Sep 17 00:00:00 2001 From: Clinton Ingram Date: Wed, 31 Aug 2022 13:57:26 -0700 Subject: [PATCH 512/791] [zlib-ng] fix HEAD_REF (#26591) * fix head_ref * update versions --- ports/zlib-ng/portfile.cmake | 2 +- ports/zlib-ng/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/z-/zlib-ng.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 0d110d0f95243b..4b9f595a1d1095 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( REPO zlib-ng/zlib-ng REF "${ZLIB_FULL_VERSION}" SHA512 4888f17160d0a87a9b349704047ae0d0dc57237a10e11adae09ace957afa9743cce5191db67cb082991421fc961ce68011199621034d2369c0e7724fad58b4c5 - HEAD_REF master + HEAD_REF develop ) vcpkg_cmake_configure( diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index a64c9bd6b7d9c1..c36f24e4f51cff 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zlib-ng", "version": "2.0.6", + "port-version": 1, "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 4aed079f186082..8702c7825810f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7970,7 +7970,7 @@ }, "zlib-ng": { "baseline": "2.0.6", - "port-version": 0 + "port-version": 1 }, "zookeeper": { "baseline": "3.5.6", diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index 3cb2637e627dc2..d69c235c4c094f 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60e9a6f12ede4c5e87d2b3077c25e83991a02eea", + "version": "2.0.6", + "port-version": 1 + }, { "git-tree": "3324dce4e575e9ba671576b06108c612d0b500bf", "version": "2.0.6", From e126661e3d143a21c1ca5846a8a623d062c13ea2 Mon Sep 17 00:00:00 2001 From: omartijn <44672243+omartijn@users.noreply.github.com> Date: Wed, 31 Aug 2022 22:58:30 +0200 Subject: [PATCH 513/791] The find script for asio sdk failed on multiple inclusion (#26583) Since it first tries to locate the directory and then unconditionally adds a subdirectory to it, running this script twice resulted in an incorrect path (the last node was added multiple times). We now check whether the script already ran and then abort. Co-authored-by: Martijn Otto --- ports/asiosdk/Findasiosdk.cmake | 7 +++++++ ports/asiosdk/vcpkg.json | 2 +- versions/a-/asiosdk.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/asiosdk/Findasiosdk.cmake b/ports/asiosdk/Findasiosdk.cmake index b8f32f83078f7b..c88f7df3f2bccb 100644 --- a/ports/asiosdk/Findasiosdk.cmake +++ b/ports/asiosdk/Findasiosdk.cmake @@ -3,6 +3,13 @@ else(WIN32) message(FATAL_ERROR "Findasiosdk.cmake: Unsupported platform ${CMAKE_SYSTEM_NAME}" ) endif(WIN32) +# if this script is invoked multiple times, we end up adding +# "asiosdk" to the directory multiple times, leading to incorrect +# include paths +if (ASIOSDK_ROOT_DIR) + return() +endif() + find_path( ASIOSDK_ROOT_DIR asiosdk diff --git a/ports/asiosdk/vcpkg.json b/ports/asiosdk/vcpkg.json index 6d3e9ce6095a2e..55f3f5b4fc9a4a 100644 --- a/ports/asiosdk/vcpkg.json +++ b/ports/asiosdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "asiosdk", "version": "2.3.3", - "port-version": 4, + "port-version": 5, "description": "ASIO is a low latency audio API from Steinberg.", "homepage": "https://www.steinberg.net/en/company/developers.html", "supports": "windows & !(arm | uwp)" diff --git a/versions/a-/asiosdk.json b/versions/a-/asiosdk.json index 087591c2f33c64..b5f3f1c865e5ba 100644 --- a/versions/a-/asiosdk.json +++ b/versions/a-/asiosdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75f1c1ef95024543bf7298ba4389eafe67b9f473", + "version": "2.3.3", + "port-version": 5 + }, { "git-tree": "101bbdad9205db5b4249eae8b47bf8c5f73493a8", "version": "2.3.3", diff --git a/versions/baseline.json b/versions/baseline.json index 8702c7825810f7..10f0653b8ded09 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -198,7 +198,7 @@ }, "asiosdk": { "baseline": "2.3.3", - "port-version": 4 + "port-version": 5 }, "asmjit": { "baseline": "2021-10-26", From 85103614247d3deca33e57b7d31f7ce74877f00d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 1 Sep 2022 04:59:46 +0800 Subject: [PATCH 514/791] [orc] update to 1.7.6 (#26603) * [orc] update to 1.7.6 * update version * Fix-linux error * update version --- ports/orc/0003-dependencies-from-vcpkg.patch | 148 +++++++++++-------- ports/orc/0005-disable-tzdata.patch | 30 ---- ports/orc/fix-linux-error.patch | 21 +++ ports/orc/portfile.cmake | 6 +- ports/orc/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/o-/orc.json | 5 + 7 files changed, 122 insertions(+), 96 deletions(-) delete mode 100644 ports/orc/0005-disable-tzdata.patch create mode 100644 ports/orc/fix-linux-error.patch diff --git a/ports/orc/0003-dependencies-from-vcpkg.patch b/ports/orc/0003-dependencies-from-vcpkg.patch index fb7c591441744b..fdabe356d471fe 100644 --- a/ports/orc/0003-dependencies-from-vcpkg.patch +++ b/ports/orc/0003-dependencies-from-vcpkg.patch @@ -1,16 +1,16 @@ diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt -index 3d4a162..6926bc3 100644 +index d4cd035..0701a7d 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt -@@ -230,12 +230,13 @@ endif(BUILD_LIBHDFSPP) +@@ -239,12 +239,13 @@ endif(BUILD_LIBHDFSPP) add_library (orc STATIC ${SOURCE_FILES}) target_link_libraries (orc -- protobuf -- zlib -- snappy -- lz4 -- zstd +- orc::protobuf +- orc::zlib +- orc::snappy +- orc::lz4 +- orc::zstd - ${LIBHDFSPP_LIBRARIES} + PRIVATE + protobuf::libprotobuf @@ -23,10 +23,10 @@ index 3d4a162..6926bc3 100644 install(TARGETS orc DESTINATION lib) diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 3a35325..56ffd74 100644 +index 6919847..ad52cf2 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -59,8 +59,8 @@ endif () +@@ -66,8 +66,8 @@ endif () # ---------------------------------------------------------------------- # Snappy @@ -37,18 +37,23 @@ index 3a35325..56ffd74 100644 set(SNAPPY_VENDORED FALSE) else () set(SNAPPY_HOME "${THIRDPARTY_DIR}/snappy_ep-install") -@@ -78,10 +78,6 @@ else () +@@ -90,15 +90,6 @@ else () set(SNAPPY_VENDORED TRUE) endif () --include_directories (SYSTEM ${SNAPPY_INCLUDE_DIR}) --add_library (snappy STATIC IMPORTED) --set_target_properties (snappy PROPERTIES IMPORTED_LOCATION ${SNAPPY_STATIC_LIB}) +-add_library (orc_snappy INTERFACE) +-add_library (orc::snappy ALIAS orc_snappy) +-if (ORC_PREFER_STATIC_SNAPPY AND ${SNAPPY_STATIC_LIB}) +- target_link_libraries(orc_snappy INTERFACE ${SNAPPY_STATIC_LIB}) +-else () +- target_link_libraries(orc_snappy INTERFACE ${SNAPPY_LIBRARY}) +-endif () +-target_include_directories (orc_snappy SYSTEM INTERFACE ${SNAPPY_INCLUDE_DIR}) - if (SNAPPY_VENDORED) - add_dependencies (snappy snappy_ep) + add_dependencies (orc_snappy snappy_ep) if (INSTALL_VENDORED_LIBS) -@@ -93,7 +89,7 @@ endif () +@@ -110,7 +101,7 @@ endif () # ---------------------------------------------------------------------- # ZLIB @@ -57,62 +62,86 @@ index 3a35325..56ffd74 100644 find_package (ZLIB REQUIRED) set(ZLIB_VENDORED FALSE) else () -@@ -120,10 +116,6 @@ else () +@@ -142,15 +133,6 @@ else () set(ZLIB_VENDORED TRUE) endif () --include_directories (SYSTEM ${ZLIB_INCLUDE_DIR}) --add_library (zlib STATIC IMPORTED) --set_target_properties (zlib PROPERTIES IMPORTED_LOCATION ${ZLIB_STATIC_LIB}) +-add_library (orc_zlib INTERFACE) +-add_library (orc::zlib ALIAS orc_zlib) +-if (ORC_PREFER_STATIC_ZLIB AND ${ZLIB_STATIC_LIB}) +- target_link_libraries (orc_zlib INTERFACE ${ZLIB_STATIC_LIB}) +-else () +- target_link_libraries (orc_zlib INTERFACE ${ZLIB_LIBRARY}) +-endif () +-target_include_directories (orc_zlib SYSTEM INTERFACE ${ZLIB_INCLUDE_DIR}) - if (ZLIB_VENDORED) - add_dependencies (zlib zlib_ep) + add_dependencies (orc_zlib zlib_ep) if (INSTALL_VENDORED_LIBS) -@@ -135,8 +127,8 @@ endif () +@@ -162,8 +144,8 @@ endif () # ---------------------------------------------------------------------- # Zstd -if (NOT "${ZSTD_HOME}" STREQUAL "") - find_package (ZSTD REQUIRED) +if (1) -+ find_package (zstd CONFIG REQUIRED) ++ find_package (ZSTD CONFIG REQUIRED) set(ZSTD_VENDORED FALSE) else () set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install") -@@ -169,10 +161,6 @@ else () +@@ -201,15 +183,6 @@ else () set(ZSTD_VENDORED TRUE) endif () --include_directories (SYSTEM ${ZSTD_INCLUDE_DIR}) --add_library (zstd STATIC IMPORTED) --set_target_properties (zstd PROPERTIES IMPORTED_LOCATION ${ZSTD_STATIC_LIB}) +-add_library (orc_zstd INTERFACE) +-add_library (orc::zstd ALIAS orc_zstd) +-if (ORC_PREFER_STATIC_ZSTD AND ${ZSTD_STATIC_LIB}) +- target_link_libraries (orc_zstd INTERFACE ${ZSTD_STATIC_LIB}) +-else () +- target_link_libraries (orc_zstd INTERFACE ${ZSTD_LIBRARY}) +-endif () +-target_include_directories (orc_zstd SYSTEM INTERFACE ${ZSTD_INCLUDE_DIR}) - if (ZSTD_VENDORED) - add_dependencies (zstd zstd_ep) + add_dependencies (orc_zstd zstd_ep) if (INSTALL_VENDORED_LIBS) -@@ -184,8 +172,8 @@ endif () +@@ -221,8 +194,8 @@ endif () # ---------------------------------------------------------------------- # LZ4 -if (NOT "${LZ4_HOME}" STREQUAL "") - find_package (LZ4 REQUIRED) +if (1) -+ find_package (lz4 CONFIG REQUIRED) ++ find_package (LZ4 CONFIG REQUIRED) set(LZ4_VENDORED FALSE) else () set(LZ4_PREFIX "${THIRDPARTY_DIR}/lz4_ep-install") -@@ -211,10 +199,6 @@ else () +@@ -253,15 +226,6 @@ else () set(LZ4_VENDORED TRUE) endif () --include_directories (SYSTEM ${LZ4_INCLUDE_DIR}) --add_library (lz4 STATIC IMPORTED) --set_target_properties (lz4 PROPERTIES IMPORTED_LOCATION ${LZ4_STATIC_LIB}) +-add_library (orc_lz4 INTERFACE) +-add_library (orc::lz4 ALIAS orc_lz4) +-if (ORC_PREFER_STATIC_LZ4 AND ${LZ4_STATIC_LIB}) +- target_link_libraries (orc_lz4 INTERFACE ${LZ4_STATIC_LIB}) +-else () +- target_link_libraries (orc_lz4 INTERFACE ${LZ4_LIBRARY}) +-endif () +-target_include_directories (orc_lz4 SYSTEM INTERFACE ${LZ4_INCLUDE_DIR}) - if (LZ4_VENDORED) - add_dependencies (lz4 lz4_ep) + add_dependencies (orc_lz4 lz4_ep) if (INSTALL_VENDORED_LIBS) -@@ -288,8 +272,8 @@ endif () +@@ -273,7 +237,7 @@ endif () + # ---------------------------------------------------------------------- + # IANA - Time Zone Database + +-if (WIN32) ++if (WIN32 AND TEST_VALGRIND_MEMCHECK) + SET(CURRENT_TZDATA_FILE "") + SET(CURRENT_TZDATA_SHA512 "") + File(DOWNLOAD "https://ftp.osuosl.org/pub/cygwin/noarch/release/tzdata/sha512.sum" ${CMAKE_CURRENT_BINARY_DIR}/sha512.sum) +@@ -372,8 +336,8 @@ endif () # ---------------------------------------------------------------------- # Protobuf @@ -123,40 +152,41 @@ index 3a35325..56ffd74 100644 set(PROTOBUF_VENDORED FALSE) else () set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") -@@ -327,12 +311,6 @@ endif () - - include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) - --add_library (protobuf STATIC IMPORTED) --set_target_properties (protobuf PROPERTIES IMPORTED_LOCATION ${PROTOBUF_STATIC_LIB}) -- --add_library (protoc STATIC IMPORTED) --set_target_properties (protoc PROPERTIES IMPORTED_LOCATION ${PROTOC_STATIC_LIB}) +@@ -421,19 +385,7 @@ add_library (orc::protobuf ALIAS orc_protobuf) + add_library (orc_protoc INTERFACE) + add_library (orc::protoc ALIAS orc_protoc) + +-if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOBUF_STATIC_LIB}) +- target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_STATIC_LIB}) +-else () +- target_link_libraries (orc_protobuf INTERFACE ${PROTOBUF_LIBRARY}) +-endif() +-target_include_directories (orc_protobuf SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR}) - +-if (ORC_PREFER_STATIC_PROTOBUF AND ${PROTOC_STATIC_LIB}) +- target_link_libraries (orc_protoc INTERFACE ${PROTOC_STATIC_LIB}) +-else () +- target_link_libraries (orc_protoc INTERFACE ${PROTOC_LIBRARY}) +-endif() +-target_include_directories (orc_protoc SYSTEM INTERFACE ${PROTOBUF_INCLUDE_DIR}) ++include_directories (SYSTEM ${PROTOBUF_INCLUDE_DIR}) + if (PROTOBUF_VENDORED) - add_dependencies (protoc protobuf_ep) - add_dependencies (protobuf protobuf_ep) + add_dependencies (orc_protoc protobuf_ep) diff --git a/tools/src/CMakeLists.txt b/tools/src/CMakeLists.txt -index f5a53ca..ec22e7a 100644 +index d55581b..701fd7c 100644 --- a/tools/src/CMakeLists.txt +++ b/tools/src/CMakeLists.txt -@@ -51,7 +51,6 @@ add_executable (orc-metadata - - target_link_libraries (orc-metadata - orc -- protobuf - ${CMAKE_THREAD_LIBS_INIT} - ) - -@@ -92,7 +91,7 @@ target_link_libraries (csv-import +@@ -95,11 +95,7 @@ target_link_libraries (csv-import ) install(TARGETS - orc-contents - orc-metadata - orc-statistics + orc-scan + orc-memory +- timezone-dump + csv-import - DESTINATION bin) -+ orc-scan -+ orc-memory -+ csv-import + DESTINATION tools/orc) diff --git a/ports/orc/0005-disable-tzdata.patch b/ports/orc/0005-disable-tzdata.patch deleted file mode 100644 index 829bd18b1fd3f4..00000000000000 --- a/ports/orc/0005-disable-tzdata.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt -index ea39023..599d79a 100644 ---- a/c++/test/CMakeLists.txt -+++ b/c++/test/CMakeLists.txt -@@ -67,6 +67,7 @@ target_link_libraries (create-test-files - protobuf - ) - -+if (ENABLE_TEST) - if (TEST_VALGRIND_MEMCHECK) - add_test (orc-test - valgrind --tool=memcheck --leak-check=full --error-exitcode=1 ./orc-test) -@@ -86,3 +87,4 @@ if (WIN32) - ENVIRONMENT "TZDIR=${TZDATA_DIR}" - ) - endif () -+endif() -diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake -index 3a35325..364470b 100644 ---- a/cmake_modules/ThirdpartyToolchain.cmake -+++ b/cmake_modules/ThirdpartyToolchain.cmake -@@ -226,7 +226,7 @@ endif () - # ---------------------------------------------------------------------- - # IANA - Time Zone Database - --if (WIN32) -+if (WIN32 AND TEST_VALGRIND_MEMCHECK) - ExternalProject_Add(tzdata_ep - URL "ftp://cygwin.osuosl.org/pub/cygwin/noarch/release/tzdata/tzdata-2019b-1.tar.xz" - URL_HASH MD5=17D8AB346BB1009D4EB35BC08040E51D diff --git a/ports/orc/fix-linux-error.patch b/ports/orc/fix-linux-error.patch new file mode 100644 index 00000000000000..f4689501f7bd44 --- /dev/null +++ b/ports/orc/fix-linux-error.patch @@ -0,0 +1,21 @@ +diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake +index ad52cf2..ed7ff28 100644 +--- a/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cmake_modules/ThirdpartyToolchain.cmake +@@ -145,7 +145,7 @@ endif () + # Zstd + + if (1) +- find_package (ZSTD CONFIG REQUIRED) ++ find_package (zstd CONFIG REQUIRED) + set(ZSTD_VENDORED FALSE) + else () + set(ZSTD_HOME "${THIRDPARTY_DIR}/zstd_ep-install") +@@ -338,6 +338,7 @@ endif () + + if (1) + find_package (Protobuf CONFIG REQUIRED) ++ include_directories(${Protobuf_INCLUDE_DIRS}) + set(PROTOBUF_VENDORED FALSE) + else () + set(PROTOBUF_PREFIX "${THIRDPARTY_DIR}/protobuf_ep-install") diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake index 12307b88567087..f8b8bb51a13f10 100644 --- a/ports/orc/portfile.cmake +++ b/ports/orc/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/orc - REF 23ecc03e87548f6d6783c2d8af2b46672c52214c # rel/release-1.6.4 - SHA512 907984c7e036ddaa90e7cbfabb9af4f6fd3520820b9a8732b304f2213030f7d67cef89ad87d50e028a51bff06f68ff359345ad6894850e299b2fca343d7c0c3e + REF 7ff749a4234c3db58d272a8fc1c7cc1860245692 # rel/release-1.7.6 + SHA512 1e7f0366530b691d7ea7ce671aa1e1a655cde2feb0fb0c3639da36ef565aceaf6f05e49a39c3c0ab7417dc324dc2cbb6e8babbf21f899ccb4cf5f0e63217afbf HEAD_REF master PATCHES 0003-dependencies-from-vcpkg.patch - 0005-disable-tzdata.patch + fix-linux-error.patch ) file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake") diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json index 652aa6ca0813a6..b8f09b1a2bbff5 100644 --- a/ports/orc/vcpkg.json +++ b/ports/orc/vcpkg.json @@ -1,9 +1,9 @@ { "name": "orc", - "version": "1.6.4", - "port-version": 4, + "version": "1.7.6", "description": "The smallest, fastest columnar storage for Hadoop workloads.", "homepage": "https://orc.apache.org/", + "license": "Apache-2.0", "dependencies": [ "gtest", "lz4", diff --git a/versions/baseline.json b/versions/baseline.json index 10f0653b8ded09..53cf6b74ac6643 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5397,8 +5397,8 @@ "port-version": 1 }, "orc": { - "baseline": "1.6.4", - "port-version": 4 + "baseline": "1.7.6", + "port-version": 0 }, "orocos-kdl": { "baseline": "1.4", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index 3110baebac0f1d..502e8fa6b6be53 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8db2855196eeddb1ac131df74e028367480613d5", + "version": "1.7.6", + "port-version": 0 + }, { "git-tree": "8c8bc9de897f95a0499e5dc4a49545cda6e496b2", "version": "1.6.4", From 2738b0efed4662cef51964cf15b9d4c2df8dc043 Mon Sep 17 00:00:00 2001 From: ReplayCoding Date: Wed, 31 Aug 2022 17:01:43 -0400 Subject: [PATCH 515/791] [x264] fix configuration on systems without /bin/bash (#26563) * [x264] fix configuration on systems without /bin/bash * Update version database * Update x264.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/x264/portfile.cmake | 3 +++ ports/x264/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/x-/x264.json | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 047a255dd8a424..6b726b40bea15e 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -10,6 +10,9 @@ vcpkg_from_github( allow-clang-cl.patch configure-as.patch # Ignore ':' from `vcpkg_configure_make` ) + +vcpkg_replace_string("${SOURCE_PATH}/configure" [[/bin/bash]] [[/usr/bin/env bash]]) + # Note on x264 versioning: # The pc file exports "0.164." where is the number of commits. # This must be fixed here because vcpkg uses a GH tarball instead of cloning the source. diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index c5834dd3669caf..54ba0439de199f 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,6 +1,7 @@ { "name": "x264", "version": "0.164.3095", + "port-version": 1, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://www.videolan.org/developers/x264.html", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 53cf6b74ac6643..b97c808578f63d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7786,7 +7786,7 @@ }, "x264": { "baseline": "0.164.3095", - "port-version": 0 + "port-version": 1 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 74d00740f5ad6d..55e06c314a2408 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16be87b659ccfeaba052e561f3f0a8b1b927c5d0", + "version": "0.164.3095", + "port-version": 1 + }, { "git-tree": "e369a0924f6b28e965b0e0c8f35264b7fd5efb7f", "version": "0.164.3095", From 6eb35f5af3d0c3d1fecd642b0c892eb4da647c6b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 1 Sep 2022 01:20:31 +0200 Subject: [PATCH 516/791] [xwindow] part 3/n (#26572) * [xcb-render-util] add port * [libxkbfile] add port * [libxkbcommon] add port * v db * Apply suggestions from code review Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * v db Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/libxkbcommon/build.patch | 27 ++++++++++++ ports/libxkbcommon/fix_msvc_build.patch | 13 ++++++ ports/libxkbcommon/portfile.cmake | 55 ++++++++++++++++++++++++ ports/libxkbcommon/vcpkg.json | 18 ++++++++ ports/libxkbfile/fix_u_char.patch | 15 +++++++ ports/libxkbfile/portfile.cmake | 41 ++++++++++++++++++ ports/libxkbfile/symbol_visibility.patch | 24 +++++++++++ ports/libxkbfile/vcpkg.json | 12 ++++++ ports/xcb-render-util/portfile.cmake | 31 +++++++++++++ ports/xcb-render-util/pthread.patch | 28 ++++++++++++ ports/xcb-render-util/vcpkg.json | 10 +++++ versions/baseline.json | 12 ++++++ versions/l-/libxkbcommon.json | 9 ++++ versions/l-/libxkbfile.json | 9 ++++ versions/x-/xcb-render-util.json | 9 ++++ 15 files changed, 313 insertions(+) create mode 100644 ports/libxkbcommon/build.patch create mode 100644 ports/libxkbcommon/fix_msvc_build.patch create mode 100644 ports/libxkbcommon/portfile.cmake create mode 100644 ports/libxkbcommon/vcpkg.json create mode 100644 ports/libxkbfile/fix_u_char.patch create mode 100644 ports/libxkbfile/portfile.cmake create mode 100644 ports/libxkbfile/symbol_visibility.patch create mode 100644 ports/libxkbfile/vcpkg.json create mode 100644 ports/xcb-render-util/portfile.cmake create mode 100644 ports/xcb-render-util/pthread.patch create mode 100644 ports/xcb-render-util/vcpkg.json create mode 100644 versions/l-/libxkbcommon.json create mode 100644 versions/l-/libxkbfile.json create mode 100644 versions/x-/xcb-render-util.json diff --git a/ports/libxkbcommon/build.patch b/ports/libxkbcommon/build.patch new file mode 100644 index 00000000000000..9cc9ea9b2bc326 --- /dev/null +++ b/ports/libxkbcommon/build.patch @@ -0,0 +1,27 @@ +diff --git a/tools/how-to-type.c b/tools/how-to-type.c +index 0a6f79e68..c1205004d 100644 +--- a/tools/how-to-type.c ++++ b/tools/how-to-type.c +@@ -25,8 +25,10 @@ + + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + #include + + #include "xkbcommon/xkbcommon.h" +diff --git a/tools/tools-common.c b/tools/tools-common.c +index 254499d8c..2465a88c2 100644 +--- a/tools/tools-common.c ++++ b/tools/tools-common.c +@@ -42,6 +42,7 @@ + #ifdef _MSC_VER + #include + #include ++#include + #else + #include + #include diff --git a/ports/libxkbcommon/fix_msvc_build.patch b/ports/libxkbcommon/fix_msvc_build.patch new file mode 100644 index 00000000000000..9caecd1cb62973 --- /dev/null +++ b/ports/libxkbcommon/fix_msvc_build.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 47c436f8d..3fdbe4709 100644 +--- a/meson.build ++++ b/meson.build +@@ -641,7 +641,7 @@ if get_option('enable-x11') + ) + # test/x11comp is meant to be run, but it is (temporarily?) disabled. + # See: https://github.com/xkbcommon/libxkbcommon/issues/30 +- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep) ++ # executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep) + endif + if get_option('enable-xkbregistry') + test( diff --git a/ports/libxkbcommon/portfile.cmake b/ports/libxkbcommon/portfile.cmake new file mode 100644 index 00000000000000..87b4547e958678 --- /dev/null +++ b/ports/libxkbcommon/portfile.cmake @@ -0,0 +1,55 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +set(PATCHES "") +if(VCPKG_TARGET_IS_WINDOWS) + #vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # Meson is not able to automatically export symbols for DLLs + set(PATCHES fix_msvc_build.patch + build.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xkbcommon/libxkbcommon + REF 57af9cb71f19f37394399b549f7cb7b0d9fe3988 # v 1.4.1 + SHA512 0f1ecdf12c3cc6ff547a9cf42aa8ce1c63acbf2f6fb766899e5e8dbda401e25dd8137c2f59a04dadd445b4873bb80b8ae8b23f88140e5a318186c308a65921f5 + HEAD_REF master + PATCHES ${PATCHES} +) + +vcpkg_find_acquire_program(FLEX) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") + +vcpkg_find_acquire_program(BISON) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +set(OPTIONS "") +if(VCPKG_TARGET_IS_WINDOWS) + set(OPTIONS -Denable-xkbregistry=false) +endif() + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -Denable-wayland=false + -Denable-docs=false + -Denable-tools=false +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxkbcommon/vcpkg.json b/ports/libxkbcommon/vcpkg.json new file mode 100644 index 00000000000000..ffd8259ae2c0c3 --- /dev/null +++ b/ports/libxkbcommon/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libxkbcommon", + "version": "1.4.1", + "description": "keymap handling library for toolkits and window systems", + "homepage": "https://xkbcommon.org/", + "license": null, + "dependencies": [ + "getopt", + "libx11", + "tool-meson", + { + "name": "wayland", + "platform": "linux" + }, + "xcb", + "xcb-render-util" + ] +} diff --git a/ports/libxkbfile/fix_u_char.patch b/ports/libxkbfile/fix_u_char.patch new file mode 100644 index 00000000000000..4e20ce02dcfd6e --- /dev/null +++ b/ports/libxkbfile/fix_u_char.patch @@ -0,0 +1,15 @@ +diff --git a/src/xkbmisc.c b/src/xkbmisc.c +index 2f9b532e6..8be8dd508 100644 +--- a/src/xkbmisc.c ++++ b/src/xkbmisc.c +@@ -688,7 +688,9 @@ XkbNameMatchesPattern(char *name, char *ptrn) + _X_HIDDEN int + _XkbStrCaseCmp(char *str1, char *str2) + { +- const u_char *us1 = (const u_char *) str1, *us2 = (const u_char *) str2; ++ typedef unsigned char u_char; ++ const u_char *us1 = (const u_char *) str1; ++ const u_char *us2 = (const u_char *) str2; + + while (tolower(*us1) == tolower(*us2)) { + if (*us1++ == '\0') diff --git a/ports/libxkbfile/portfile.cmake b/ports/libxkbfile/portfile.cmake new file mode 100644 index 00000000000000..78b0eaa248ba49 --- /dev/null +++ b/ports/libxkbfile/portfile.cmake @@ -0,0 +1,41 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +set(PATCHES "") +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(PATCHES symbol_visibility.patch) + list(APPEND VCPKG_C_FLAGS " /DXKBFILE_BUILD") + list(APPEND VCPKG_CXX_FLAGS " /DXKBFILE_BUILD") +endif() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxkbfile + REF 261992d42905f209cd5bf6afcf8a7ae3aa30b3ff #1.1.0 + SHA512 5be520e408d25331c9a97648f2a6fa832f0d4f49f93f71490b89746da0fbbda404eaab3797c5fbe195287dc94581a6703fa4ecc2511e046127af057eab60378f + HEAD_REF master + PATCHES fix_u_char.patch + ${PATCHES} +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) +endif() + diff --git a/ports/libxkbfile/symbol_visibility.patch b/ports/libxkbfile/symbol_visibility.patch new file mode 100644 index 00000000000000..103442160b5c25 --- /dev/null +++ b/ports/libxkbfile/symbol_visibility.patch @@ -0,0 +1,24 @@ +diff --git a/include/X11/extensions/XKBfile.h b/include/X11/extensions/XKBfile.h +index 1455463e6..5bcabdd14 100644 +--- a/include/X11/extensions/XKBfile.h ++++ b/include/X11/extensions/XKBfile.h +@@ -83,10 +83,15 @@ typedef void (*XkbFileAddOnFunc)( + #define _XkbErrXReqFailure 25 + #define _XkbErrBadImplementation 26 + +-extern const char * _XkbErrMessages[]; +-extern unsigned _XkbErrCode; +-extern const char * _XkbErrLocation; +-extern unsigned _XkbErrData; ++#if defined(_MSC_VER) && !defined(XKBFILE_BUILD) ++#define XKBFILE_EXTERN __declspec(dllimport) extern ++#else ++#define XKBFILE_EXTERN extern ++#endif ++XKBFILE_EXTERN const char * _XkbErrMessages[]; ++XKBFILE_EXTERN unsigned _XkbErrCode; ++XKBFILE_EXTERN const char * _XkbErrLocation; ++XKBFILE_EXTERN unsigned _XkbErrData; + + /***====================================================================***/ + diff --git a/ports/libxkbfile/vcpkg.json b/ports/libxkbfile/vcpkg.json new file mode 100644 index 00000000000000..b1f41147d7a147 --- /dev/null +++ b/ports/libxkbfile/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxkbfile", + "version": "1.1.0", + "description": "XKB file handling routines", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxkbfile", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/xcb-render-util/portfile.cmake b/ports/xcb-render-util/portfile.cmake new file mode 100644 index 00000000000000..2bad743750fc39 --- /dev/null +++ b/ports/xcb-render-util/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxcb-render-util + REF 0317caf63de532fd7a0493ed6afa871a67253747 #v 0.3.9 + SHA512 9a16c3eb3575586fce85a548cb5fd8b23aa8e42363b2c6d4e074e45f5c04089301ef2ff3012cf9cc94490359d4e28ff062feaecb97a880c9240bf7dbe5d03612 + HEAD_REF master # branch name + PATCHES pthread.patch # required since this port directly depends on pthread functions. So it has to directly link it! +) +file(TOUCH "${SOURCE_PATH}/m4/dummy") +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/xcb-render-util/pthread.patch b/ports/xcb-render-util/pthread.patch new file mode 100644 index 00000000000000..f045879bdbad64 --- /dev/null +++ b/ports/xcb-render-util/pthread.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index 803abe77b..7d694e401 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,6 +11,7 @@ AM_MAINTAINER_MODE + XCB_UTIL_COMMON([1.4], [1.6]) + + PKG_CHECK_MODULES(XCB_RENDER, xcb-render) ++PKG_CHECK_MODULES(PTHREAD_STUBS, pthread-stubs) + + AC_CONFIG_FILES([Makefile + renderutil/Makefile +diff --git a/renderutil/Makefile.am b/renderutil/Makefile.am +index 3a5179884..d403aa34a 100644 +--- a/renderutil/Makefile.am ++++ b/renderutil/Makefile.am +@@ -4,9 +4,9 @@ lib_LTLIBRARIES = libxcb-render-util.la + xcbinclude_HEADERS = xcb_renderutil.h + + AM_CFLAGS = $(BASE_CFLAGS) +-AM_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS) ++AM_CPPFLAGS = $(XCB_CFLAGS) $(XCB_RENDER_CFLAGS) ${PTHREAD_STUBS_CFLAGS} + libxcb_render_util_la_SOURCES = cache.c util.c glyph.c +-libxcb_render_util_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS) ++libxcb_render_util_la_LIBADD = $(XCB_LIBS) $(XCB_RENDER_LIBS) ${PTHREAD_STUBS_LIBS} + libxcb_render_util_la_LDFLAGS = -no-undefined + + pkgconfig_DATA = xcb-renderutil.pc diff --git a/ports/xcb-render-util/vcpkg.json b/ports/xcb-render-util/vcpkg.json new file mode 100644 index 00000000000000..8c3d47baca0d2e --- /dev/null +++ b/ports/xcb-render-util/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "xcb-render-util", + "version": "0.3.9", + "description": "XCB convenience functions for the Render extension.", + "homepage": "https://xcb.freedesktop.org/", + "license": null, + "dependencies": [ + "xcb" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b97c808578f63d..18b9734b114deb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4308,6 +4308,14 @@ "baseline": "6.0.0", "port-version": 0 }, + "libxkbcommon": { + "baseline": "1.4.1", + "port-version": 0 + }, + "libxkbfile": { + "baseline": "1.1.0", + "port-version": 0 + }, "libxlsxwriter": { "baseline": "1.1.4", "port-version": 0 @@ -7812,6 +7820,10 @@ "baseline": "1.14.1", "port-version": 0 }, + "xcb-render-util": { + "baseline": "0.3.9", + "port-version": 0 + }, "xcb-util-m4": { "baseline": "2022-01-24", "port-version": 0 diff --git a/versions/l-/libxkbcommon.json b/versions/l-/libxkbcommon.json new file mode 100644 index 00000000000000..5cdbd5a145c8f3 --- /dev/null +++ b/versions/l-/libxkbcommon.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "41ae34eb1eb104faea75a726f115e0e774c17d65", + "version": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxkbfile.json b/versions/l-/libxkbfile.json new file mode 100644 index 00000000000000..849a5f8ccd1660 --- /dev/null +++ b/versions/l-/libxkbfile.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4b6df8dfd8284d03ff745d341c1269c191027811", + "version": "1.1.0", + "port-version": 0 + } + ] +} diff --git a/versions/x-/xcb-render-util.json b/versions/x-/xcb-render-util.json new file mode 100644 index 00000000000000..b14709327f49fa --- /dev/null +++ b/versions/x-/xcb-render-util.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c33cb9ea07d2bd0e8662ad5d8a1368aae2144da2", + "version": "0.3.9", + "port-version": 0 + } + ] +} From c0b6d35a67d2ad358a6ced92b7aad16a7bf17737 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Thu, 1 Sep 2022 02:35:30 +0200 Subject: [PATCH 517/791] [kf5globalaccel] Fix build on windows when x11 is around (#26564) --- ports/kf5globalaccel/portfile.cmake | 5 +++++ ports/kf5globalaccel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kf5globalaccel.json | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake index 8d60613e60cf89..3195ac291ea82f 100644 --- a/ports/kf5globalaccel/portfile.cmake +++ b/ports/kf5globalaccel/portfile.cmake @@ -9,10 +9,15 @@ vcpkg_from_github( # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") +if(NOT VCPKG_TARGET_IS_LINUX) + list(APPEND KGLOBALACCEL_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_X11=ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${KGLOBALACCEL_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json index 225fb6cfe58e89..53ec0ffeab30db 100644 --- a/ports/kf5globalaccel/vcpkg.json +++ b/ports/kf5globalaccel/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5globalaccel", "version": "5.89.0", - "port-version": 1, + "port-version": 2, "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 18b9734b114deb..3fb51015c68694 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3266,7 +3266,7 @@ }, "kf5globalaccel": { "baseline": "5.89.0", - "port-version": 1 + "port-version": 2 }, "kf5guiaddons": { "baseline": "5.89.0", diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json index 6c11cdcf714aed..f350738e9c389f 100644 --- a/versions/k-/kf5globalaccel.json +++ b/versions/k-/kf5globalaccel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "610034ef9764b5d45569588235e9a5838ae05757", + "version": "5.89.0", + "port-version": 2 + }, { "git-tree": "5a4dc9bc81874eec1192fa77b8a04ab67fb75239", "version": "5.89.0", From 5a3ca4c9d4fe4dca2e9143545e072a4a605de365 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Thu, 1 Sep 2022 17:19:44 +0100 Subject: [PATCH 518/791] [DPP] Update to 10.0.17 (#26614) * vcpkg dpp port built from our CI * fix missing dependency * update * Update Sun Jul 24 11:26:12 UTC 2022 * exclude uwp for dpp * Update Sun Jul 24 13:21:45 UTC 2022 * fix supports * fix supports * Update Sun Jul 24 14:14:29 UTC 2022 * Update Sun Jul 24 15:36:39 UTC 2022 * Update Mon Jul 25 12:04:56 UTC 2022 * * Add https:// to the homepage so that it is a valid URI. * Added usage. * Forced pkgconfig to be required rather than quiet. * Changed tabs to spaces in portfile.cmake. * Update Mon Aug 15 12:38:09 UTC 2022 * Update Mon Aug 15 13:08:33 UTC 2022 * Put back missing patches * Update portfile.cmake * fix breakage of wrapping * Update Mon Aug 15 13:59:12 UTC 2022 * fix up version file * fix newlines where they dont belong * update version * updtae version * update version * Update Wed Aug 31 16:35:42 UTC 2022 Co-authored-by: Billy O'Neal Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/dpp/portfile.cmake | 4 ++-- ports/dpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index dc50440d2209cd..15e38f5abd6c03 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP - REF 6e0e324dad8bf00b497d9340c0aa675b3e62f530 - SHA512 835f99e4bd092c7b60b299bf5de65ed6d10cc23743bdfa8c0ac93a66a224c7af1a0c30aedbac6b128d3db38bc5bfb8e12b314392ab3bf9ccc84a85c2a3fc12c1 + REF 3cddd4437f95482424e5cb7c55a46154fe35c47c + SHA512 ea12f9344dfdb1fc196f30623297d3df53b66a19bf0a0f1067d615c34deef2112f2656fa7030ca3a6dd266aacf13210a4b87f048223ed02c0c9ac73b552f4c11 HEAD_REF master PATCHES make-pkgconfig-required.patch diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 3dd8e81dcdd30d..b1758c0573b64b 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.16", + "version": "10.0.17", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3fb51015c68694..42b5aacd056b41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1981,7 +1981,7 @@ "port-version": 3 }, "dpp": { - "baseline": "10.0.16", + "baseline": "10.0.17", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index f5bb89a9fe81fc..766eae41d6f7a1 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aee1785670d15751e08e0fee3426faf2d8559ee9", + "version": "10.0.17", + "port-version": 0 + }, { "git-tree": "bf6a0accfbdf7a2a5f639ed5c32247e2a81b7b48", "version": "10.0.16", From 28098e75aeaf167a59080979888b0c64de4e10a1 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 1 Sep 2022 18:22:25 +0200 Subject: [PATCH 519/791] [fast-float] Update to 3.5.1 (#26615) * Update fast-float to 3.5.1 * Update CI baseline Co-authored-by: chausner --- ports/fast-float/portfile.cmake | 6 +++--- ports/fast-float/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fast-float.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/fast-float/portfile.cmake b/ports/fast-float/portfile.cmake index 267abb3a28c758..3478540344a43e 100644 --- a/ports/fast-float/portfile.cmake +++ b/ports/fast-float/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fastfloat/fast_float - REF v3.2.0 - SHA512 8c0819501f854688942bf2676a9592c537b14b472a942695d589a75499f43bef57a8cb98b41b285dcfc0122f804c85e477d5aee82750a69308bdbf16c98ce2a7 + REF v3.5.1 + SHA512 82f9a020167b3ba4e4583709164b4b28c2fabc7eb99a337f9cef7061eaa7479a51367420aeeb6578341038afe77f5656e8351518f062a04b02a08c2eacda7b46 HEAD_REF master ) @@ -12,7 +12,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME FastFloat CONFIG_PATH share/FastFloat) +vcpkg_cmake_config_fixup(PACKAGE_NAME FastFloat CONFIG_PATH share/cmake/FastFloat) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/fast-float/vcpkg.json b/ports/fast-float/vcpkg.json index b2155a266d9a73..5c7cd19b7e5640 100644 --- a/ports/fast-float/vcpkg.json +++ b/ports/fast-float/vcpkg.json @@ -1,8 +1,9 @@ { "name": "fast-float", - "version": "3.2.0", + "version": "3.5.1", "description": "Fast and exact implementation of the C++ from_chars functions for float and double types: 4x faster than strtod", "homepage": "https://github.com/fastfloat/fast_float", + "license": "Apache-2.0 OR MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 42b5aacd056b41..1d9424294af94a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2209,7 +2209,7 @@ "port-version": 1 }, "fast-float": { - "baseline": "3.2.0", + "baseline": "3.5.1", "port-version": 0 }, "fastcdr": { diff --git a/versions/f-/fast-float.json b/versions/f-/fast-float.json index 4097e5be9fdf8c..38b6380324e074 100644 --- a/versions/f-/fast-float.json +++ b/versions/f-/fast-float.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "166b1343d7e66bb8e6d29ba612620ae55f5a615e", + "version": "3.5.1", + "port-version": 0 + }, { "git-tree": "ff47650c46181763025a2149a7753a56c5c1c83c", "version": "3.2.0", From 5ace90c53049f39fccba94e9eb020780d165bae8 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Thu, 1 Sep 2022 11:25:11 -0500 Subject: [PATCH 520/791] [scripts] Set VCPKG_TARGET_BUNDLE_SUFFIX to .app for iOS to allow for tools building more cleanly (#26612) --- scripts/cmake/vcpkg_common_definitions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 0a1ef1a9690936..599cc088a1b8f5 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -63,7 +63,7 @@ else() set(VCPKG_HOST_BUNDLE_SUFFIX "") endif() -if(VCPKG_TARGET_IS_OSX) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(VCPKG_TARGET_BUNDLE_SUFFIX ".app") else() set(VCPKG_TARGET_BUNDLE_SUFFIX "") From 45ea75f385f08cb769a99fde026eeed43d449264 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 1 Sep 2022 11:54:13 -0700 Subject: [PATCH 521/791] Update vcpkg-tool to 2022-09-01 (#26626) https://github.com/microsoft/vcpkg-tool/releases/tag/2022-09-01 --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 15966cb7f94ca2..7351ee02107248 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-08-24' +$versionDate = '2022-09-01' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 12a9aecd184767..7f4af052a62207 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-08-24" +vcpkgToolReleaseTag="2022-09-01" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="5a5c7af982612d19a5bacf220a356e84a6be2058835e749279c0ac438ee22f23ca3b2e268d390f1b854a56d979b571a62b9cf812ff7087949205efa2988cc29e" + vcpkgToolReleaseSha="4e085a0d1a4722fbb728a835a907341947dcf4efe94789e191f20abb567cac0eafb30bde5c044175d655c30cc0439727951bdda8758cf3dab3cf91e3c08a4726" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="337ddbb19d8c94c67c7bb3a6b30c11e7cf585e95d2d09ea2b99d4fda8228e0ef2badc0559d2357da8931eb34c68ec807c959f8bbf9cd282b3d6167a8eb536dff" + vcpkgToolReleaseSha="fb02a9f3e5a53d5bb62d77c8851742981528d03985fec37d7c3dcfc200a93ee3be3b99294625c5bd764b205b85ef93f9ce0167b7e3767acc098b139b334cfb9f" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="6fc396b53bbe2aeecbd8f4e8a01b5d0fc1304eaa68d5552570de7c2f2176e44e6d5c5ca0ccfe76b50e6d954686c7ec0fc4bf679fd91143bf11952c470be4fde4" + vcpkgToolReleaseSha="be49480d951fc625b26e11d552f86a0635f3b63989814d9cd46c5d5eea4b62e31cfea19d7faf647105e0ca2af66dc6a82a3977c61334f4fe88334ac92b960c52" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="a1f934ead84bf5a0526aee05dfb34153313432d078ecfcf122cdd4b68fc06ccc3fe9935d5c94deb696c5678ed173c0b0e7f172b4a896144390171412bb45774d" + vcpkgToolReleaseSha="6546ecaa26191c005737a3c2c254dbad945b99334cc80ab81247e970214bc546a6ae002d5cb68eeffe8df009b6f6ce8459a0e658b12f4614aafaf852863ad298" fi # Do the download or build. From 4dacd997a589a9ed67a5d74ed580056ad0341775 Mon Sep 17 00:00:00 2001 From: Alex <93376818+sashashura@users.noreply.github.com> Date: Thu, 1 Sep 2022 22:36:51 +0200 Subject: [PATCH 522/791] GitHub Workflows security hardening (#26640) Signed-off-by: sashashura <93376818+sashashura@users.noreply.github.com> Signed-off-by: sashashura <93376818+sashashura@users.noreply.github.com> --- .github/workflows/trustedPR.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/trustedPR.yml b/.github/workflows/trustedPR.yml index c2d86049355e8a..ce17ba9d788254 100644 --- a/.github/workflows/trustedPR.yml +++ b/.github/workflows/trustedPR.yml @@ -8,8 +8,13 @@ on: types: - completed +permissions: + contents: read + jobs: comment: + permissions: + pull-requests: write runs-on: ubuntu-latest if: > ${{ github.event.workflow_run.event == 'pull_request' && From 9443e4b143645f9a08e182246977cd6374d97d92 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 2 Sep 2022 20:36:00 +0300 Subject: [PATCH 523/791] [bdwgc] Update to v8.2.2 (#26623) * Change REF from 5fab1a019 (v8.2.0-20211115) to v8.2.2 * Update version, reset port-version * Use https in homepage * Specify license --- ports/bdwgc/portfile.cmake | 4 ++-- ports/bdwgc/vcpkg.json | 6 +++--- versions/b-/bdwgc.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 3ddcc7d403b339..5273f7dbcb6be3 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/bdwgc - REF 5fab1a01931a1a6934ccf1d5eaa1e51f0a8dac4d # v8.2.0-20211115 - SHA512 b1a97aad10df33bb242985eb48f1bb2d3082d88f26c34014efce3d0f233bcd18a0f43f1bd960600ad9e22bcb19ebf04e573c74dfc1abfb771aa6b8525053c14b + REF v8.2.2 + SHA512 da6a2de30f096610ea1c0de1ff7a3ab434debaa39199bc1426daff620901fc76e5747e43171d742b17f4afa3c77ef447cba4fda69d76a711e108f3f03af917ca HEAD_REF master ) diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index 3186075256e9b5..eb669775e1dde1 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,9 +1,9 @@ { "name": "bdwgc", - "version": "8.2.0", - "port-version": 4, + "version": "8.2.2", "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", - "homepage": "http://www.hboehm.info/gc/", + "homepage": "https://www.hboehm.info/gc/", + "license": "MIT", "dependencies": [ "libatomic-ops", { diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 2ffa9205b22c32..6029dfc21fb14a 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f99370553e85e9f6a10878253cdee86883b0ff30", + "version": "8.2.2", + "port-version": 0 + }, { "git-tree": "8fe23b71dde5d4abc9a755c359a583b8d7ba3035", "version": "8.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1d9424294af94a..80ae90bad146fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -425,8 +425,8 @@ "port-version": 5 }, "bdwgc": { - "baseline": "8.2.0", - "port-version": 4 + "baseline": "8.2.2", + "port-version": 0 }, "beast": { "baseline": "0", From b2fabd08c672605f809ae842e30c8d4b2d9ad15d Mon Sep 17 00:00:00 2001 From: crisboarna Date: Fri, 2 Sep 2022 20:36:35 +0300 Subject: [PATCH 524/791] [libdatachannel] update version to 0.17.10 (#26629) * feat(libdatachannel): update to 0.17.10 * feat(libdatachannel): update to 0.17.10 port * feat(libdatachannel): update to 0.17.10 port 2 * feat(libdatachannel): update to 0.17.10 port 3 * feat(libdatachannel): update to 0.17.10 port 4 * feat(libdatachannel): update to 0.17.10 port 5 --- ports/libdatachannel/portfile.cmake | 4 ++-- ports/libdatachannel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 0c0cfb5d75e619..a81a4c1c870ea1 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF f8ac6955e3cd673ac23a2172cd7dc42fc013b7b3 #v0.17.9 - SHA512 3a8e3a47032a1fad770639c1bac266388c87046432cd44b391f146820cf3d3a871834e104deb9fb6fa901d6f82eba8aea0baa0b0eeb7cfb24808c408b020407b + REF 04cf4738961f55ba3f0aa39b4a61342f66bb3781 #v0.17.10 + SHA512 766650c091326b7fcca2627fa5957db303a1157f8d514cce07fc15f539152683919b29ea23a486e755915b8225d678648c05a2fb60a5d7f05786e4d93f1ff409 HEAD_REF master PATCHES ${PATCHES} diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 91c3ed175a9863..2fefee9e0af762 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.17.9", + "version-semver": "0.17.10", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 80ae90bad146fd..a68434cf6ec431 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3577,7 +3577,7 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.17.9", + "baseline": "0.17.10", "port-version": 0 }, "libdatrie": { diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 931bf410d42ff8..e9b3d954742c2c 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a0b138705a4ef7e8b7117c8674d018bf281335f", + "version-semver": "0.17.10", + "port-version": 0 + }, { "git-tree": "91ca5987e29fac6963c6ee8d6c4f91ecb621dd81", "version-semver": "0.17.9", From 04345f9fea58fe7f8c45928e38b6c2e01f701fea Mon Sep 17 00:00:00 2001 From: crisboarna Date: Fri, 2 Sep 2022 20:36:57 +0300 Subject: [PATCH 525/791] [libjuice] update version to 1.0.4 (#26631) * feat(libjuice): update to 1.0.4 * feat(libjuice): update to 1.0.4 port * feat(libjuice): update to 1.0.4 port 2 * feat(libjuice): update to 1.0.4 port 3 * feat(libjuice): update to 1.0.4 port 4 * feat(libjuice): update to 1.0.4 port 5 --- ports/libjuice/portfile.cmake | 4 ++-- ports/libjuice/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libjuice.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index 59413249f59170..6a80b4417a1c69 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF 89bc87dd526849dc786ad6e986ad70efc4e37382 #v1.0.3 - SHA512 5ea1e327d53d40482f27e1709a1669472a8b213208431396ea2c89829db82a989e17af03e655138dd5f2c4610d6ae862fbab66525cb7a61d13d6486fb7fd87ab + REF 06bbfe93ab344e95797220d89b55c7204c3ffa9d #v1.0.4 + SHA512 9768942cc9a2938a70a159914eabd548a38afb525806b6967dd73288ec32f390ab42b9146586160f98955a26162d350277058bc69bf2c2a60fffa03da79684e2 HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index 6b83db0c38fd84..f7c62f28a08158 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "1.0.3", + "version": "1.0.4", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index a68434cf6ec431..157b3d5fec6c73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3785,7 +3785,7 @@ "port-version": 0 }, "libjuice": { - "baseline": "1.0.3", + "baseline": "1.0.4", "port-version": 0 }, "libjxl": { diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 7681b9a2a3982a..d06ef902c9ece7 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e2a1fe37401f748f1437cee446e6b7e924de95d", + "version": "1.0.4", + "port-version": 0 + }, { "git-tree": "14dfa625a6a7c50182396dca9eae0ec9a38c01ab", "version": "1.0.3", From 6710068ea8b66a8cb12400a8164733ab77320f6b Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 3 Sep 2022 01:37:33 +0800 Subject: [PATCH 526/791] [octomap] update version to 1.9.6 (#26632) * [octomap] update version to 1.9.6 * update version --- ports/octomap/portfile.cmake | 21 ++++++++++----------- ports/octomap/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/o-/octomap.json | 5 +++++ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index 0730461b63ef3c..be17c875b5126f 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -3,16 +3,15 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OctoMap/octomap - REF v1.9.5 - SHA512 e58c6d33c351b14e9596e18a8702715d167c136fd029b1078ddd13a5926fe451d3b619231b5a8ccfb64b6e5fc6db8b57e6ef329099828d2f5195c0988700b581 + REF c4a4304895f6cfc31723dc95df252fe7e756a0ef # v1.9.6 + SHA512 ec321a5355091acbd3d3fda7c858e2078c29195e73461c8a34db2c4614c6b2e38b35a59671f1071f7eb397cac4df78869f14a13af2e68d64e5a2e2d8727846cd HEAD_REF master PATCHES "001-fix-exported-targets.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF @@ -20,26 +19,26 @@ vcpkg_configure_cmake( -DBUILD_DYNAMICETD3D_SUBPROJECT=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_tools( TOOL_NAMES binvox2bt bt2vrml compare_octrees convert_octree edit_octree eval_octree_accuracy graph2tree log2graph AUTO_CLEAN) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/octomap") # Handle copyright -file(INSTALL ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/octomap/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/octomap/vcpkg.json b/ports/octomap/vcpkg.json index a68ad430a6bc0f..7409ae814629b3 100644 --- a/ports/octomap/vcpkg.json +++ b/ports/octomap/vcpkg.json @@ -1,7 +1,17 @@ { "name": "octomap", - "version-string": "1.9.5", - "port-version": 2, + "version": "1.9.6", "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", - "homepage": "https://octomap.github.io/" + "homepage": "https://octomap.github.io/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 157b3d5fec6c73..fa24dcb47ee750 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5157,8 +5157,8 @@ "port-version": 2 }, "octomap": { - "baseline": "1.9.5", - "port-version": 2 + "baseline": "1.9.6", + "port-version": 0 }, "ode": { "baseline": "0.16.1", diff --git a/versions/o-/octomap.json b/versions/o-/octomap.json index 59c664cca449b2..b126608577332c 100644 --- a/versions/o-/octomap.json +++ b/versions/o-/octomap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6146ecee8dcf9ba6573d11f26c1574e89c546d8", + "version": "1.9.6", + "port-version": 0 + }, { "git-tree": "7b192c5e8bc138bffe383afcadf8bc91a0130d58", "version-string": "1.9.5", From 7b075bcc3bfb17c800937d2555ccac18f655ea58 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 2 Sep 2022 13:38:00 -0400 Subject: [PATCH 527/791] [azure-core-cpp] Update to 1.7.2 (#26642) ## 1.7.2 (2022-09-01) ### Bugs Fixed - WinHTTP Transport Adapter: Fixed missing reason phrase handling for HTTP/2 responses. --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 96f2864effb0fa..d93acdb584694a 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.7.1 - SHA512 3aeaf10ee319db1afcac7b6aa33534e7f7517738af987588be2108ef2ffe8f5c3615239669a46b4b6967c9cf82b2bc0aa92d16af99be536c2395150ccca43866 + REF azure-core_1.7.2 + SHA512 f24d02bf34f8be665e08a9a2799498f78daf6103a0ac5c10d79dc6b7b4461dac8ea2f91088e11bc90d0c74b59a59dc1e6361ad053718fb6da6a0691a9ac314a6 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index fbfc13409e2ef9..99bb86d24a217d 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.7.1", + "version-semver": "1.7.2", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index b355c9fbda1299..d4fefb60170048 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c0aaa2cef20a29b4e141758ed3fcce954449d1b", + "version-semver": "1.7.2", + "port-version": 0 + }, { "git-tree": "e17b1885416ae07365e86acec91312d7318cc305", "version-semver": "1.7.1", diff --git a/versions/baseline.json b/versions/baseline.json index fa24dcb47ee750..da192ee87a933b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -329,7 +329,7 @@ "port-version": 3 }, "azure-core-cpp": { - "baseline": "1.7.1", + "baseline": "1.7.2", "port-version": 0 }, "azure-core-tracing-opentelemetry-cpp": { From 8e67c580568ddedf2b7279dc68556652d4c95ca1 Mon Sep 17 00:00:00 2001 From: Jianshen Liu <468515+ljishen@users.noreply.github.com> Date: Fri, 2 Sep 2022 10:38:41 -0700 Subject: [PATCH 528/791] [dpdk] Update to v22.07 (#26643) --- ports/dpdk/portfile.cmake | 2 +- ports/dpdk/vcpkg.json | 11 ++--------- versions/baseline.json | 4 ++-- versions/d-/dpdk.json | 5 +++++ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ports/dpdk/portfile.cmake b/ports/dpdk/portfile.cmake index 736cb4eb004800..bc690c2bead87e 100644 --- a/ports/dpdk/portfile.cmake +++ b/ports/dpdk/portfile.cmake @@ -24,7 +24,7 @@ if(VCPKG_TARGET_IS_LINUX) endif() endif() -set(PORT_VERSION 22.03) +set(PORT_VERSION 22.07) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DPDK/dpdk diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json index 7a7acd549250ed..76407147d8c1e1 100644 --- a/ports/dpdk/vcpkg.json +++ b/ports/dpdk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dpdk", - "version-string": "22.03", - "port-version": 3, + "version-string": "22.07", "description": "A set of libraries and drivers for fast packet processing", "homepage": "https://www.dpdk.org/", "documentation": "https://doc.dpdk.org/guides/index.html", @@ -34,13 +33,7 @@ "description": "Build and install kernel modules" }, "tests": { - "description": "Build and install tests", - "dependencies": [ - { - "name": "libarchive", - "default-features": false - } - ] + "description": "Build and install tests" }, "trace": { "description": "Build with fast path traces enabled" diff --git a/versions/baseline.json b/versions/baseline.json index da192ee87a933b..9bf10497e413f9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1977,8 +1977,8 @@ "port-version": 0 }, "dpdk": { - "baseline": "22.03", - "port-version": 3 + "baseline": "22.07", + "port-version": 0 }, "dpp": { "baseline": "10.0.17", diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json index aab7eff1e3f546..1799a6e0b06645 100644 --- a/versions/d-/dpdk.json +++ b/versions/d-/dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f09ca3077d7bc3f4ceaf558cdb9518ab94cbbe18", + "version-string": "22.07", + "port-version": 0 + }, { "git-tree": "b097f29e77f314135bad880b342548826bb99108", "version-string": "22.03", From c506e9c4ecc48655bd8ac961cb53f6ec28e19937 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 2 Sep 2022 10:39:08 -0700 Subject: [PATCH 529/791] [influxdb-cxx] Update to latest commit on 2022-08-20 (#26650) * [influxdb-cxx] Update to latest commit on 2022-08-20 * x-add-version * add license * x-add-version --- ports/influxdb-cxx/include-stringview.patch | 12 ------------ ports/influxdb-cxx/portfile.cmake | 5 ++--- ports/influxdb-cxx/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/i-/influxdb-cxx.json | 5 +++++ 5 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 ports/influxdb-cxx/include-stringview.patch diff --git a/ports/influxdb-cxx/include-stringview.patch b/ports/influxdb-cxx/include-stringview.patch deleted file mode 100644 index a44563506e3230..00000000000000 --- a/ports/influxdb-cxx/include-stringview.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/Point.cxx b/src/Point.cxx -index 8f7fc10..95b119e 100644 ---- a/src/Point.cxx -+++ b/src/Point.cxx -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - namespace influxdb - { diff --git a/ports/influxdb-cxx/portfile.cmake b/ports/influxdb-cxx/portfile.cmake index 5498788ecd268f..41c61daf9aa447 100644 --- a/ports/influxdb-cxx/portfile.cmake +++ b/ports/influxdb-cxx/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO offa/influxdb-cxx - REF v0.6.7 - SHA512 4e871c6d06c94b24b45aeedb7c74c75aed17332fbde76fc1e6c2ad06aeb41e268a95f4cab1c12c4402765c11811feb84bf48d60b138717c485327848782e402c + REF 141ef6c3f9ee933262a35abe3ac5900da821078a #Commit on 2022-08-20 + SHA512 d19a7dfd410375a47e5fcb425045732878b09ec6b5eb01740696d57064c739cebcf4a4141c8f592d0c985f10cd8b05c538cef32193cb7226d74bc3462754b8fa HEAD_REF master - PATCHES include-stringview.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index 1666fc558cf58b..cb5377dbe3521b 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "influxdb-cxx", - "version": "0.6.7", - "port-version": 1, + "version-date": "2022-09-02", "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", + "license": "MIT", "dependencies": [ "curl", { diff --git a/versions/baseline.json b/versions/baseline.json index 9bf10497e413f9..7a77a09a91cd33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3033,8 +3033,8 @@ "port-version": 0 }, "influxdb-cxx": { - "baseline": "0.6.7", - "port-version": 1 + "baseline": "2022-09-02", + "port-version": 0 }, "infoware": { "baseline": "2021-06-16", diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index 310b08ecbdf2af..0318e65bea9907 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eba82142d2afb448bc5295fe22e0849cd0f8ca7", + "version-date": "2022-09-02", + "port-version": 0 + }, { "git-tree": "9403a6547a2dbd42b86d686c2ecd7a3e7344f13a", "version": "0.6.7", From 31d77f607b1298d4db79aa5f00abdaa25fe01fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Fri, 2 Sep 2022 19:40:12 +0200 Subject: [PATCH 530/791] [outcome] Update to version 2.2.3 (#25855) * [outcome] Update to version 2.2.3 * [outcome] Add license information * [outcome] Refactor deprecated functions * [status-code] Update to latest version compatible with outcome 2.2.3 * [outcome] Provide polyfill features and extract status-code * [outcome] Remove msvc linkage patch * [llfio] Teach port about outcome polyfills * [llfio] Fix vendored status-code include path * [outcome][status-code][llfio] update version database * Don't switch C++ standard version on polyfill feature * [outcome] Fix version entry Co-authored-by: JackBoosY --- .../fix-vendored-status-code-include.patch | 16 ++++++ ports/llfio/portfile.cmake | 1 + ports/llfio/vcpkg.json | 16 +++++- ports/outcome/fix-find-library.patch | 41 ++++++++++++++++ ports/outcome/fix-status-code-include.patch | 16 ++++++ ports/outcome/outcome-prune-sources.patch | 12 ----- ports/outcome/portfile.cmake | 49 +++++++------------ ports/outcome/vcpkg.json | 44 ++++++++++++++++- ports/status-code/no-target-sources.patch | 12 +++++ ports/status-code/portfile.cmake | 13 ++--- ports/status-code/vcpkg.json | 16 ++++-- versions/baseline.json | 8 +-- versions/l-/llfio.json | 5 ++ versions/o-/outcome.json | 5 ++ versions/s-/status-code.json | 5 ++ 15 files changed, 200 insertions(+), 59 deletions(-) create mode 100644 ports/llfio/fix-vendored-status-code-include.patch create mode 100644 ports/outcome/fix-find-library.patch create mode 100644 ports/outcome/fix-status-code-include.patch delete mode 100644 ports/outcome/outcome-prune-sources.patch create mode 100644 ports/status-code/no-target-sources.patch diff --git a/ports/llfio/fix-vendored-status-code-include.patch b/ports/llfio/fix-vendored-status-code-include.patch new file mode 100644 index 00000000000000..381b9143be561d --- /dev/null +++ b/ports/llfio/fix-vendored-status-code-include.patch @@ -0,0 +1,16 @@ +diff --git a/include/llfio/v2.0/status_code.hpp b/include/llfio/v2.0/status_code.hpp +index 03eb0f67..0c3f5e41 100644 +--- a/include/llfio/v2.0/status_code.hpp ++++ b/include/llfio/v2.0/status_code.hpp +@@ -57,7 +57,11 @@ as that (a) enables safe header only LLFIO on Windows (b) produces better codege + #include "outcome/try.hpp" + // Bring in status code utility + #include "outcome/experimental/coroutine_support.hpp" ++#if 0 + #include "outcome/experimental/status-code/include/system_code_from_exception.hpp" ++#else ++#include ++#endif + #if !defined(LLFIO_ENABLE_COROUTINES) && defined(OUTCOME_FOUND_COROUTINE_HEADER) + #define LLFIO_ENABLE_COROUTINES 1 + #endif diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index b8b45822e8a2eb..0f9674fb032960 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( # https://github.com/ned14/llfio/issues/83 # To be removed on next update issue-83-fix-backport.patch + fix-vendored-status-code-include.patch ) vcpkg_from_github( diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 2ddcfa81036a8c..6856dc814836fa 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "llfio", "version": "2.0-20220112", - "port-version": 2, + "port-version": 3, "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", "license": "Apache-2.0 OR BSL-1.0", @@ -34,6 +34,13 @@ "features": [ "polyfill-cxx17" ] + }, + { + "name": "outcome", + "default-features": false, + "features": [ + "polyfill-cxx17" + ] } ] }, @@ -46,6 +53,13 @@ "features": [ "polyfill-cxx20" ] + }, + { + "name": "outcome", + "default-features": false, + "features": [ + "polyfill-cxx20" + ] } ] }, diff --git a/ports/outcome/fix-find-library.patch b/ports/outcome/fix-find-library.patch new file mode 100644 index 00000000000000..5d7f22b8b7dd80 --- /dev/null +++ b/ports/outcome/fix-find-library.patch @@ -0,0 +1,41 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a292728cf4..5286b5e366 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,17 +40,6 @@ include(QuickCppLibRequireOutOfSourceBuild) + include(QuickCppLibUtils) + include(QuickCppLibPolicies) + +-if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE) +- ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git") +-else() +- find_quickcpplib_library(status-code +- GIT_REPOSITORY "https://github.com/ned14/status-code.git" +- GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}" +- REQUIRED +- IS_HEADER_ONLY +- ) +-endif() +- + # Parse the version we tell cmake directly from the version header file + ParseProjectVersionFromHpp("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/detail/version.hpp" VERSIONSTRING) + # Sets the usual PROJECT_NAME etc +@@ -99,8 +88,16 @@ else() + IS_HEADER_ONLY + ) + endif() +-if (NOT OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE) +- list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX /status-code/include/) ++if(OUTCOME_BUNDLE_EMBEDDED_STATUS_CODE) ++ ensure_git_subrepo("${CMAKE_CURRENT_SOURCE_DIR}/include/outcome/experimental/status-code/include" "https://github.com/ned14/status-code.git") ++else() ++ find_quickcpplib_library(status-code ++ GIT_REPOSITORY "https://github.com/ned14/status-code.git" ++ GIT_TAG "${OUTCOME_DEPENDENCY_STATUS_CODE_GIT_TAG}" ++ REQUIRED ++ IS_HEADER_ONLY ++ ) ++ list_filter(${PROJECT_NAME}_HEADERS EXCLUDE REGEX include/outcome/experimental/status-code/) + endif() + + # Make an interface only library so dependent CMakeLists can bring in this header-only library diff --git a/ports/outcome/fix-status-code-include.patch b/ports/outcome/fix-status-code-include.patch new file mode 100644 index 00000000000000..1b601054a95ead --- /dev/null +++ b/ports/outcome/fix-status-code-include.patch @@ -0,0 +1,16 @@ +diff --git a/include/outcome/experimental/coroutine_support.hpp b/include/outcome/experimental/coroutine_support.hpp +index 21759ede58..6c4b152294 100644 +--- a/include/outcome/experimental/coroutine_support.hpp ++++ b/include/outcome/experimental/coroutine_support.hpp +@@ -45,7 +45,11 @@ Distributed under the Boost Software License, Version 1.0. + OUTCOME_V2_NAMESPACE_END + + #ifdef __cpp_exceptions ++#if 0 + #include "status-code/include/system_code_from_exception.hpp" ++#else ++#include ++#endif + OUTCOME_V2_NAMESPACE_BEGIN + namespace awaitables + { diff --git a/ports/outcome/outcome-prune-sources.patch b/ports/outcome/outcome-prune-sources.patch deleted file mode 100644 index 59c5db01a50f2b..00000000000000 --- a/ports/outcome/outcome-prune-sources.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git "a/cmake/headers.cmake" "b/cmake/headers.cmake" -index 108038d16..bf4807e16 100644 ---- "a/cmake/headers.cmake" -+++ "b/cmake/headers.cmake" -@@ -47,7 +47,6 @@ set(outcome_HEADERS - "include/outcome/experimental/status-code/include/system_code_from_exception.hpp" - "include/outcome/experimental/status-code/include/system_error2.hpp" - "include/outcome/experimental/status-code/include/win32_code.hpp" -- "include/outcome/experimental/status-code/single-header/system_error2.hpp" - "include/outcome/experimental/status_outcome.hpp" - "include/outcome/experimental/status_result.hpp" - "include/outcome/iostream_support.hpp" diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index a031a77b03a162..573b028e0c1ef4 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -15,61 +15,48 @@ # the exact copy of those third party libraries known to # have passed Outcome's CI process. -message(WARNING [=[ -Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's and Outcome's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. -]=]) +if ("polyfill-cxx20" IN_LIST FEATURES) + message(WARNING [=[ + Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byte-lite, rather than the versions tested by QuickCppLib's and Outcome's CI. It is not guaranteed to work with other versions, with failures experienced in the past up-to-and-including runtime crashes. See the warning message from QuickCppLib for how you can pin the versions of those dependencies in your manifest file to those with which QuickCppLib was tested. Do not report issues to upstream without first pinning the versions as QuickCppLib was tested against. + ]=]) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF 9c6ad6e8e6a48ddde65c0617e3df306bc901b41d - SHA512 b53807fdf9ac3647882f2029a7c5311e7f313abaec703142d2c6d4e73651898d868bfdd600e5f2fa3344e91ebb576324b4624ccf4aa8e09314b7a7ede4cb0fbc + REF 147ec1e8673c34cb7cf431dfdbf211d8072d7656 + SHA512 139723be3618b9f3c26c7da6fa5682e6810fc93192bd8752fb7a39378fa1bee8c14b8077d30f71852995bc323dd7beb6676635991995577797b054913cb10231 HEAD_REF develop PATCHES - outcome-prune-sources.patch + fix-find-library.patch + fix-status-code-include.patch ) -# Outcome needs a copy of QuickCppLib with which to bootstrap its cmake -file(COPY "${CURRENT_INSTALLED_DIR}/include/quickcpplib" - DESTINATION "${SOURCE_PATH}/quickcpplib/repo/include/" -) -file(COPY "${CURRENT_INSTALLED_DIR}/share/ned14-internal-quickcpplib/" - DESTINATION "${SOURCE_PATH}/quickcpplib/repo/" -) - -# Outcome expects status-code to live inside its include directory -file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/" - DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/" -) -file(COPY "${CURRENT_INSTALLED_DIR}/include/status-code/detail/" - DESTINATION "${SOURCE_PATH}/include/outcome/experimental/status-code/include/detail/" -) +set(extra_config) # Because outcome's deployed files are header-only, the debug build is not necessary set(VCPKG_BUILD_TYPE release) -# Already installed dependencies don't appear on the include path, which Outcome assumes. -string(APPEND VCPKG_CXX_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") -string(APPEND VCPKG_C_FLAGS " \"-I${CURRENT_INSTALLED_DIR}/include\"") - # Use Outcome's own build process, skipping examples and tests. -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On - -Dquickcpplib_FOUND=1 + -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib + -DOUTCOME_BUNDLE_EMBEDDED_STATUS_CODE=OFF + -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + ${extra_config} ) if("run-tests" IN_LIST FEATURES) - vcpkg_build_cmake(TARGET test) + vcpkg_cmake_build(TARGET test) endif() -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/outcome) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/outcome) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index eb8b45aa372a94..1f4f2fe98a4ffd 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,14 +1,54 @@ { "name": "outcome", - "version-string": "2.2.2-20211208", + "version": "2.2.3", "description": "Provides very lightweight outcome and result (non-Boost edition)", "homepage": "https://github.com/ned14/outcome", + "license": "Apache-2.0 OR BSL-1.0", "supports": "!uwp", "dependencies": [ "ned14-internal-quickcpplib", - "status-code" + "status-code", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { + "polyfill-cxx17": { + "description": "Polyfill C++17 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "polyfill-cxx17" + ] + }, + { + "name": "outcome", + "default-features": false, + "features": [ + "polyfill-cxx20" + ] + } + ] + }, + "polyfill-cxx20": { + "description": "Polyfill C++20 entities", + "dependencies": [ + { + "name": "ned14-internal-quickcpplib", + "default-features": false, + "features": [ + "polyfill-cxx20" + ] + } + ] + }, "run-tests": { "description": "Build and run the dependency validation tests" } diff --git a/ports/status-code/no-target-sources.patch b/ports/status-code/no-target-sources.patch new file mode 100644 index 00000000000000..38527094f7b617 --- /dev/null +++ b/ports/status-code/no-target-sources.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cf3e8c1..aa380ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -108,7 +108,6 @@ foreach(source + ) + target_sources(status-code INTERFACE + "$" +- "$" + ) + get_filename_component(dir ${source} DIRECTORY) + install(FILES "${source}" diff --git a/ports/status-code/portfile.cmake b/ports/status-code/portfile.cmake index a7bf19e776ba2c..5530f0bfe4ef91 100644 --- a/ports/status-code/portfile.cmake +++ b/ports/status-code/portfile.cmake @@ -1,24 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/status-code - REF 0cca391ad9168581641b569e031f25c7ee1673b3 - SHA512 5fdf3e268d0a4a388202547ceac271832642648fdc50824a8f26d86bad1d45c93394ff6651e50232dde534e057dfadaf7a7436b893dd7b182a75bcd57e24fc9d + REF 60ec9e46916e5170051293e7925729ba88951934 + SHA512 f7a9448419f8e9228cd29c3b2e9268712de985675acea3b51f742ce88e524e7f51ccea7e08c89bf4e6d38eb1131416af052192531c168eed1f45e7eeda20fed6 HEAD_REF master + PATCHES + no-target-sources.patch # see https://github.com/ned14/status-code/issues/43 ) # Because status-code's deployed files are header-only, the debug build is not necessary set(VCPKG_BUILD_TYPE release) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DPROJECT_IS_DEPENDENCY=On ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/status-code) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/status-code) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") diff --git a/ports/status-code/vcpkg.json b/ports/status-code/vcpkg.json index 93b58daceb751e..d76b0280a18c76 100644 --- a/ports/status-code/vcpkg.json +++ b/ports/status-code/vcpkg.json @@ -1,7 +1,17 @@ { "name": "status-code", - "version-string": "1.0.0-20211208", - "port-version": 1, + "version-string": "1.0.0-20220104", "description": "Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028).", - "homepage": "https://github.com/ned14/status-code" + "homepage": "https://github.com/ned14/status-code", + "license": "Apache-2.0 OR BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7a77a09a91cd33..5d1d43e23654ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4390,7 +4390,7 @@ }, "llfio": { "baseline": "2.0-20220112", - "port-version": 2 + "port-version": 3 }, "llgl": { "baseline": "2019-08-15", @@ -5433,7 +5433,7 @@ "port-version": 1 }, "outcome": { - "baseline": "2.2.2-20211208", + "baseline": "2.2.3", "port-version": 0 }, "p-ranav-csv": { @@ -6977,8 +6977,8 @@ "port-version": 1 }, "status-code": { - "baseline": "1.0.0-20211208", - "port-version": 1 + "baseline": "1.0.0-20220104", + "port-version": 0 }, "status-value-lite": { "baseline": "1.1.0", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index 45d6ee4b2c8f96..e9831a037feb51 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6959e579906ce5c4ea9aa59f467499dce49a3b6", + "version": "2.0-20220112", + "port-version": 3 + }, { "git-tree": "c3d2d8d9dfddbbf74af7e1f603ac18e4aee2fe7a", "version": "2.0-20220112", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 269477e3ea7694..55d1d3735d79e5 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "527591e7e0e55bc20c74cdc5553c08635b350999", + "version": "2.2.3", + "port-version": 0 + }, { "git-tree": "2abc0cf7913b6db02a17f3b01f6e5744bd43a9ae", "version-string": "2.2.2-20211208", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json index ab25f04dc48b08..24f644bba72ccb 100644 --- a/versions/s-/status-code.json +++ b/versions/s-/status-code.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acf45fde7be9ba87dd72d79d3d8f79bc639e8530", + "version-string": "1.0.0-20220104", + "port-version": 0 + }, { "git-tree": "c71af3efa61ec9c5bbb91287b610bcc561e95a47", "version-string": "1.0.0-20211208", From 0a4f1db580a083e72738d3fffff669f36ffc6b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 2 Sep 2022 19:41:49 +0200 Subject: [PATCH 531/791] [catch2] Update to 3.1.0 (#25874) * [catch2] Update to 3.1.0 * [catch2] Update version files * [catch2] Fix dll intallation paths * [catch2] Update version files * [catch2] Fix UWP build failure * [catch2] Update version files --- ports/catch2/fix-install-path.patch | 17 +++++++++++---- ports/catch2/fix-uwp-build.patch | 34 +++++++++++++++++++++++++++++ ports/catch2/portfile.cmake | 5 +++-- ports/catch2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/catch2.json | 5 +++++ 6 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 ports/catch2/fix-uwp-build.patch diff --git a/ports/catch2/fix-install-path.patch b/ports/catch2/fix-install-path.patch index fc90c57cc656af..5813ffe81c9d55 100644 --- a/ports/catch2/fix-install-path.patch +++ b/ports/catch2/fix-install-path.patch @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -168,7 +168,7 @@ +@@ -170,7 +170,7 @@ ## Provide some pkg-config integration set(PKGCONFIG_INSTALL_DIR @@ -13,15 +13,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -335,12 +335,20 @@ +@@ -356,12 +356,28 @@ install( TARGETS Catch2 - Catch2WithMain EXPORT Catch2Targets - DESTINATION +- DESTINATION ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ++ ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ++ ${CMAKE_INSTALL_BINDIR} ) + + install( @@ -29,8 +34,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt + Catch2WithMain + EXPORT + Catch2Targets -+ DESTINATION ++ LIBRARY DESTINATION + ${CMAKE_INSTALL_LIBDIR}/manual-link ++ ARCHIVE DESTINATION ++ ${CMAKE_INSTALL_LIBDIR}/manual-link ++ RUNTIME DESTINATION ++ ${CMAKE_INSTALL_BINDIR} + ) diff --git a/ports/catch2/fix-uwp-build.patch b/ports/catch2/fix-uwp-build.patch new file mode 100644 index 00000000000000..feee34cfbae09b --- /dev/null +++ b/ports/catch2/fix-uwp-build.patch @@ -0,0 +1,34 @@ +diff --git a/src/catch2/catch_config.cpp b/src/catch2/catch_config.cpp +index 4465831d..7555a21f 100644 +--- a/src/catch2/catch_config.cpp ++++ b/src/catch2/catch_config.cpp +@@ -26,7 +26,12 @@ namespace { + # pragma warning( disable : 4996 ) + # endif + ++# if defined( WINAPI_FAMILY ) ++ // UWP doesn't support environment variables. ++ return false; ++# else + return std::getenv( "BAZEL_TEST" ) != nullptr; ++# endif + + # if defined( _MSC_VER ) + # pragma warning( pop ) +@@ -81,6 +86,8 @@ namespace Catch { + } ); + } + ++#if !defined( WINAPI_FAMILY ) ++ // UWP doesn't support environment variables. + if(provideBazelReporterOutput()){ + // Register a JUnit reporter for Bazel. Bazel sets an environment + // variable with the path to XML output. If this file is written to +@@ -102,6 +109,7 @@ namespace Catch { + { "junit", std::string( bazelOutputFilePtr ), {}, {} } ); + } + } ++#endif + + + // We now fixup the reporter specs to handle default output spec, diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 300e5dca684a1a..3cccd9e2d6e4c4 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF v3.0.1 - SHA512 065094c19cdf98b40f96a390e887542f895495562a91cdc28d68ce03690866d846ec87d320405312a2b97eacaa5351d3e55f0012bb9de40073c8d4444d82b0a1 + REF v3.1.0 + SHA512 49e5339263190a6ef15284ef2dcc9e727ce0659cb750d4078024ccf6c6f339740a3a662273718ea73adfbc5928c3ef7268175ebda5ee9ec97ca58fed98747b44 HEAD_REF devel PATCHES fix-install-path.patch + fix-uwp-build.patch ) vcpkg_cmake_configure( diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index afeed72f580d71..d714616b2688b2 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "catch2", - "version-semver": "3.0.1", - "port-version": 2, + "version-semver": "3.1.0", "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5d1d43e23654ea..e9290e2dfe1e35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1297,8 +1297,8 @@ "port-version": 1 }, "catch2": { - "baseline": "3.0.1", - "port-version": 2 + "baseline": "3.1.0", + "port-version": 0 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 4cfa4561a2a064..2128ee1aafbe35 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "414a5ef901a6f05c85b4f19ff2d0d216933a65b1", + "version-semver": "3.1.0", + "port-version": 0 + }, { "git-tree": "1c528318ebe10c945563bf9942c8b2141253bf87", "version-semver": "3.0.1", From 1f7e50198e968c90901df5b9974f01cacab15687 Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 2 Sep 2022 12:44:50 -0500 Subject: [PATCH 532/791] [openexr] use vcpkg_copy_tools to fix iOS build issue (#26641) * [openexr] use vcpkg_copy_tools instead of manual rename/remove * Allows for building on iOS without errors * ./vcpkg x-add-version --all --- ports/openexr/portfile.cmake | 24 ++++-------------------- ports/openexr/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/openexr.json | 5 +++++ 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index b5a4edf552ce95..bddacbd57b874b 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -26,26 +26,10 @@ vcpkg_cmake_config_fixup() vcpkg_cmake_config_fixup(PACKAGE_NAME ilmbase CONFIG_PATH share/ilmbase) vcpkg_fixup_pkgconfig() -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX}) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openexr/) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmakepreview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmaketiled${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultipart${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrmultiview${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exrstdattr${VCPKG_HOST_EXECUTABLE_SUFFIX}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/openexr/exr2aces${VCPKG_HOST_EXECUTABLE_SUFFIX}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/openexr) - +vcpkg_copy_tools( + TOOL_NAMES exrenvmap exrheader exrmakepreview exrmaketiled exrmultipart exrmultiview exrstdattr exr2aces + AUTO_CLEAN +) vcpkg_copy_pdbs() if (VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_LIBRARY_LINKAGE STREQUAL static) diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index d75f02dd48386c..ea43e1b687ff23 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openexr", "version": "2.5.8", + "port-version": 1, "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e9290e2dfe1e35..561d129c210691 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5282,7 +5282,7 @@ }, "openexr": { "baseline": "2.5.8", - "port-version": 0 + "port-version": 1 }, "opengl": { "baseline": "2022-03-14", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index 80ae86c3c22541..f557cf9e4b12dc 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "447c9eae823d9570dfc549995efba4f623ddaae2", + "version": "2.5.8", + "port-version": 1 + }, { "git-tree": "1c4594196b46cfaa3d93cd5aff01060acab0ba9f", "version": "2.5.8", From 369f642fa04316bff9825efd370f02c7fd2da045 Mon Sep 17 00:00:00 2001 From: David Garske Date: Fri, 2 Sep 2022 10:46:35 -0700 Subject: [PATCH 533/791] Update to wolfSSL v5.5.0, wolfMQTT v1.14.1, wolfTPM v2.6.0 (#26620) * Update to wolfSSLv5.5.0. * Update to wolfMQTT v1.14.1 * Update to wolfTPM v2.6.0. Add wolfSSL build options for custom OID's in CSR. --- ports/wolfmqtt/portfile.cmake | 5 +-- ports/wolfmqtt/vcpkg.json | 2 +- ports/wolfmqtt/wolfmqtt_pr305.diff | 55 ------------------------ ports/wolfssl/portfile.cmake | 8 ++-- ports/wolfssl/vcpkg.json | 2 +- ports/wolfssl/wolfssl_pr5401.diff | 17 -------- ports/wolfssl/wolfssl_pr5529.diff | 68 ++++++++++++++++++++++++++++++ ports/wolftpm/portfile.cmake | 5 +-- ports/wolftpm/vcpkg.json | 2 +- ports/wolftpm/wolftpm_pr235.diff | 30 ------------- versions/baseline.json | 6 +-- versions/w-/wolfmqtt.json | 5 +++ versions/w-/wolfssl.json | 5 +++ versions/w-/wolftpm.json | 5 +++ 14 files changed, 97 insertions(+), 118 deletions(-) delete mode 100644 ports/wolfmqtt/wolfmqtt_pr305.diff delete mode 100644 ports/wolfssl/wolfssl_pr5401.diff create mode 100644 ports/wolfssl/wolfssl_pr5529.diff delete mode 100644 ports/wolftpm/wolftpm_pr235.diff diff --git a/ports/wolfmqtt/portfile.cmake b/ports/wolfmqtt/portfile.cmake index 50c04a2cb75040..515a81462c05c3 100644 --- a/ports/wolfmqtt/portfile.cmake +++ b/ports/wolfmqtt/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfmqtt - REF v1.14.0 - SHA512 9449d87c543e823b3517a4605343a92207499812e75c950a2e8fb3d969333d39579dac69657e298826ba65017a8208c28934d7c6a4abbb4bf308514047273191 + REF v1.14.1 + SHA512 ea7657e1c5045996c24bf479fc0c2db7d7d3f588e998d4d236f9d5d43564f80a1fa8ec0710bf87d7b785ffb29d96d539e5b7e7bea5574f0c3843dc00062dbb11 HEAD_REF master PATCHES - wolfmqtt_pr305.diff ) vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/wolfmqtt/vcpkg.json b/ports/wolfmqtt/vcpkg.json index b484d91f04beec..f6f393ac32af0c 100644 --- a/ports/wolfmqtt/vcpkg.json +++ b/ports/wolfmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wolfmqtt", - "version": "1.14.0", + "version": "1.14.1", "description": "MQTT library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wolfmqtt/wolfmqtt_pr305.diff b/ports/wolfmqtt/wolfmqtt_pr305.diff deleted file mode 100644 index 76912c7f903cc8..00000000000000 --- a/ports/wolfmqtt/wolfmqtt_pr305.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d5f0f408..a436f51c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,6 +94,11 @@ target_compile_definitions(wolfmqtt PRIVATE - "BUILDING_WOLFMQTT" - ) - -+ # Tell mqtt_types.h we are using a ./configure like output / options.h -+target_compile_definitions(wolfmqtt PRIVATE -+ "BUILDING_CMAKE" -+ ) -+ - #TODO generate options file - configure_file(wolfmqtt/options.h.in wolfmqtt/options.h) - -diff --git a/wolfmqtt/mqtt_types.h b/wolfmqtt/mqtt_types.h -index f8e8f4d7..f7e33280 100644 ---- a/wolfmqtt/mqtt_types.h -+++ b/wolfmqtt/mqtt_types.h -@@ -65,7 +65,8 @@ - #endif - - #ifdef ENABLE_MQTT_TLS -- #if !defined(WOLFSSL_USER_SETTINGS) && !defined(USE_WINDOWS_API) -+ #if !defined(WOLFSSL_USER_SETTINGS) && \ -+ (!defined(USE_WINDOWS_API) || defined(BUILDING_CMAKE)) - #include - #endif - #include -diff --git a/wolfmqtt/vs_settings.h b/wolfmqtt/vs_settings.h -index a385c4e0..9d8231a0 100644 ---- a/wolfmqtt/vs_settings.h -+++ b/wolfmqtt/vs_settings.h -@@ -4,8 +4,9 @@ - #ifndef _WOLFMQTT_VS_SETTINGS_ - #define _WOLFMQTT_VS_SETTINGS_ - --/* Don't include this if using autoconf cross-compile */ --#ifndef HAVE_CONFIG_H -+/* Don't include this if using autoconf cross-compile or cmake */ -+#if !defined(HAVE_CONFIG_H) && !defined(BUILDING_CMAKE) -+ - - /* TLS Support */ - #undef ENABLE_MQTT_TLS -@@ -58,6 +59,7 @@ - #undef WOLFMQTT_NO_ERROR_STRINGS - //#define WOLFMQTT_NO_ERROR_STRINGS - --#endif /* !HAVE_CONFIG_H */ -+ -+#endif /* !HAVE_CONFIG_H && !BUILDING_CMAKE */ - - #endif /* _WOLFMQTT_VS_SETTINGS_ */ diff --git a/ports/wolfssl/portfile.cmake b/ports/wolfssl/portfile.cmake index 3960262d32092f..139ef260be971f 100644 --- a/ports/wolfssl/portfile.cmake +++ b/ports/wolfssl/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolfssl - REF v5.4.0-stable - SHA512 e43560f83f6c62d78b10c4df7db21f02386f22b893688b98d2f3432e3b3946a4e80960c7402404a8c0486c87b1dde5b7a3827f9d4d3be13f87f370dfc1179c78 + REF v5.5.0-stable + SHA512 1f9ffd8e83b26f97c3685315790f3f2b451a23e9dad9e2f09142a3e1e136012293ca2d04f46c267f8275ac9e60894c46c7875353765df6d4fdd93ba666228459 HEAD_REF master PATCHES - wolfssl_pr5401.diff + wolfssl_pr5529.diff ) vcpkg_cmake_configure( @@ -22,7 +22,7 @@ vcpkg_cmake_configure( -DWOLFSSL_OCSPSTAPLING_V2=yes -DWOLFSSL_CRL=yes -DWOLFSSL_DES3=yes - -DCMAKE_C_FLAGS='-DWOLFSSL_ALT_CERT_CHAINS\ -DWOLFSSL_DES_ECB' + -DCMAKE_C_FLAGS='-DWOLFSSL_ALT_CERT_CHAINS\ -DWOLFSSL_DES_ECB\ -DWOLFSSL_CUSTOM_OID\ -DHAVE_OID_ENCODING\ -DWOLFSSL_CERT_GEN\ -DWOLFSSL_ASN_TEMPLATE\ -DWOLFSSL_KEY_GEN\ -DHAVE_PKCS7\ -DHAVE_AES_KEYWRAP\ -DWOLFSSL_AES_DIRECT\ -DHAVE_X963_KDF' OPTIONS_DEBUG -DWOLFSSL_DEBUG=yes) diff --git a/ports/wolfssl/vcpkg.json b/ports/wolfssl/vcpkg.json index 08fbde2e605369..2331c8aff05514 100644 --- a/ports/wolfssl/vcpkg.json +++ b/ports/wolfssl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wolfssl", - "version": "5.4.0", + "version": "5.5.0", "description": "TLS and Cryptographic library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wolfssl/wolfssl_pr5401.diff b/ports/wolfssl/wolfssl_pr5401.diff deleted file mode 100644 index 99919488bc7fc7..00000000000000 --- a/ports/wolfssl/wolfssl_pr5401.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2da855cce3..467f4b79725 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2044,7 +2044,11 @@ endif() - - if(NOT BUILD_SP) - list(APPEND HEADER_EXCLUDE -- "wolfssl/wolfcrypt/sp.h" -+ "wolfssl/wolfcrypt/sp.h") -+endif() -+ -+if(NOT BUILD_SP_INT) -+ list(APPEND HEADER_EXCLUDE - "wolfssl/wolfcrypt/sp_int.h") - endif() - diff --git a/ports/wolfssl/wolfssl_pr5529.diff b/ports/wolfssl/wolfssl_pr5529.diff new file mode 100644 index 00000000000000..719df37ffa604d --- /dev/null +++ b/ports/wolfssl/wolfssl_pr5529.diff @@ -0,0 +1,68 @@ +From f7482d96e640ebedaf0dc79e22901012f466b161 Mon Sep 17 00:00:00 2001 +From: Anthony Hu +Date: Wed, 31 Aug 2022 09:05:00 -0400 +Subject: [PATCH] Windows cl.exe does not support -Wextra other flags + +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3937a6fab..c6f0ae5b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -169,7 +169,12 @@ find_package(Threads) + # Example for map file and custom linker script + #set(CMAKE_EXE_LINKER_FLAGS " -Xlinker -Map=output.map -T\"${CMAKE_CURRENT_SOURCE_DIR}/linker.ld\"") + ++if(WIN32) ++# Windows cl.exe does not support the -Wextra, -Wno-unused and -Werror flags. ++set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}") ++else() + set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Werror ${CMAKE_C_FLAGS}") ++endif() + + #################################################### + # Build Options +-- +2.37.0 + +From f0812fa21fb702ca823292d31e0cf28aacdf4d2c Mon Sep 17 00:00:00 2001 +From: David Garske +Date: Wed, 31 Aug 2022 11:41:43 -0700 +Subject: [PATCH] Added vcpkg instructions to the INSTALL file. + +--- + INSTALL | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/INSTALL b/INSTALL +index 49421ba6a..79d40e3a5 100644 +--- a/INSTALL ++++ b/INSTALL +@@ -233,3 +233,22 @@ + environments. All OIDs and codepoints are temporary and expected to + change in the future. You should have no expectation of backwards + compatibility. ++ ++16. Building with vcpkg ++ ++# Building wolfssl - Using vcpkg ++ ++ You can download and install wolfssl using the [vcpkg](https://github.com/Microsoft/vcpkg): ++ ++ git clone https://github.com/Microsoft/vcpkg.git ++ cd vcpkg ++ ./bootstrap-vcpkg.sh ++ OR for Windows ++ bootstrap-vcpkg.bat ++ ++ ./vcpkg integrate install ++ ./vcpkg install wolfssl ++ ++The wolfssl port in vcpkg is kept up to date by wolfSSL. ++ ++We also have vcpkg ports for wolftpm, wolfmqtt and curl. +-- +2.37.0 + diff --git a/ports/wolftpm/portfile.cmake b/ports/wolftpm/portfile.cmake index b2c4c12f7b990a..a5cb139954f6c4 100644 --- a/ports/wolftpm/portfile.cmake +++ b/ports/wolftpm/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wolfssl/wolftpm - REF v2.5.0 - SHA512 4047671171fda4115a4e94bbd2362642752efbaf30531b1f55f6fe66e2e90bdf3b5549c6ddf4e53dce3b6f44c59e792217b2be4c5650857d28193aa5466919fc + REF v2.6.0 + SHA512 1339806859d6fb0e6aef37e6f87be2e49462eccb01d5ca51fdf98bc3b3a1af75f78abe9c8e302b6f9251196e033e639198e980d2500b839403fe6cb10a07743c HEAD_REF master PATCHES - wolftpm_pr235.diff ) vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/wolftpm/vcpkg.json b/ports/wolftpm/vcpkg.json index 53f75a7f56c6a6..40b11cefd84d6e 100644 --- a/ports/wolftpm/vcpkg.json +++ b/ports/wolftpm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wolftpm", - "version": "2.5.0", + "version": "2.6.0", "description": "TPM library used with wolfSSL library for many platforms", "homepage": "https://wolfssl.com", "license": "GPL-2.0-or-later", diff --git a/ports/wolftpm/wolftpm_pr235.diff b/ports/wolftpm/wolftpm_pr235.diff deleted file mode 100644 index de283bbd841273..00000000000000 --- a/ports/wolftpm/wolftpm_pr235.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d642a06..157b000 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -194,7 +194,24 @@ endfunction() - add_definitions(${WOLFTPM_DEFINITIONS}) - - # generate options file --set(OPTION_FILE "wolftpm/options.h") -+message("Generating user options header...") -+if (${CMAKE_DISABLE_SOURCE_CHANGES}) -+ set(WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT "${CMAKE_DISABLE_SOURCE_CHANGES}") -+else() -+ set(WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT "no") -+endif() -+ -+set(WOLFTPM_BUILD_OUT_OF_TREE "${WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT}" CACHE STRING -+ "Don't generate files in the source tree (default: ${WOLFTPM_BUILD_OUT_OF_TREE_DEFAULT})") -+set_property(CACHE WOLFTPM_BUILD_OUT_OF_TREE -+ PROPERTY STRINGS "yes;no") -+ -+if (${WOLFTPM_BUILD_OUT_OF_TREE}) -+ set(WOLFTPM_OUTPUT_BASE ${CMAKE_CURRENT_BINARY_DIR}) -+else() -+ set(WOLFTPM_OUTPUT_BASE ${CMAKE_CURRENT_SOURCE_DIR}) -+endif() -+set(OPTION_FILE "${WOLFTPM_OUTPUT_BASE}/wolftpm/options.h") - - file(REMOVE ${OPTION_FILE}) - diff --git a/versions/baseline.json b/versions/baseline.json index 561d129c210691..86325ac104395b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7741,15 +7741,15 @@ "port-version": 3 }, "wolfmqtt": { - "baseline": "1.14.0", + "baseline": "1.14.1", "port-version": 0 }, "wolfssl": { - "baseline": "5.4.0", + "baseline": "5.5.0", "port-version": 0 }, "wolftpm": { - "baseline": "2.5.0", + "baseline": "2.6.0", "port-version": 0 }, "wordnet": { diff --git a/versions/w-/wolfmqtt.json b/versions/w-/wolfmqtt.json index 88cf513fa07ae2..3bd3f6f61c6a5a 100644 --- a/versions/w-/wolfmqtt.json +++ b/versions/w-/wolfmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37b49de24795f47490a870aa721aceeb545a07ce", + "version": "1.14.1", + "port-version": 0 + }, { "git-tree": "3cc2bb0123d6f9ea038bf52190ba1c6c2154b02b", "version": "1.14.0", diff --git a/versions/w-/wolfssl.json b/versions/w-/wolfssl.json index f6a83731b2ac29..737e8cacaee68f 100644 --- a/versions/w-/wolfssl.json +++ b/versions/w-/wolfssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "051a3dc2339554716a11e8e90e9ecea1c366ad31", + "version": "5.5.0", + "port-version": 0 + }, { "git-tree": "6b522a6326a126579cee52953fe42f597f301a22", "version": "5.4.0", diff --git a/versions/w-/wolftpm.json b/versions/w-/wolftpm.json index 034c61d2fa6d42..bbfcdb8d2e50bb 100644 --- a/versions/w-/wolftpm.json +++ b/versions/w-/wolftpm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f07a1e1aa64eb12e407a202a68370a4e08e9af9", + "version": "2.6.0", + "port-version": 0 + }, { "git-tree": "80998c4f2e20341ac7195103ba9581a8c8e0cd68", "version": "2.5.0", From b5dd45dc07b82cd48ac0ae8ac68ee41c391ea826 Mon Sep 17 00:00:00 2001 From: noeffn Date: Fri, 2 Sep 2022 19:47:50 +0200 Subject: [PATCH 534/791] [boost-modular-build-helper] Add BSD and FreeBSD target-os (#26562) * [boost-modular-build-helper] Add BSD and FreeBSD target-os [boost-modular-build-helper] Updates port version * [boost-modular-build-helper] Use CMAKE_SYSTEM_NAME to detect freebsd * [boost-modular-build-helper] Use port-version 1 * update evrsion * [boost-modular_build-helper ] Use VCPKG_DETECTED_CMAKE_SYSTEM_NAME for FreeBSD detection * [boost-modular-build-helper] Updates version * Update boost-modular-build-helper.json Co-authored-by: Avezy Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/boost-modular-build-helper/CMakeLists.txt | 2 ++ ports/boost-modular-build-helper/vcpkg.json | 1 + versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 6549f43cd639b6..a222f165c17bf2 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -79,6 +79,8 @@ elseif(APPLE) endif() elseif(ANDROID) list(APPEND B2_OPTIONS target-os=android) +elseif(VCPKG_DETECTED_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + list(APPEND B2_OPTIONS target-os=freebsd) else() list(APPEND B2_OPTIONS target-os=linux) endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 9220b8553aa590..8b1db10f69e8e8 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.80.0", + "port-version": 1, "description": "Internal vcpkg port used to build Boost libraries", "license": "MIT", "dependencies": [ diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index a2b7b55b706d39..1ca49578535183 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cfe5562e40b1ef219b3d36054e1235508c41037", + "version": "1.80.0", + "port-version": 1 + }, { "git-tree": "3047d0e2fdc4eee0c918f418f45d5e1dfb86c0fb", "version": "1.80.0", diff --git a/versions/baseline.json b/versions/baseline.json index 86325ac104395b..c2ff16fb38fa82 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -846,7 +846,7 @@ }, "boost-modular-build-helper": { "baseline": "1.80.0", - "port-version": 0 + "port-version": 1 }, "boost-move": { "baseline": "1.80.0", From 2353c6594039dfacf69bd0cb93e0dacda48fcdeb Mon Sep 17 00:00:00 2001 From: Russell Greene Date: Fri, 2 Sep 2022 12:49:22 -0500 Subject: [PATCH 535/791] [opencv4] disable optional hdf5 dependency for iOS, where it doesn't build (yet) (#26636) * [opencv4] diable hdf5 dependency on ios, as it currently doesn't build * ./vcpkg x-add-version --all --- ports/opencv4/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/o-/opencv4.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 43ecb005c3e0b6..6d331766f8fb8b 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.6.0", - "port-version": 3, + "port-version": 4, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -35,7 +35,7 @@ "dependencies": [ { "name": "hdf5", - "platform": "!uwp & !(windows & (arm | arm64))" + "platform": "!uwp & !(windows & (arm | arm64)) & !ios" }, { "name": "tesseract", diff --git a/versions/baseline.json b/versions/baseline.json index c2ff16fb38fa82..212cf9b71023bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5274,7 +5274,7 @@ }, "opencv4": { "baseline": "4.6.0", - "port-version": 3 + "port-version": 4 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index eee5dcb2d92468..60a076d77076a5 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "970c048b2d380fe84e110c02a99dc099f8b877d0", + "version": "4.6.0", + "port-version": 4 + }, { "git-tree": "18c563d48f8245b3d1e0879ecdc6c37097a89b3c", "version": "4.6.0", From 74a66f663d95f5ee2dc4634049c830c0017db003 Mon Sep 17 00:00:00 2001 From: Li Xiaobin Date: Sat, 3 Sep 2022 01:51:42 +0800 Subject: [PATCH 536/791] [mysql-connector-cpp] update to 8.0.30 (#26536) * [mysql-connector-cpp] Upgrade to 8.0.30 * version DB * [mysql-connector-cpp] remove arm supports * [mysql-connector-cpp] version DB --- ports/mysql-connector-cpp/FindMySQL.cmake | 42 ---- .../mysql-connector-cpp/export-targets.patch | 65 +++++++ .../fix-static-build.patch | 182 ------------------ .../fix-static-build8.patch | 131 +++++++++++++ .../mysql-connector-cpp-config.cmake.in | 3 +- ports/mysql-connector-cpp/portfile.cmake | 50 ++--- ports/mysql-connector-cpp/usage | 9 - ports/mysql-connector-cpp/vcpkg.json | 8 +- versions/baseline.json | 2 +- versions/m-/mysql-connector-cpp.json | 5 + 10 files changed, 225 insertions(+), 272 deletions(-) delete mode 100644 ports/mysql-connector-cpp/FindMySQL.cmake create mode 100644 ports/mysql-connector-cpp/export-targets.patch delete mode 100644 ports/mysql-connector-cpp/fix-static-build.patch create mode 100644 ports/mysql-connector-cpp/fix-static-build8.patch delete mode 100644 ports/mysql-connector-cpp/usage diff --git a/ports/mysql-connector-cpp/FindMySQL.cmake b/ports/mysql-connector-cpp/FindMySQL.cmake deleted file mode 100644 index f19f9b28534155..00000000000000 --- a/ports/mysql-connector-cpp/FindMySQL.cmake +++ /dev/null @@ -1,42 +0,0 @@ -find_package(libmysql REQUIRED) - -set(MYSQL_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/mysql") - -if(NOT EXISTS "${MYSQL_INCLUDE_DIR}/mysql.h") - message(FATAL_ERROR "MYSQL_INCLUDE_DIR given, but no \"mysql.h\" in \"${MYSQL_INCLUDE_DIR}\"") -endif() - -# Write the C source file that will include the MySQL headers -set(GETMYSQLVERSION_SOURCEFILE "${CMAKE_CURRENT_BINARY_DIR}/getmysqlversion.c") -file(WRITE "${GETMYSQLVERSION_SOURCEFILE}" - "#include \n" - "#include \n" - "int main() {\n" - " printf(\"%s\", MYSQL_SERVER_VERSION);\n" - "}\n" -) - -# Compile and run the created executable, store output in MYSQL_VERSION -try_run(_run_result _compile_result - "${CMAKE_BINARY_DIR}" - "${GETMYSQLVERSION_SOURCEFILE}" - CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:STRING=${MYSQL_INCLUDE_DIR}" - RUN_OUTPUT_VARIABLE MYSQL_VERSION -) - -if(NOT MYSQL_VERSION) - message(FATAL_ERROR "Could not determine the MySQL Server version") -endif() - -# Clean up so only numeric, in case of "-alpha" or similar -string(REGEX MATCHALL "([0-9]+.[0-9]+.[0-9]+)" MYSQL_VERSION "${MYSQL_VERSION}") - -# To create a fully numeric version, first normalize so N.NN.NN -string(REGEX REPLACE "[.]([0-9])[.]" ".0\\1." MYSQL_VERSION_ID "${MYSQL_VERSION}") -string(REGEX REPLACE "[.]([0-9])$" ".0\\1" MYSQL_VERSION_ID "${MYSQL_VERSION_ID}") - -# Finally remove the dot -string(REGEX REPLACE "[.]" "" MYSQL_VERSION_ID "${MYSQL_VERSION_ID}") -set(MYSQL_NUM_VERSION ${MYSQL_VERSION_ID}) - -include_directories("${MYSQL_INCLUDE_DIR}") diff --git a/ports/mysql-connector-cpp/export-targets.patch b/ports/mysql-connector-cpp/export-targets.patch new file mode 100644 index 00000000000000..4cafe8ba2976c3 --- /dev/null +++ b/ports/mysql-connector-cpp/export-targets.patch @@ -0,0 +1,65 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e734714..6f00595 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -397,7 +397,7 @@ add_subdirectory(devapi) + # Generate the main connector library. + + merge_libraries(connector xapi devapi) +-target_include_directories(connector PUBLIC "${PROJECT_SOURCE_DIR}/include") ++target_include_directories(connector PRIVATE "${PROJECT_SOURCE_DIR}/include") + + + # +@@ -473,31 +473,23 @@ set_target_properties(connector PROPERTIES + ) + + +-install(TARGETS connector +- CONFIGURATIONS Release RelWithDebInfo +- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev +- RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll +- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll +-) +- +-install(TARGETS connector +- CONFIGURATIONS Debug +- ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}/debug" COMPONENT XDevAPIDev +- RUNTIME DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll +- LIBRARY DESTINATION "${INSTALL_LIB_DIR}/debug" COMPONENT XDevAPIDll ++install(TARGETS connector EXPORT unofficial-mysql-connector-cpp-targets ++ ARCHIVE DESTINATION lib COMPONENT XDevAPIDev ++ RUNTIME DESTINATION bin COMPONENT XDevAPIDll ++ LIBRARY DESTINATION lib COMPONENT XDevAPIDll + ) + + if(MSVC AND NOT BUILD_STATIC) + + install(FILES $ + CONFIGURATIONS RelWithDebInfo +- DESTINATION "${INSTALL_LIB_DIR}" ++ DESTINATION bin + COMPONENT Debuginfo + ) + + install(FILES $ + CONFIGURATIONS Debug +- DESTINATION "${INSTALL_LIB_DIR}/debug" ++ DESTINATION bin + COMPONENT Debuginfo + ) + +@@ -604,3 +596,12 @@ endif() + + + show_config_options() ++ ++include(CMakePackageConfigHelpers) ++configure_package_config_file( ++ "${CMAKE_SOURCE_DIR}/mysql-connector-cpp-config.cmake.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" ++ INSTALL_DESTINATION "share/unofficial-mysql-connector-cpp" ++) ++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" DESTINATION "share/unofficial-mysql-connector-cpp") ++install(EXPORT unofficial-mysql-connector-cpp-targets DESTINATION share/unofficial-mysql-connector-cpp) +\ No newline at end of file diff --git a/ports/mysql-connector-cpp/fix-static-build.patch b/ports/mysql-connector-cpp/fix-static-build.patch deleted file mode 100644 index 554ee5fe76a89f..00000000000000 --- a/ports/mysql-connector-cpp/fix-static-build.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4cb920..eeb17ee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,8 +126,8 @@ ENDIF() - # CPPFLAGS, CXXFLAGS and LDFLAGS from the environment - - SET(FreeBSD11Up False) --if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" AND -- ${CMAKE_SYSTEM_VERSION} GREATER "10") -+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD" AND -+ "${CMAKE_SYSTEM_VERSION}" GREATER "10") - SET(FreeBSD11Up True) - endif() - -@@ -490,10 +490,12 @@ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/driver/nativeapi) - ADD_SUBDIRECTORY(cppconn) - ADD_SUBDIRECTORY(driver) - ADD_SUBDIRECTORY(examples) -+IF(MYSQLCPPCONN_BUILD_TESTS) - ADD_SUBDIRECTORY(test) - ADD_SUBDIRECTORY(test/framework) - ADD_SUBDIRECTORY(test/CJUnitTestsPort) - ADD_SUBDIRECTORY(test/unit) -+ENDIF(MYSQLCPPCONN_BUILD_TESTS) - - IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") - # see also README -diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt -index e7136aa..740defa 100644 ---- a/driver/CMakeLists.txt -+++ b/driver/CMakeLists.txt -@@ -181,9 +181,13 @@ IF(WIN32) - ENDIF(WIN32) - - -+IF(ENABLE_BUILD_DYNAMIC) - ADD_LIBRARY(mysqlcppconn SHARED ${MYSQLCPPCONN_SOURCES}) -+ENDIF(ENABLE_BUILD_DYNAMIC) -+IF(ENABLE_BUILD_STATIC) - ADD_LIBRARY(mysqlcppconn-static STATIC ${MYSQLCPPCONN_SOURCES}) --SET(MYSQL_LIB_OBJECTS "${MYSQL_LIBRARIES}") -+ENDIF(ENABLE_BUILD_STATIC) -+SET(MYSQL_LIB_OBJECTS "") - - IF(WIN32) - INCLUDE_DIRECTORIES(${MYSQL_DIR}/include) -@@ -200,8 +204,10 @@ IF(WIN32) - #Disables bunch of pretty useless warnings on win - ADD_DEFINITIONS("-D_SCL_SECURE_NO_WARNINGS") - -+ IF(ENABLE_BUILD_DYNAMIC) - ADD_LIBRARY(mysqlclient STATIC IMPORTED) - SET_TARGET_PROPERTIES(mysqlclient PROPERTIES IMPORTED_LOCATION "${MYSQL_LIB}" ) -+ ENDIF(ENABLE_BUILD_DYNAMIC) - - IF(MYSQLCLIENT_STATIC_BINDING) - SET(MY_TARGET_LINK_LIBRARIES_DYNAMIC mysqlclient ws2_32) -@@ -240,6 +246,7 @@ ELSEIF(NOT WIN32) - FILE(TO_NATIVE_PATH ${OBJ} OBJ) - SET(MYSQL_STATIC_LIB_OBJECTS "${MYSQL_STATIC_LIB_OBJECTS} ${OBJ}") - ENDFOREACH(OBJ ${MYSQL_STATIC_OBJECTS}) -+ FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/.MYSQL_ARCHIVES ${CMAKE_CURRENT_BINARY_DIR}/../.MYSQL_ARCHIVES) - ENDIF(MYSQLCLIENT_STATIC_LINKING) - SET(MYSQL_LIB_OBJECTS "${MYSQL_STATIC_LIB_OBJECTS}") - ENDIF(WIN32) -@@ -250,24 +257,28 @@ IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE) - ENDIF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE) - - --TARGET_LINK_LIBRARIES(mysqlcppconn ${MY_TARGET_LINK_LIBRARIES_DYNAMIC} -+IF(ENABLE_BUILD_DYNAMIC) -+TARGET_LINK_LIBRARIES(mysqlcppconn PRIVATE ${MYSQL_LIBRARIES} - ${MY_GCOV_LINK_LIBRARIES} - ${MYSQLCPPCONN_BOOST_SYSTEM_LIBS} - ${MYSQLCPPCONN_BOOST_THREAD_LIBS} - ${MYSQLCPPCONN_EXTRA_LIBRARIES} - ${MYSQLCPPCONN_ICU_LIBRARY}) -+ENDIF(ENABLE_BUILD_DYNAMIC) - - # Need to find way it's defined for mysqlcppconn-static only - #IF(WIN32) - # ADD_DEFINITIONS("-DCPPCONN_PUBLIC_FUNC=\"\"") - #ENDIF(WIN32) - --TARGET_LINK_LIBRARIES(mysqlcppconn-static ${MY_TARGET_LINK_LIBRARIES_STATIC} -+IF(ENABLE_BUILD_STATIC) -+TARGET_LINK_LIBRARIES(mysqlcppconn-static PRIVATE ${MYSQL_LIBRARIES} - ${MY_GCOV_LINK_LIBRARIES} - ${MYSQLCPPCONN_BOOST_SYSTEM_LIBS} - ${MYSQLCPPCONN_BOOST_THREAD_LIBS} - ${MYSQLCPPCONN_EXTRA_LIBRARIES} - ${MYSQLCPPCONN_ICU_LIBRARY}) -+ENDIF(ENABLE_BUILD_STATIC) - - IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - # We pass objects from our C client library in the -@@ -284,12 +295,15 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - SET(CMAKE_CXX_CREATE_STATIC_LIBRARY " cr ") - ENDIF() - -+IF(ENABLE_BUILD_STATIC) - SET_TARGET_PROPERTIES(mysqlcppconn-static PROPERTIES - LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}" - COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}" - COMPILE_DEFINITIONS CPPCONN_LIB_BUILD="" - STATIC_LIBRARY_FLAGS "${MYSQL_LIB_OBJECTS}") -+ENDIF(ENABLE_BUILD_STATIC) - -+IF(ENABLE_BUILD_DYNAMIC) - SET_TARGET_PROPERTIES(mysqlcppconn - PROPERTIES - SOVERSION "${MYSQLCPPCONN_SOVERSION}" -@@ -298,6 +312,7 @@ SET_TARGET_PROPERTIES(mysqlcppconn - COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}" - COMPILE_DEFINITIONS CPPCONN_SO_BUILD="" - LINK_INTERFACE_LIBRARIES "") -+ENDIF(ENABLE_BUILD_DYNAMIC) - - IF(WIN32) - # SET_TARGET_PROPERTIES(mysqlcppconn PROPERTIES -@@ -316,14 +331,29 @@ IF(WIN32) - # CHANGE_CRT("/MD") - # ENDIF() - -- INSTALL(TARGETS mysqlcppconn mysqlcppconn-static -- RUNTIME DESTINATION lib -+ IF(ENABLE_BUILD_STATIC) -+ IF(STATIC_CRT) -+ INCLUDE(${CMAKE_SOURCE_DIR}/changeCrt.cmake) -+ CHANGE_CRT("T") -+ ENDIF(STATIC_CRT) -+ INSTALL(TARGETS mysqlcppconn-static -+ EXPORT unofficial-mysql-connector-cpp-targets -+ RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - ) -+ ENDIF(ENABLE_BUILD_STATIC) -+ IF(ENABLE_BUILD_DYNAMIC) -+ INSTALL(TARGETS mysqlcppconn -+ EXPORT unofficial-mysql-connector-cpp-targets -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ ) -+ ENDIF(ENABLE_BUILD_DYNAMIC) - ELSE(WIN32) - IF(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_STATIC) - IF(ENABLE_BUILD_DYNAMIC) - INSTALL(TARGETS mysqlcppconn -+ EXPORT unofficial-mysql-connector-cpp-targets - LIBRARY DESTINATION ${INSTALL_LIBDIR} - ARCHIVE DESTINATION ${INSTALL_LIBDIR} - ) -@@ -331,6 +361,7 @@ ELSE(WIN32) - - IF(ENABLE_BUILD_STATIC) - INSTALL(TARGETS mysqlcppconn-static -+ EXPORT unofficial-mysql-connector-cpp-targets - LIBRARY DESTINATION ${INSTALL_LIBDIR} - ARCHIVE DESTINATION ${INSTALL_LIBDIR} - ) -@@ -343,6 +374,12 @@ ELSE(WIN32) - ENDIF(ENABLE_BUILD_DYNAMIC OR ENABLE_BUILD_STATIC) - ENDIF(WIN32) - -+include(CMakePackageConfigHelpers) -+configure_package_config_file( -+ "${CMAKE_SOURCE_DIR}/mysql-connector-cpp-config.cmake.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" -+ INSTALL_DESTINATION "share/unofficial-mysql-connector-cpp" -+) - - # Install some MySQL specific headers - SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS -@@ -352,5 +389,7 @@ SET(MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS - - INSTALL(FILES ${MYSQLCPPCONN_SPECIFIC_INSTALL_HEADERS} DESTINATION include) - -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" DESTINATION "share/unofficial-mysql-connector-cpp") -+install(EXPORT unofficial-mysql-connector-cpp-targets DESTINATION share/unofficial-mysql-connector-cpp) - - MESSAGE(STATUS "Configuring driver") diff --git a/ports/mysql-connector-cpp/fix-static-build8.patch b/ports/mysql-connector-cpp/fix-static-build8.patch new file mode 100644 index 00000000000000..b0e60c088f3911 --- /dev/null +++ b/ports/mysql-connector-cpp/fix-static-build8.patch @@ -0,0 +1,131 @@ +diff --git a/cdk/cmake/dependency.cmake b/cdk/cmake/dependency.cmake +index a1775da..f9c3edf 100644 +--- a/cdk/cmake/dependency.cmake ++++ b/cdk/cmake/dependency.cmake +@@ -57,6 +57,7 @@ set(EXT_FWD + CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION + CMAKE_SYSTEM_PROCESSOR + CMAKE_C_COMPILER CMAKE_CXX_COMPILER ++ BUILD_SHARED_LIBS STATIC_MSVCRT BUILD_STATIC + ) + + set(EXT_DIR ${CMAKE_CURRENT_LIST_DIR}/ext CACHE INTERNAL "external project utils location") +@@ -117,7 +118,7 @@ function(add_ext NAME) + endif() + + foreach(var ${EXT_FWD}) +- if(${var}) ++ if(DEFINED ${var}) + message("-- option ${var}: ${${var}}") + list(APPEND cmake_opts -D${var}=${${var}}) + endif() +diff --git a/cdk/extra/lz4/CMakeLists.txt b/cdk/extra/lz4/CMakeLists.txt +index 4c3aab0..a1596af 100644 +--- a/cdk/extra/lz4/CMakeLists.txt ++++ b/cdk/extra/lz4/CMakeLists.txt +@@ -34,6 +34,10 @@ include(platform) + + enable_pic() + ++if (MSVC AND STATIC_MSVCRT) ++ message("lz4 using static runtime library") ++ set_msvcrt(STATIC) ++endif (MSVC AND STATIC_MSVCRT) + add_library(lz4 STATIC + lz4.c + lz4frame.c +diff --git a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt +index efe6b97..377a817 100644 +--- a/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt ++++ b/cdk/extra/protobuf/protobuf-3.19.4/cmake/CMakeLists.txt +@@ -186,9 +186,9 @@ else (protobuf_BUILD_SHARED_LIBS) + # Prior to CMake 3.15, the MSVC runtime library was pushed into the same flags + # making programmatic control difficult. Prefer the functionality in newer + # CMake versions when available. +- if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) +- set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) +- else() ++ #if(CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15) ++ # set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$:Debug>) ++ #else() + # In case we are building static libraries, link also the runtime library statically + # so that MSVCR*.DLL is not required at runtime. + # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx +@@ -203,7 +203,7 @@ else (protobuf_BUILD_SHARED_LIBS) + endif(${flag_var} MATCHES "/MD") + endforeach(flag_var) + endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME) +- endif() ++ #endif() + endif (protobuf_BUILD_SHARED_LIBS) + + if (MSVC) +diff --git a/cdk/extra/zlib/CMakeLists.txt b/cdk/extra/zlib/CMakeLists.txt +index 237c2c3..7746bd0 100644 +--- a/cdk/extra/zlib/CMakeLists.txt ++++ b/cdk/extra/zlib/CMakeLists.txt +@@ -162,6 +162,10 @@ endif() + + # ------------------------------------------------------------------------- + ++if (MSVC AND STATIC_MSVCRT) ++ message("zlib using static runtime library") ++ set_msvcrt(STATIC) ++endif (MSVC AND STATIC_MSVCRT) + ADD_LIBRARY(zlib STATIC + ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + +diff --git a/cdk/extra/zstd/CMakeLists.txt b/cdk/extra/zstd/CMakeLists.txt +index 2109f3e..a60034e 100644 +--- a/cdk/extra/zstd/CMakeLists.txt ++++ b/cdk/extra/zstd/CMakeLists.txt +@@ -57,6 +57,10 @@ SET(ZSTD_SRCS + lib/dictBuilder/zdict.c + ) + ++if (MSVC AND STATIC_MSVCRT) ++ message("zstd using static runtime library") ++ set_msvcrt(STATIC) ++endif (MSVC AND STATIC_MSVCRT) + ADD_LIBRARY(zstd STATIC ${ZSTD_SRCS}) + set_target_properties(zstd PROPERTIES FOLDER "Misc") + +diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake +index 05ea32e..ff26ba6 100644 +--- a/cmake/libutils.cmake ++++ b/cmake/libutils.cmake +@@ -164,7 +164,11 @@ function(merge_libraries TARGET) + set_property(SOURCE "${LIBUTILS_SCRIPT_DIR}/empty.cc" PROPERTY LANGUAGE CXX) + + add_library(${TARGET} ${TYPE} "${LIBUTILS_SCRIPT_DIR}/empty.cc") +- target_link_libraries(${TARGET} PRIVATE ${ARGN}) ++ if(TYPE STREQUAL "SHARED") ++ target_link_libraries(${TARGET} PRIVATE ${ARGN}) ++ else() ++ add_dependencies(${TARGET} ${ARGN}) ++ endif() + + # + # Arrange for marge_archives.cmake script to be executed in a POST_BUILD +@@ -314,7 +318,7 @@ function(merge_libraries TARGET) + --target ${TARGET}-deps + --config $ + -- +- /nologo /v:q /filelogger /flp:Verbosity=q /flp:ShowCommandLine ++ /nologo /v:q /filelogger /flp:Verbosity=m /flp:ShowCommandLine + /flp:LogFile=\"${log_file}.STATIC\" + + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +diff --git a/install_layout.cmake b/install_layout.cmake +index 5730ce4..e6514ac 100644 +--- a/install_layout.cmake ++++ b/install_layout.cmake +@@ -177,7 +177,7 @@ set(LIB_NAME_BASE "mysqlcppconn${CONCPP_VERSION_MAJOR}") + set(LIB_NAME_STATIC "${LIB_NAME_BASE}-static") + + if(WIN32 AND STATIC_MSVCRT) +- set(LIB_NAME_STATIC "${LIB_NAME}-mt") ++ set(LIB_NAME_STATIC "${LIB_NAME_STATIC}-mt") + endif() + + if(BUILD_STATIC) diff --git a/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in b/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in index 9f4910b6c0009a..5d2e07e750ce71 100644 --- a/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in +++ b/ports/mysql-connector-cpp/mysql-connector-cpp-config.cmake.in @@ -2,8 +2,7 @@ include(CMakeFindDependencyMacro) -find_dependency(libmysql) -find_dependency(Boost) +find_dependency(OpenSSL) include("${CMAKE_CURRENT_LIST_DIR}/unofficial-mysql-connector-cpp-targets.cmake") check_required_components(mysql-connector-cpp) diff --git a/ports/mysql-connector-cpp/portfile.cmake b/ports/mysql-connector-cpp/portfile.cmake index 5193d53422b164..6beb0253c973f5 100644 --- a/ports/mysql-connector-cpp/portfile.cmake +++ b/ports/mysql-connector-cpp/portfile.cmake @@ -1,54 +1,42 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mysql/mysql-connector-cpp - REF 1.1.13 - SHA512 76cf3d8c9dbaa006ccbb3c672538c540167c7a9cf3406a371313dc346598b119515f25fea2a786bb8cab12d96fd607b69f320a6d897aaeeb668eff831920fb5f + REF 8.0.30 + SHA512 fd6d8a03ba66ca028b3748218c60a721c9e2c79867c6cf2ea95d2649d3a252e9bd307986b149897dcc1d24a11785666c5480225a20c4baba7c87b376b7289a13 HEAD_REF master PATCHES - fix-static-build.patch + fix-static-build8.patch + export-targets.patch ) -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/mysql-connector-cpp-config.cmake.in" - "${CMAKE_CURRENT_LIST_DIR}/FindMySQL.cmake" - DESTINATION "${SOURCE_PATH}" -) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/mysql-connector-cpp-config.cmake.in" DESTINATION "${SOURCE_PATH}") -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_BUILD_DYNAMIC) -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_MSVCRT) -# Use mysql-connector-cpp's own build process, skipping examples and tests. +# Use mysql-connector-cpp's own build process. vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" WINDOWS_USE_MSBUILD OPTIONS - -DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=OFF - -DMYSQLCPPCONN_BUILD_TESTS:BOOL=OFF - -DENABLE_BUILD_DYNAMIC=${ENABLE_BUILD_DYNAMIC} - -DENABLE_BUILD_STATIC=${ENABLE_BUILD_STATIC} - -DMYSQLCLIENT_STATIC_LINKING=${ENABLE_BUILD_STATIC} - -DSTATIC_CRT=${STATIC_CRT} - MAYBE_UNUSED_VARIABLES - STATIC_CRT - MYSQLCLIENT_STATIC_LINKING + "-DWITH_SSL=${CURRENT_INSTALLED_DIR}" + -DBUILD_STATIC=${BUILD_STATIC} + -DSTATIC_MSVCRT=${STATIC_MSVCRT} + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-mysql-connector-cpp) -file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE "${CURRENT_PACKAGES_DIR}/BUILDINFO" - "${CURRENT_PACKAGES_DIR}/LICENSE" - "${CURRENT_PACKAGES_DIR}/README" - "${CURRENT_PACKAGES_DIR}/debug/BUILDINFO" - "${CURRENT_PACKAGES_DIR}/debug/LICENSE" - "${CURRENT_PACKAGES_DIR}/debug/README" +file(REMOVE + "${CURRENT_PACKAGES_DIR}/INFO_BIN" + "${CURRENT_PACKAGES_DIR}/INFO_SRC" + "${CURRENT_PACKAGES_DIR}/debug/INFO_BIN" + "${CURRENT_PACKAGES_DIR}/debug/INFO_SRC" ) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() - # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mysql-connector-cpp/usage b/ports/mysql-connector-cpp/usage deleted file mode 100644 index 99e1efcfe724ec..00000000000000 --- a/ports/mysql-connector-cpp/usage +++ /dev/null @@ -1,9 +0,0 @@ -The package mysql-connector-cpp provides CMake targets: - - find_package(unofficial-mysql-connector-cpp CONFIG REQUIRED) - target_link_libraries(main PRIVATE mysqlcppconn) - - or - - find_package(unofficial-mysql-connector-cpp CONFIG REQUIRED) - target_link_libraries(main PRIVATE mysqlcppconn-static) diff --git a/ports/mysql-connector-cpp/vcpkg.json b/ports/mysql-connector-cpp/vcpkg.json index ac86759c3b0670..93f91f2586eb3c 100644 --- a/ports/mysql-connector-cpp/vcpkg.json +++ b/ports/mysql-connector-cpp/vcpkg.json @@ -1,14 +1,12 @@ { "name": "mysql-connector-cpp", - "version": "1.1.13", + "version": "8.0.30", "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.", "homepage": "https://github.com/mysql/mysql-connector-cpp", "license": null, - "supports": "!uwp", + "supports": "!uwp & !(windows & (arm | arm64))", "dependencies": [ - "boost-date-time", - "boost-thread", - "libmysql", + "openssl", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 212cf9b71023bd..8f42324d59604a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4881,7 +4881,7 @@ "port-version": 3 }, "mysql-connector-cpp": { - "baseline": "1.1.13", + "baseline": "8.0.30", "port-version": 0 }, "nameof": { diff --git a/versions/m-/mysql-connector-cpp.json b/versions/m-/mysql-connector-cpp.json index aa88ca9ccf2ada..147fc6e76caa41 100644 --- a/versions/m-/mysql-connector-cpp.json +++ b/versions/m-/mysql-connector-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9da49dfd9685485198c029c16da9f37b2336e93", + "version": "8.0.30", + "port-version": 0 + }, { "git-tree": "9189c43b6dc73ec3c3765d025e12297fd5a79d37", "version": "1.1.13", From 1eb4c7f6f3ad32905ad7d3f7227aad09ac87f443 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 3 Sep 2022 02:06:04 +0800 Subject: [PATCH 537/791] [Tesseract] add support [arm-osx] and [arm-linux] (#26420) * add arm-osx and arm-linux support * update version --- ports/tesseract/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/t-/tesseract.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/tesseract/vcpkg.json b/ports/tesseract/vcpkg.json index 04a1de7fb5461f..ffc6df5ebb963d 100644 --- a/ports/tesseract/vcpkg.json +++ b/ports/tesseract/vcpkg.json @@ -1,11 +1,11 @@ { "name": "tesseract", "version": "5.2.0", - "port-version": 1, + "port-version": 2, "description": "An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.", "homepage": "https://github.com/tesseract-ocr/tesseract", "license": "Apache-2.0", - "supports": "!(arm & (osx | linux))", + "supports": "!uwp", "dependencies": [ "curl", "leptonica", diff --git a/versions/baseline.json b/versions/baseline.json index 8f42324d59604a..9fc94aae5908b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7122,7 +7122,7 @@ }, "tesseract": { "baseline": "5.2.0", - "port-version": 1 + "port-version": 2 }, "tfhe": { "baseline": "1.0.1", diff --git a/versions/t-/tesseract.json b/versions/t-/tesseract.json index 2d99c2416c0c92..713e368b7facdf 100644 --- a/versions/t-/tesseract.json +++ b/versions/t-/tesseract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d9b7d5ba2e222ee4fb62d4d5f03992e9232a97d", + "version": "5.2.0", + "port-version": 2 + }, { "git-tree": "ea93f36603ca265da43ef28d6583871ef3d97b43", "version": "5.2.0", From f4b909297ac33cc2c966c4d914b65b99903dabdb Mon Sep 17 00:00:00 2001 From: Alexander Rozdaybeda Date: Fri, 2 Sep 2022 23:46:16 +0300 Subject: [PATCH 538/791] [curl] Add Unicode support (#25865) * Add Unicode support to Curl * fix curl version * increase port * Update ports/curl/vcpkg.json Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> * fix hash * remove error message * removed condition for windows * add ENABLE_UNICODE for windows Co-authored-by: alexander.rozdaybeda Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> --- ports/curl/portfile.cmake | 4 ++++ ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index f8a1f7e2b00442..5a1456268805cb 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -73,6 +73,10 @@ if(VCPKG_TARGET_IS_UWP) ) endif() +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DENABLE_UNICODE=ON) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 24b5adfcc7a40f..0f446b4aab2894 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curl", "version": "7.84.0", - "port-version": 1, + "port-version": 2, "description": "A library for transferring data with URLs", "homepage": "https://curl.se/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 9fc94aae5908b8..98609d319d3657 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1774,7 +1774,7 @@ }, "curl": { "baseline": "7.84.0", - "port-version": 1 + "port-version": 2 }, "curlpp": { "baseline": "2018-06-15", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 7099572d11c604..b86c7f7170d56f 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "588fa4742c417db9d7c0f89e652b618296388d1e", + "version": "7.84.0", + "port-version": 2 + }, { "git-tree": "4d64a4ac7f080159be045ccbf0a7fa81ef859cfa", "version": "7.84.0", From 707927374c5adc966ab441e4ae27911b8402e9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 2 Sep 2022 23:30:19 +0200 Subject: [PATCH 539/791] [shiftmedia-gnutls] new port (Windows fork of GnuTLS) (#18029) * [libgnutls] Add Windows support [libgnutls] update versions [libgnutls] fix *nix tarball URL [libgnutls] update versions [libgnutls] formatting [libgnutls] use less ambiguous variable for .pc substitution [libgnutls] update versions [libgnutls] fix static build [libgnutls] update versions [libgnutls] cleanup nettle patch [libgnutls] update versions [libgnutls] drop outdir.patch, use msbuild property instead [libgnutls] update versions [shiftmedia-libgnutls] use separate port for SMP fork [shiftmedia-libgnutls] update project name, remove non-Windows code * [shiftmedia-libgnutls] remove leftover option * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] add license * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] update license * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] update license * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] update license * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] also support UWP * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] fix supported platform * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] remove leftover warning * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] install includes instead of moving them around in buildtree * [shiftmedia-libgnutls] update versions * [shiftmedia-gnutls] use vcpkg_replace_string() instead patches; fix library name * [shiftmedia-gnutls] use Requires.private to locate gmp * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] msbuild adds a subfolder to OutDir on UWP * [shiftmedia-libgnutls] update versions * [shiftmedia-libgnutls] Windows implies UWP support Co-authored-by: Billy O'Neal * [shiftmedia-libgnutls] wrap paths in quotes Co-authored-by: Billy O'Neal * [shiftmedia-libgnutls] update version * [shiftmedia-libgnutls] make yasm tool host dep * [shiftmedia-libgnutls] update version Co-authored-by: Billy O'Neal --- .../external-libtasn1.patch | 91 +++++++++ ports/shiftmedia-libgnutls/pkgconfig.patch | 13 ++ ports/shiftmedia-libgnutls/portfile.cmake | 177 ++++++++++++++++++ ports/shiftmedia-libgnutls/vcpkg.json | 24 +++ versions/baseline.json | 4 + versions/s-/shiftmedia-libgnutls.json | 9 + 6 files changed, 318 insertions(+) create mode 100644 ports/shiftmedia-libgnutls/external-libtasn1.patch create mode 100644 ports/shiftmedia-libgnutls/pkgconfig.patch create mode 100644 ports/shiftmedia-libgnutls/portfile.cmake create mode 100644 ports/shiftmedia-libgnutls/vcpkg.json create mode 100644 versions/s-/shiftmedia-libgnutls.json diff --git a/ports/shiftmedia-libgnutls/external-libtasn1.patch b/ports/shiftmedia-libgnutls/external-libtasn1.patch new file mode 100644 index 00000000000000..5b2add92e11f73 --- /dev/null +++ b/ports/shiftmedia-libgnutls/external-libtasn1.patch @@ -0,0 +1,91 @@ +diff --git a/SMP/libgnutls.vcxproj.filters b/SMP/libgnutls.vcxproj.filters +index 5c4d1070d..df4aa2b9f 100644 +--- a/SMP/libgnutls.vcxproj.filters ++++ b/SMP/libgnutls.vcxproj.filters +@@ -1514,30 +1514,6 @@ + + Source Files\lib\nettle + +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- + + Source Files\lib\nettle\gost + +diff --git a/SMP/libgnutls_files.props b/SMP/libgnutls_files.props +index 8bc3e2406..10e113e93 100644 +--- a/SMP/libgnutls_files.props ++++ b/SMP/libgnutls_files.props +@@ -170,16 +170,6 @@ + + + +- +- +- +- +- $(IntDir)\tasn1_$(filename).obj +- +- +- +- +- + + + +diff --git a/SMP/libgnutls_winrt.vcxproj.filters b/SMP/libgnutls_winrt.vcxproj.filters +index 49778942d..804248636 100644 +--- a/SMP/libgnutls_winrt.vcxproj.filters ++++ b/SMP/libgnutls_winrt.vcxproj.filters +@@ -1514,30 +1514,6 @@ + + Source Files\lib\nettle + +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- +- +- Source Files\libtasn1 +- + + Source Files\lib\accelerated + diff --git a/ports/shiftmedia-libgnutls/pkgconfig.patch b/ports/shiftmedia-libgnutls/pkgconfig.patch new file mode 100644 index 00000000000000..3eecc76b6c8c47 --- /dev/null +++ b/ports/shiftmedia-libgnutls/pkgconfig.patch @@ -0,0 +1,13 @@ +diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in +index 7cdedda5..11785bcd 100644 +--- a/lib/gnutls.pc.in ++++ b/lib/gnutls.pc.in +@@ -18,7 +18,7 @@ Name: GnuTLS + Description: Transport Security Layer implementation for the GNU system + URL: https://www.gnutls.org/ + Version: @VERSION@ +-Libs: -L${libdir} -lgnutls ++Libs: -L${libdir} @GNUTLS_LIBS@ + Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ @GNUTLS_LIBS_PRIVATE@ + @GNUTLS_REQUIRES_PRIVATE@ + Cflags: -I${includedir} diff --git a/ports/shiftmedia-libgnutls/portfile.cmake b/ports/shiftmedia-libgnutls/portfile.cmake new file mode 100644 index 00000000000000..5676070784b573 --- /dev/null +++ b/ports/shiftmedia-libgnutls/portfile.cmake @@ -0,0 +1,177 @@ +set(PACKAGE_VERSION_MAJOR 3) +set(PACKAGE_VERSION_MINOR 7) +set(PACKAGE_VERSION_PATCH 6) +set(PACKAGE_VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}) + +set(GNULIB_REF "fb64a781") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ShiftMediaProject/gnutls + REF ${PACKAGE_VERSION} + SHA512 8a3ff480e065cf517468fac9d8d4474cfa6ed354fa83ae60de224580f359f8dcfbfed6cf640d33783779174ade0bca0fbe1c529097ee103af2b02546fc2acaec + HEAD_REF master + PATCHES + external-libtasn1.patch + pkgconfig.patch +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/devel/perlasm") + +vcpkg_download_distfile( + GNULIB_SNAPSHOT + URLS "https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=snapshot;h=${GNULIB_REF};sf=tgz" + FILENAME "gnulib-${GNULIB_REF}.tar.gz" + SHA512 6e534b3a623efa5f473977deeed4d24669ef0e0e3ac5fcadc88c5cf2d6ad0852a07c68cd70ac748d7f9a3793704ce1a54a7d17114458a8c1f2e42d410681c340 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH GNULIB_SOURCE_PATH + ARCHIVE "${GNULIB_SNAPSHOT}" + REF ${GNULIB_REF} +) + +file(REMOVE_RECURSE "${SOURCE_PATH}/gnulib") +file(RENAME "${GNULIB_SOURCE_PATH}" "${SOURCE_PATH}/gnulib") + +include("${CURRENT_HOST_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake") +yasm_tool_helper(OUT_VAR YASM) +file(TO_NATIVE_PATH "${YASM}" YASM) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(CONFIGURATION_RELEASE ReleaseDLL) + set(CONFIGURATION_DEBUG DebugDLL) +else() + set(CONFIGURATION_RELEASE Release) + set(CONFIGURATION_DEBUG Debug) +endif() + +if(VCPKG_TARGET_IS_UWP) + string(APPEND CONFIGURATION_RELEASE WinRT) + string(APPEND CONFIGURATION_DEBUG WinRT) +endif() + +set(_gnutlsproject "${SOURCE_PATH}/SMP/libgnutls.vcxproj") +file(READ "${_gnutlsproject}" _contents) +string(REPLACE [[]] + "" + _contents "${_contents}") +string(REPLACE [[]] + "" + _contents "${_contents}") +string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_HOST_INSTALLED_DIR}/share" _contents "${_contents}") # Above already +file(WRITE "${_gnutlsproject}" "${_contents}") + +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(RuntimeLibraryExt "") +else() + set(RuntimeLibraryExt "DLL") +endif() + +# patch output library file path and name +foreach(PROPS IN ITEMS +"${SOURCE_PATH}/SMP/smp_deps.props" +"${SOURCE_PATH}/SMP/smp_winrt_deps.props") +vcpkg_replace_string( + "${PROPS}" + [=[_winrt]=] + [=[]=] +) +vcpkg_replace_string( + "${PROPS}" + [=[lib$(RootNamespace)]=] + [=[$(RootNamespace)]=] +) +endforeach() + +# patch hogweed, gpm, nettle, zlib libraries file names; inject RuntimeLibrary property to control CRT linkage +foreach(VCXPROJ IN ITEMS +"${SOURCE_PATH}/SMP/libgnutls.vcxproj" +"${SOURCE_PATH}/SMP/libgnutls_winrt.vcxproj") +vcpkg_replace_string( + "${VCXPROJ}" + "_winrt.lib" + ".lib" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libhogweed" + "hogweed" +) +vcpkg_replace_string( + "${VCXPROJ}" + "hogweedd" + "hogweed" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libgmp" + "gmp" +) +vcpkg_replace_string( + "${VCXPROJ}" + "gmpd" + "gmp" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libnettle" + "nettle" +) +vcpkg_replace_string( + "${VCXPROJ}" + "nettled" + "nettle" +) +vcpkg_replace_string( + "${VCXPROJ}" + "libzlib" + "zlib" +) +vcpkg_replace_string( + "${VCXPROJ}" + [=[]=] + [=[$(RuntimeLibrary)]=] +) +endforeach() + +vcpkg_install_msbuild( + USE_VCPKG_INTEGRATION + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH SMP/libgnutls.sln + PLATFORM ${TRIPLET_SYSTEM_ARCH} + LICENSE_SUBPATH LICENSE + RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE} + DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG} + SKIP_CLEAN + OPTIONS /p:YasmPath="${YASM}" /p:OutDir=..\\msvc + OPTIONS_DEBUG /p:RuntimeLibrary=MultiThreadedDebug${RuntimeLibraryExt} + OPTIONS_RELEASE /p:RuntimeLibrary=MultiThreaded${RuntimeLibraryExt} +) + +get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME) +if(VCPKG_TARGET_IS_UWP) + set(WINRT_SUBFOLDER libgnutls_winrt) +endif() +file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/${WINRT_SUBFOLDER}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") + +set(VERSION ${PACKAGE_VERSION}) +set(GNUTLS_REQUIRES_PRIVATE "Requires.private: gmp, nettle, hogweed, libtasn1") +set(GNUTLS_LIBS_PRIVATE "-lcrypt32 -lws2_32 -lkernel32 -lncrypt") + +set(prefix "${CURRENT_INSTALLED_DIR}") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/include") +set(GNUTLS_LIBS "-lgnutls") +configure_file("${SOURCE_PATH}/lib/gnutls.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gnutls.pc" @ONLY) + +set(prefix "${CURRENT_INSTALLED_DIR}/debug") +set(exec_prefix "\${prefix}") +set(libdir "\${prefix}/lib") +set(includedir "\${prefix}/../include") +set(GNUTLS_LIBS "-lgnutlsd") +configure_file("${SOURCE_PATH}/lib/gnutls.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gnutls.pc" @ONLY) + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() diff --git a/ports/shiftmedia-libgnutls/vcpkg.json b/ports/shiftmedia-libgnutls/vcpkg.json new file mode 100644 index 00000000000000..b208408b39930a --- /dev/null +++ b/ports/shiftmedia-libgnutls/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "shiftmedia-libgnutls", + "version": "3.7.6", + "description": "Unofficial GnuTLS fork with added custom native Visual Studio project build tools. ", + "homepage": "https://github.com/ShiftMediaProject/gnutls", + "license": "LGPL-2.1-only", + "supports": "windows", + "dependencies": [ + "gettext", + "gmp", + "libidn2", + "libtasn1", + "nettle", + { + "name": "vs-yasm", + "host": true + }, + { + "name": "yasm-tool-helper", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 98609d319d3657..bf96f198a7dcfc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6680,6 +6680,10 @@ "baseline": "1.10.1", "port-version": 0 }, + "shiftmedia-libgnutls": { + "baseline": "3.7.6", + "port-version": 0 + }, "shiva": { "baseline": "1.0", "port-version": 5 diff --git a/versions/s-/shiftmedia-libgnutls.json b/versions/s-/shiftmedia-libgnutls.json new file mode 100644 index 00000000000000..82eeb9204c1432 --- /dev/null +++ b/versions/s-/shiftmedia-libgnutls.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c204a889320c521ef348d1108a3f665be0bbe07a", + "version": "3.7.6", + "port-version": 0 + } + ] +} From 910f20fefee34c974336a34b29d64424090c5275 Mon Sep 17 00:00:00 2001 From: Jianshen Liu <468515+ljishen@users.noreply.github.com> Date: Fri, 2 Sep 2022 15:16:09 -0700 Subject: [PATCH 540/791] [dpdk] Fix the hash of the downloaded archive (#26657) --- ports/dpdk/portfile.cmake | 2 +- ports/dpdk/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/dpdk.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/dpdk/portfile.cmake b/ports/dpdk/portfile.cmake index bc690c2bead87e..e940011bd83694 100644 --- a/ports/dpdk/portfile.cmake +++ b/ports/dpdk/portfile.cmake @@ -29,7 +29,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DPDK/dpdk REF v${PORT_VERSION} - SHA512 ff80a9f87e71cd743ea5e62f515849bc6746fe7496a0d4b63ecf2bfe0d88da74f0e6c0257c07838c1f9ff41abd81827932b97731fb0fce60d56a8bab7e32347c + SHA512 86892f5f61ee8f7ccd61c47767515603683d0e7a217389490a9a5d4ac87b42557572113f4cd56425fef212eff5715095a34ed3c03a3ce6351ffdcacb850b0851 HEAD_REF main PATCHES enable-either-static-or-shared-build.patch diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json index 76407147d8c1e1..ff0b7586a959b6 100644 --- a/ports/dpdk/vcpkg.json +++ b/ports/dpdk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dpdk", "version-string": "22.07", + "port-version": 1, "description": "A set of libraries and drivers for fast packet processing", "homepage": "https://www.dpdk.org/", "documentation": "https://doc.dpdk.org/guides/index.html", diff --git a/versions/baseline.json b/versions/baseline.json index bf96f198a7dcfc..463118bf970129 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1978,7 +1978,7 @@ }, "dpdk": { "baseline": "22.07", - "port-version": 0 + "port-version": 1 }, "dpp": { "baseline": "10.0.17", diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json index 1799a6e0b06645..fee3adc602aa4d 100644 --- a/versions/d-/dpdk.json +++ b/versions/d-/dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a813d878c38c9649c599c5b9d35572399655fbf", + "version-string": "22.07", + "port-version": 1 + }, { "git-tree": "f09ca3077d7bc3f4ceaf558cdb9518ab94cbbe18", "version-string": "22.07", From 927006b24c3a28dfd8aa0ec5f8ce43098480a7f1 Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Fri, 2 Sep 2022 15:20:45 -0700 Subject: [PATCH 541/791] openexr is passsing for arm64-windows (#26659) --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 68a97129e85193..657b73dfd434a5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -809,7 +809,6 @@ opencv3:x64-windows-static-md = skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail -openexr:arm64-windows=fail openexr:arm-uwp=fail openexr:x64-uwp=fail opengl:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 From 600f89f477cf4b171bd63523bb24c39010e30c0a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 6 Sep 2022 14:14:36 -0400 Subject: [PATCH 542/791] [Azure Storage] Update to Sept Release (#26696) * [azure-storage-common-cpp] Update to 12.3.0 ## 12.3.0 (2022-09-06) ### Features Added - Features in `12.3.0-beta.1` are now generally available. * [azure-storage-blobs-cpp] Update to 12.6.0 ## 12.6.0 (2022-09-06) ### Features Added - Features in `12.6.0.beta.1` are now generally available. ### Bugs Fixed - Empty file or existing file won't be created/overwritten if the blob to be downloaded doesn't exist. --- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 4 ++-- ports/azure-storage-common-cpp/portfile.cmake | 4 ++-- ports/azure-storage-common-cpp/vcpkg.json | 4 ++-- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 8aba22e22b4917..5f8d7e26ff3ea7 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/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.5.0 - SHA512 84553588dae919691bd5548c8957d0f3a98cddc8d8879f7dc6d2aa4c06661e2fa5de8c77cb9ca7517cb2024fc3d7433933d3f34b5bc7225ee4855cbf4f3548df + REF azure-storage-blobs_12.6.0 + SHA512 cd8164410472587df2ca112abdb89d9e3baa730f1f3166979f669322b1f79a6111bd673061f58de44a6b1231dce55651baa72a869f42302ccb1360fabaaade04 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index f253d39633fd1c..6d375116dbe492 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.5.0", + "version-semver": "12.6.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.4" + "version>=": "12.3.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 8e708dee97ac95..6225a31ea6ceda 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.2.4 - SHA512 850588e1edcac6cc861d8ce4fe0e726f540e23f0c4839930ca229da27fc623559f3662ada238d0756ce14341729e34669e1278d6943caa9d3a902119c0a40b7f + REF azure-storage-common_12.3.0 + SHA512 9d3d24f24acc1bf5e07d238bae44fd510bebc7b38e7d68ab4d26ac1765cc38f1cd7bc08e1f77f61727d998c37a58d1a1a09762c9a824db770ecdc5c2a22069d2 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 448f7f7bc36440..ec2e2bcc107e6c 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.2.4", + "version-semver": "12.3.0", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.5.0" + "version>=": "1.7.1" }, { "name": "libxml2", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index be74490a02215c..6c37064d8b6433 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c715b7df779d48070ba729fd20ffcad27267a7bc", + "version-semver": "12.6.0", + "port-version": 0 + }, { "git-tree": "7120a5be966cbf0a79ac6c1efca6ce43c7818d75", "version-semver": "12.5.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index c34c1d88016404..e4dbb5378fc264 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86ad9dc004e0f6fe2a87158ae3aae15bf7bb7033", + "version-semver": "12.3.0", + "port-version": 0 + }, { "git-tree": "fdc5c496fd571985967a900838e181cdb04d318b", "version-semver": "12.2.4", diff --git a/versions/baseline.json b/versions/baseline.json index 463118bf970129..d56b9780b397ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -369,11 +369,11 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.5.0", + "baseline": "12.6.0", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.2.4", + "baseline": "12.3.0", "port-version": 0 }, "azure-storage-cpp": { From bdb28dc4f2bb84be659860672db85f88c77f0b82 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 6 Sep 2022 11:15:29 -0700 Subject: [PATCH 543/791] [vcpkg baseline][dpp] Add DISABLE_PARALLEL_CONFIGURE (#26687) --- ports/dpp/portfile.cmake | 1 + ports/dpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index 15e38f5abd6c03..b515d8d464e8bb 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE ) vcpkg_cmake_install() diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index b1758c0573b64b..761cbd128108ff 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dpp", "version": "10.0.17", + "port-version": 1, "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d56b9780b397ec..5d014c728a5952 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "dpp": { "baseline": "10.0.17", - "port-version": 0 + "port-version": 1 }, "draco": { "baseline": "1.5.2", diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index 766eae41d6f7a1..849266ceedc164 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be573eeac83a526231011339e0a64c28b513bbd5", + "version": "10.0.17", + "port-version": 1 + }, { "git-tree": "aee1785670d15751e08e0fee3426faf2d8559ee9", "version": "10.0.17", From 473e07f877b037498ff4536278396ec933965eb0 Mon Sep 17 00:00:00 2001 From: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Date: Tue, 6 Sep 2022 20:17:45 +0200 Subject: [PATCH 544/791] [cpr] Update to 1.9.2 (#26689) * [cpr] update to 1.9.2 * [cpr] update to 1.9.2 * [cpr] update to 1.9.2 * [cpr] cpr.json git-tree update --- ports/cpr/portfile.cmake | 4 ++-- ports/cpr/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/cpr.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 83247bc491c520..2cfe4218b5d5fe 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libcpr/cpr - REF 871ed52d350214a034f6ef8a3b8f51c5ce1bd400 #v1.9.0 - SHA512 2f0c38e27597cf33457ca5613ead742da6ecea47674542e7762b2206e58226f21070be288b1bc4ff7af5d01e0f1b9f9548daffc5937559d986c5205b7dbc41f0 + REF f88fd7737de3e640c61703eb57a0fa0ce00c60cd #v1.9.2 + SHA512 9c336663c2128f3aa17db2c8fb221ef31b53e9cc4b0e1ed55c9b17e865216372410218499ae76261774997b7ba83812034a70c198a9d59bc6e025a3d8c74b74c HEAD_REF master PATCHES 001-cpr-config.patch diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 3f292c49e50c03..f1d5a511f40394 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cpr", - "version-semver": "1.9.0", - "port-version": 1, + "version-semver": "1.9.2", "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", "homepage": "https://github.com/libcpr/cpr", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 5d014c728a5952..5b8a74c4ff7d84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1685,8 +1685,8 @@ "port-version": 0 }, "cpr": { - "baseline": "1.9.0", - "port-version": 1 + "baseline": "1.9.2", + "port-version": 0 }, "cpu-features": { "baseline": "0.6.0", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 465eafdddef812..5d4792c1aa03e0 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43794d1334bdf904800cc65ef0982ad4fc33d1e4", + "version-semver": "1.9.2", + "port-version": 0 + }, { "git-tree": "85bce5170656abc1bf594034c85f406d996776b1", "version-semver": "1.9.0", From b9bfab040665e628897c7847108f6989cc0cfb1e Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 6 Sep 2022 14:19:58 -0400 Subject: [PATCH 545/791] [google-cloud-cpp] update to latest release (v2.2.0) (#26647) --- ports/google-cloud-cpp/portfile.cmake | 4 +- ports/google-cloud-cpp/vcpkg.json | 63 ++++++++++++++++++++++++++- versions/baseline.json | 4 +- versions/g-/google-cloud-cpp.json | 5 +++ 4 files changed, 70 insertions(+), 6 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 8d76f74e033f5f..6dc05bf8b9a56d 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v2.1.0 - SHA512 a1c4a54b420e64bd12c4a85943c6617b310dff359f9b1b744fcaf7ece92c9327d77ab36b6dacf94b3e2b3d6c2a183a46089437736c34e1af55e3c319544c14b3 + REF v2.2.0 + SHA512 7f51f993464ff72e34a39ba0095774ba71b51203aba82953aaedf9c6eb610efe00d1e798f848575e7e526cf1e5de512bf2024adce50506bab429ac765429159c HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 1a52b2a2e02bb6..a8143fc4f56390 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.1.0", - "port-version": 2, + "version": "2.2.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -135,6 +134,30 @@ } ] }, + "baremetalsolution": { + "description": "Bare Metal Solution API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, + "beyondcorp": { + "description": "BeyondCorp API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "bigquery": { "description": "The Google Cloud BigQuery C++ client library", "dependencies": [ @@ -596,6 +619,18 @@ } ] }, + "optimization": { + "description": "Cloud Optimization API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "orgpolicy": { "description": "Organization Policy API C++ Client Library", "dependencies": [ @@ -728,6 +763,18 @@ } ] }, + "run": { + "description": "Cloud Run Admin API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "scheduler": { "description": "Cloud Scheduler API C++ Client Library", "dependencies": [ @@ -945,6 +992,18 @@ } ] }, + "video": { + "description": "Video Services C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "videointelligence": { "description": "Cloud Video Intelligence API C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5b8a74c4ff7d84..11f71eab505f22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2661,8 +2661,8 @@ "port-version": 1 }, "google-cloud-cpp": { - "baseline": "2.1.0", - "port-version": 2 + "baseline": "2.2.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index be5201221abc80..7f58bd91650003 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47537b3b241e2f6a757553ad9475c44c7e13eb01", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "8e675db53dae8b88be806ecd93411810ee8048d7", "version": "2.1.0", From 8f3c8d044fa6657777f8dc8f511d6264cf6bc69f Mon Sep 17 00:00:00 2001 From: Nicholas Hayes <0xC0000054@users.noreply.github.com> Date: Tue, 6 Sep 2022 12:22:54 -0600 Subject: [PATCH 546/791] [libheif] Update to version 1.13.0 (#26662) --- ports/libheif/portfile.cmake | 5 +++-- ports/libheif/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libheif.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index fe565b78741e0d..3dd1631c20c2a9 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF 56c8a2613370562fc330af2c70c1510aa5fd9ff6 #v1.12.0 - SHA512 11ac7f32d1f49963046b1a4479a41f39004475211563ba7f41b2398f07f7b4d90339ea663e528b3cc80deeef1fff374987208d48b447116a806564ef05487e97 + REF 5fb52b6134d5e034b51637a86c6e8a7418b35df1 #v1.13.0 + SHA512 e1ebd5eb7ae436a604ae3bb50ea4d53b8efb97388081a0876c161927a8b31c48c03899075423048d3f10055332bf7f3472bb8a06b6d32312de1d88fbda760421 HEAD_REF master PATCHES gdk-pixbuf.patch @@ -33,5 +33,6 @@ endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "#ifdef LIBHEIF_EXPORTS" "#if 0") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index d9ddc6b5c4e8d7..8acc80c86cdff3 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libheif", - "version": "1.12.0", - "port-version": 4, + "version": "1.13.0", "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "license": "LGPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 11f71eab505f22..b1075a6fd6dc0e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3729,8 +3729,8 @@ "port-version": 3 }, "libheif": { - "baseline": "1.12.0", - "port-version": 4 + "baseline": "1.13.0", + "port-version": 0 }, "libhsplasma": { "baseline": "2022-05-19", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 0b643536a5b0cf..bfd7edebe6dbc5 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0876b38db237beed53c8edd6ebe83622a3771287", + "version": "1.13.0", + "port-version": 0 + }, { "git-tree": "f183481e325abb8be75988c2061260ebf60ad7d4", "version": "1.12.0", From 31c43c228ce0879a0b49d5e081dddb4e4827a80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horv=C3=A1t?= Date: Tue, 6 Sep 2022 20:25:54 +0200 Subject: [PATCH 547/791] [igraph] update to 0.9.10 (#26656) * [igraph] update to 0.9.10 * [igraph] x-add-version --- ports/igraph/portfile.cmake | 6 +++--- ports/igraph/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/igraph.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 6fc9619073ac41..53341feaca2246 100644 --- a/ports/igraph/portfile.cmake +++ b/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.9/igraph-0.9.9.tar.gz" - FILENAME "igraph-0.9.9.tar.gz" - SHA512 bbfe8b76e7806ba4c70cbf0dc5ce6724f1805383c1fb6ac05c5cd1bfc829682ff2184e4f836886a562851d1af1384fd7cccb5027c4aa0deadd0e35d50aabb451 + URLS "https://github.com/igraph/igraph/releases/download/0.9.10/igraph-0.9.10.tar.gz" + FILENAME "igraph-0.9.10.tar.gz" + SHA512 e5306b4e546ce5e7854cb87d6e2c0b4250976ccdfdd3c81e8834a92432f6e3771215ceb7da74ce460c7bdbc191c3bbadd775de7b0d80e7daef3802741be81fb3 ) vcpkg_extract_source_archive_ex( diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index f7c08f3693a807..26b1e46dc4a787 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "igraph", - "version": "0.9.9", + "version": "0.9.10", "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", diff --git a/versions/baseline.json b/versions/baseline.json index b1075a6fd6dc0e..5df4e7dedc4736 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2989,7 +2989,7 @@ "port-version": 4 }, "igraph": { - "baseline": "0.9.9", + "baseline": "0.9.10", "port-version": 0 }, "iir1": { diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index e5ffcb6a6a37b7..4489b103fde159 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9be9a85091b6cb99b14f88bfcbc205e175ead0f6", + "version": "0.9.10", + "port-version": 0 + }, { "git-tree": "c374fc0b09a493a6afbd4c009dd43763b2a9132f", "version": "0.9.9", From bc19f2558562c14c1977ea8573b891f9ef96322a Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 7 Sep 2022 03:42:12 +0800 Subject: [PATCH 548/791] [mysql-connector-cpp] Add correct target namespace (#26686) * add correct target namespace * update version * correct namespace * overwrite version * format patch * update version --- ports/mysql-connector-cpp/export-targets.patch | 14 +++++++++----- ports/mysql-connector-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mysql-connector-cpp.json | 5 +++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ports/mysql-connector-cpp/export-targets.patch b/ports/mysql-connector-cpp/export-targets.patch index 4cafe8ba2976c3..75c85402442f1e 100644 --- a/ports/mysql-connector-cpp/export-targets.patch +++ b/ports/mysql-connector-cpp/export-targets.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index e734714..6f00595 100644 +index e734714..6d665dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -397,7 +397,7 @@ add_subdirectory(devapi) @@ -11,10 +11,11 @@ index e734714..6f00595 100644 # -@@ -473,31 +473,23 @@ set_target_properties(connector PROPERTIES +@@ -472,32 +472,23 @@ set_target_properties(connector PROPERTIES + SOVERSION "${ABI_VERSION_MAJOR}" ) - +- -install(TARGETS connector - CONFIGURATIONS Release RelWithDebInfo - ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev @@ -49,7 +50,7 @@ index e734714..6f00595 100644 COMPONENT Debuginfo ) -@@ -604,3 +596,12 @@ endif() +@@ -604,3 +595,15 @@ endif() show_config_options() @@ -61,5 +62,8 @@ index e734714..6f00595 100644 + INSTALL_DESTINATION "share/unofficial-mysql-connector-cpp" +) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mysql-connector-cpp-config.cmake" DESTINATION "share/unofficial-mysql-connector-cpp") -+install(EXPORT unofficial-mysql-connector-cpp-targets DESTINATION share/unofficial-mysql-connector-cpp) ++install(EXPORT unofficial-mysql-connector-cpp-targets ++ NAMESPACE unofficial::mysql-connector-cpp:: ++ DESTINATION share/unofficial-mysql-connector-cpp ++) \ No newline at end of file diff --git a/ports/mysql-connector-cpp/vcpkg.json b/ports/mysql-connector-cpp/vcpkg.json index 93f91f2586eb3c..76c7949be8269d 100644 --- a/ports/mysql-connector-cpp/vcpkg.json +++ b/ports/mysql-connector-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mysql-connector-cpp", "version": "8.0.30", + "port-version": 1, "description": "This is a release of MySQL Connector/C++, the C++ interface for communicating with MySQL servers.", "homepage": "https://github.com/mysql/mysql-connector-cpp", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 5df4e7dedc4736..081f9fd433a2a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4882,7 +4882,7 @@ }, "mysql-connector-cpp": { "baseline": "8.0.30", - "port-version": 0 + "port-version": 1 }, "nameof": { "baseline": "0.10.2", diff --git a/versions/m-/mysql-connector-cpp.json b/versions/m-/mysql-connector-cpp.json index 147fc6e76caa41..8dd35179ffa2d4 100644 --- a/versions/m-/mysql-connector-cpp.json +++ b/versions/m-/mysql-connector-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cb6021de557d4669a9483690da1500b2b83ba26", + "version": "8.0.30", + "port-version": 1 + }, { "git-tree": "f9da49dfd9685485198c029c16da9f37b2336e93", "version": "8.0.30", From 6de11d57ab82671936aa3581e50f3cd58246f424 Mon Sep 17 00:00:00 2001 From: SunBlack Date: Tue, 6 Sep 2022 21:45:36 +0200 Subject: [PATCH 549/791] [realsense2] Update version to v2.51.1 (#26652) Co-authored-by: Heiko Thiel --- ports/realsense2/portfile.cmake | 4 ++-- ports/realsense2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/realsense2.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index e9ab6c89b8995d..30c26ff17ec88c 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF v2.50.0 - SHA512 ede964a5d5d7c70ff69b9d19e72ed2572f6d28c922cccae6d805ce72115b9d09d3b57d83163192aacc45856fe145d745472df4ca0053a41c65c175434709e3f0 + REF v2.51.1 + SHA512 e03a0188f11634ba645f321f190758807670fcaeaa2695c1d1ddc4585e43c2b00ca42b4e820b07f5e0c1ee7c026347b3802d4a86717a3d0500c359c08494aa32 HEAD_REF master PATCHES fix_openni2.patch diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index 4414ef1af99447..61336816b7e7d8 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "realsense2", - "version": "2.50.0", - "port-version": 1, + "version": "2.51.1", "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 081f9fd433a2a3..bf4a49b7669161 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6329,8 +6329,8 @@ "port-version": 3 }, "realsense2": { - "baseline": "2.50.0", - "port-version": 1 + "baseline": "2.51.1", + "port-version": 0 }, "recast": { "baseline": "1.5.1", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index 8a9edfebcc38ca..be6b0193598e29 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdb245079161fee11eba3127b11c27e539c8a13d", + "version": "2.51.1", + "port-version": 0 + }, { "git-tree": "1b967b8979ae93b95b16a7021348e04f534f28c0", "version": "2.50.0", From 33cd8da12d7cc49428489d36a69033c640ae5a57 Mon Sep 17 00:00:00 2001 From: An Tao Date: Wed, 7 Sep 2022 03:46:47 +0800 Subject: [PATCH 550/791] [drogon] Update to 1.8.0 (#26639) * [drogon] Update to 1.8.0 * fix a confilict with hiredis --- ports/drogon/portfile.cmake | 9 ++--- ports/drogon/redis.patch | 66 +++++++++++++++++++++++++++++++ ports/drogon/static-brotli.patch | 17 -------- ports/drogon/use-libmariadb.patch | 31 --------------- ports/drogon/vcpkg.json | 2 +- ports/drogon/vcpkg.patch | 3 +- versions/baseline.json | 2 +- versions/d-/drogon.json | 5 +++ 8 files changed, 79 insertions(+), 56 deletions(-) create mode 100644 ports/drogon/redis.patch delete mode 100644 ports/drogon/static-brotli.patch delete mode 100644 ports/drogon/use-libmariadb.patch diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 4f24228c3e34ec..ad7b310a352daf 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.7.5 - SHA512 8be77961026d13b55dbfcc2e43972b4fb8f1cd9a6bfb8098d5bdfc8b60ff67c2d3ede4bdb5815614a8233dc184cbf3aa363a9d33eed96b9f748544e20b15f2c7 + REF v1.8.0 + SHA512 a834d937e3719059223d9bf19d777dbc92eaf09c5c9c44b5a742bfefcbcd95a146a6568cef8c058050fb87e330f221434ffe784dfa29a49de12b031f86ab1a33 HEAD_REF master PATCHES vcpkg.patch drogon_config.patch - static-brotli.patch - use-libmariadb.patch + redis.patch ) vcpkg_check_features( @@ -29,7 +28,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS - -DBUILD_DROGON_SHARED=${BUILD_DROGON_SHARED} + -DBUILD_SHARED_LIBS=${BUILD_DROGON_SHARED} -DBUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON ${FEATURE_OPTIONS} diff --git a/ports/drogon/redis.patch b/ports/drogon/redis.patch new file mode 100644 index 00000000000000..1c54e1166fc745 --- /dev/null +++ b/ports/drogon/redis.patch @@ -0,0 +1,66 @@ +diff --git a/nosql_lib/redis/src/RedisClientImpl.cc b/nosql_lib/redis/src/RedisClientImpl.cc +index 15fa74b..b2f9ac1 100644 +--- a/nosql_lib/redis/src/RedisClientImpl.cc ++++ b/nosql_lib/redis/src/RedisClientImpl.cc +@@ -12,6 +12,7 @@ + * + */ + ++#include "RedisConnection.h" + #include "RedisClientImpl.h" + #include "RedisTransactionImpl.h" + #include "../../lib/src/TaskTimeoutFlag.h" +diff --git a/nosql_lib/redis/src/RedisClientImpl.h b/nosql_lib/redis/src/RedisClientImpl.h +index d84cfab..e7c8fab 100644 +--- a/nosql_lib/redis/src/RedisClientImpl.h ++++ b/nosql_lib/redis/src/RedisClientImpl.h +@@ -13,7 +13,6 @@ + */ + #pragma once + +-#include "RedisConnection.h" + #include + #include + #include +@@ -26,6 +25,8 @@ namespace drogon + { + namespace nosql + { ++class RedisConnection; ++using RedisConnectionPtr = std::shared_ptr; + class RedisClientImpl final + : public RedisClient, + public trantor::NonCopyable, +diff --git a/nosql_lib/redis/src/RedisClientLockFree.cc b/nosql_lib/redis/src/RedisClientLockFree.cc +index 2f27b64..fe225b2 100644 +--- a/nosql_lib/redis/src/RedisClientLockFree.cc ++++ b/nosql_lib/redis/src/RedisClientLockFree.cc +@@ -12,6 +12,7 @@ + * + */ + ++#include "RedisConnection.h" + #include "RedisClientLockFree.h" + #include "RedisTransactionImpl.h" + #include "../../lib/src/TaskTimeoutFlag.h" +diff --git a/nosql_lib/redis/src/RedisClientLockFree.h b/nosql_lib/redis/src/RedisClientLockFree.h +index 00bc6c1..136f315 100644 +--- a/nosql_lib/redis/src/RedisClientLockFree.h ++++ b/nosql_lib/redis/src/RedisClientLockFree.h +@@ -13,7 +13,6 @@ + */ + #pragma once + +-#include "RedisConnection.h" + #include + #include + #include +@@ -26,6 +25,8 @@ namespace drogon + { + namespace nosql + { ++class RedisConnection; ++using RedisConnectionPtr = std::shared_ptr; + class RedisClientLockFree final + : public RedisClient, + public trantor::NonCopyable, diff --git a/ports/drogon/static-brotli.patch b/ports/drogon/static-brotli.patch deleted file mode 100644 index a44a40cc59ebd9..00000000000000 --- a/ports/drogon/static-brotli.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake -index da5b6d2..6b631ab 100755 ---- a/cmake_modules/FindBrotli.cmake -+++ b/cmake_modules/FindBrotli.cmake -@@ -23,9 +23,9 @@ include(FindPackageHandleStandardArgs) - - find_path(BROTLI_INCLUDE_DIR "brotli/decode.h") - --find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon) --find_library(BROTLIDEC_LIBRARY NAMES brotlidec) --find_library(BROTLIENC_LIBRARY NAMES brotlienc) -+find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static) -+find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static) -+find_library(BROTLIENC_LIBRARY NAMES brotlienc brotlienc-static) - - find_package_handle_standard_args(Brotli - REQUIRED_VARS diff --git a/ports/drogon/use-libmariadb.patch b/ports/drogon/use-libmariadb.patch deleted file mode 100644 index 71ca89892f1d73..00000000000000 --- a/ports/drogon/use-libmariadb.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 146d2b8..f180498 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -360,12 +360,8 @@ endif (BUILD_POSTGRESQL) - - if (BUILD_MYSQL) - # Find mysql, only mariadb client library is supported -- find_package(MySQL QUIET) - find_package(unofficial-libmariadb QUIET) -- if (MySQL_FOUND) -- target_link_libraries(${PROJECT_NAME} PRIVATE MySQL_lib) -- set(DROGON_FOUND_MYSQL TRUE) -- elseif (unofficial-libmariadb_FOUND) -+ if (unofficial-libmariadb_FOUND) - target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::libmariadb) - set(DROGON_FOUND_MYSQL TRUE) - endif () -diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in -index 199cfb9..a3fbde0 100644 ---- a/cmake/templates/DrogonConfig.cmake.in -+++ b/cmake/templates/DrogonConfig.cmake.in -@@ -25,7 +25,7 @@ if(@SQLite3_FOUND@) - find_dependency(SQLite3) - endif() - if(@MySQL_FOUND@) --find_dependency(MySQL) -+find_dependency(unofficial-libmariadb CONFIG REQUIRED) - endif() - if(@Boost_FOUND@) - find_dependency(Boost) diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index f6e70f75dc9963..a5fd7284ea07da 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drogon", - "version-semver": "1.7.5", + "version-semver": "1.8.0", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch index 489acd938926ab..326fcaa9906ea3 100644 --- a/ports/drogon/vcpkg.patch +++ b/ports/drogon/vcpkg.patch @@ -39,11 +39,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt if (BUILD_MYSQL) diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt +index 9f2f1e7..09871f8 100755 --- a/drogon_ctl/CMakeLists.txt +++ b/drogon_ctl/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable(_drogon_ctl target_link_libraries(_drogon_ctl ${PROJECT_NAME}) - if (WIN32 AND BUILD_DROGON_SHARED) + if (WIN32 AND BUILD_SHARED_LIBS) set(DROGON_FILE $) - set(TRANTOR_FILE $) + set(TRANTOR_FILE $) diff --git a/versions/baseline.json b/versions/baseline.json index bf4a49b7669161..1158e1a15f62c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1993,7 +1993,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.7.5", + "baseline": "1.8.0", "port-version": 0 }, "dstorage": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 7e0e9d97fe6c0b..fd90e6ffcac2a5 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27ee8227ae9871ffc307380b209f9dbe04de8801", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba", "version-semver": "1.7.5", From c382312bed3da7be96bdab0f7426eaee1b3e0460 Mon Sep 17 00:00:00 2001 From: Bert Huijben Date: Tue, 6 Sep 2022 21:50:48 +0200 Subject: [PATCH 551/791] [proj] Upgrade to 9.1.0 (#26649) --- ports/proj/fix-proj4-targets-cmake.patch | 6 +++--- ports/proj/portfile.cmake | 6 ++---- ports/proj/remove-doc.patch | 2 +- ports/proj/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/proj.json | 5 +++++ 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ports/proj/fix-proj4-targets-cmake.patch b/ports/proj/fix-proj4-targets-cmake.patch index a6ed22b38bae7a..8f5f625d96e09f 100644 --- a/ports/proj/fix-proj4-targets-cmake.patch +++ b/ports/proj/fix-proj4-targets-cmake.patch @@ -43,11 +43,11 @@ index 7d736d129..2be8f8be9 100644 message(SEND_ERROR "curl dependency not found!") endif() diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in -index 23f997abd..8baef00f0 100644 +index 7d5579ae..0cf96252 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in -@@ -9,6 +9,13 @@ - # @PROJECT_VARIANT_NAME@_VERSION = 4.9.1 (for example) +@@ -12,6 +12,13 @@ if(@PROJECT_VARIANT_NAME@ STREQUAL "PROJ4") + endif() include(CMakeFindDependencyMacro) +cmake_policy(PUSH) diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake index 8435134f0c39bb..36c60274b8bd5f 100644 --- a/ports/proj/portfile.cmake +++ b/ports/proj/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 9.0.1 - SHA512 b92a196e6801dd8d77e6c2131e15a392077e8e049a6d9befdb39ee035a3cca5a725b95196b29a4c5d7bad4d826a285e40abc3fdc040b5e11ede5c04ba4f6dbb5 + REF 9.1.0 + SHA512 0a0c887e14dc4dddc8ea3d1de01683cd81d9d6cc5788601aa224e1fecf46af10fb289e7260547431b35e4b771b020feccf04101135b86c6343221c8f446a766b HEAD_REF master PATCHES fix-win-output-name.patch @@ -32,8 +32,6 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DNLOHMANN_JSON=external - -DPROJ_LIB_SUBDIR=lib - -DPROJ_INCLUDE_SUBDIR=include -DPROJ_DATA_SUBDIR=share/${PORT}/data -DBUILD_TESTING=OFF "-DEXE_SQLITE3=${EXE_SQLITE3}" diff --git a/ports/proj/remove-doc.patch b/ports/proj/remove-doc.patch index 9108549857977c..725b5151aaddb2 100644 --- a/ports/proj/remove-doc.patch +++ b/ports/proj/remove-doc.patch @@ -14,7 +14,7 @@ index 4c9744e6..a6d5e4eb 100644 -set(docfiles COPYING NEWS AUTHORS) -install(FILES ${docfiles} -- DESTINATION "${DOCDIR}") +- DESTINATION ${CMAKE_INSTALL_DOCDIR}) + ################################################################################ diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json index dfad1233fd1a17..77f6414d39ca61 100644 --- a/ports/proj/vcpkg.json +++ b/ports/proj/vcpkg.json @@ -1,7 +1,6 @@ { "name": "proj", - "version": "9.0.1", - "port-version": 1, + "version": "9.1.0", "description": "PROJ library for cartographic projections", "homepage": "https://proj.org/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1158e1a15f62c5..8d5939a689329e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5737,8 +5737,8 @@ "port-version": 1 }, "proj": { - "baseline": "9.0.1", - "port-version": 1 + "baseline": "9.1.0", + "port-version": 0 }, "proj4": { "baseline": "8.9.9", diff --git a/versions/p-/proj.json b/versions/p-/proj.json index 8fb1570448a761..7ca1c2bbf8ca02 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c8c2418c56d4f5b5dfd6e1d8e95b008f03ea63f", + "version": "9.1.0", + "port-version": 0 + }, { "git-tree": "d533a2d58a17e3074d52ec045604b32ed049eacb", "version": "9.0.1", From 1912e1a397ac4f79fc51e4ed2190de25278d31b8 Mon Sep 17 00:00:00 2001 From: Maximilian Downey Twiss <64618338+Zopolis4@users.noreply.github.com> Date: Wed, 7 Sep 2022 05:52:35 +1000 Subject: [PATCH 552/791] [cubeb] Add new port (#26648) --- ports/cubeb/portfile.cmake | 23 +++++++++++++++++++++++ ports/cubeb/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/cubeb.json | 9 +++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/cubeb/portfile.cmake create mode 100644 ports/cubeb/vcpkg.json create mode 100644 versions/c-/cubeb.json diff --git a/ports/cubeb/portfile.cmake b/ports/cubeb/portfile.cmake new file mode 100644 index 00000000000000..28133823ae5781 --- /dev/null +++ b/ports/cubeb/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mozilla/cubeb + REF dc511c6b3597b6384d28949285b9289e009830ea + SHA512 a4ccd3f0a156db4e2e75a8d231e95a08d555390571551cb3e92c71cdee46dc74dc66b5272fda4b5f1f083b92672b360152cefd38be242f238fe802acc1ea17e9 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DUSE_SANITIZERS=OFF + -DBUILD_TESTS=OFF + -DBUILD_TOOLS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cubeb) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/cubeb/vcpkg.json b/ports/cubeb/vcpkg.json new file mode 100644 index 00000000000000..dc6e135f00423e --- /dev/null +++ b/ports/cubeb/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cubeb", + "version-date": "2022-07-22", + "description": "Cross platform audio library", + "homepage": "https://github.com/mozilla/cubeb", + "license": "ISC", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8d5939a689329e..ed5c595ce0f798 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1760,6 +1760,10 @@ "baseline": "1.16.0", "port-version": 0 }, + "cubeb": { + "baseline": "2022-07-22", + "port-version": 0 + }, "cuda": { "baseline": "10.1", "port-version": 11 diff --git a/versions/c-/cubeb.json b/versions/c-/cubeb.json new file mode 100644 index 00000000000000..1c096d12756219 --- /dev/null +++ b/versions/c-/cubeb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7d7979530500923609dae0ce99dc4a63fea13056", + "version-date": "2022-07-22", + "port-version": 0 + } + ] +} From b0eb3fa9eefa327d0123d689f823afbdd13632d7 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Sep 2022 23:13:13 +0200 Subject: [PATCH 553/791] [Xwindow] part 5/N (#26684) * [libice] add new port * [libsm] add new port * add license * v db --- ports/libice/fix_build.patch | 34 ++++++++++++++++++++++++++++++++++ ports/libice/portfile.cmake | 31 +++++++++++++++++++++++++++++++ ports/libice/vcpkg.json | 14 ++++++++++++++ ports/libsm/portfile.cmake | 31 +++++++++++++++++++++++++++++++ ports/libsm/vcpkg.json | 12 ++++++++++++ ports/libsm/windows.patch | 22 ++++++++++++++++++++++ versions/baseline.json | 8 ++++++++ versions/l-/libice.json | 9 +++++++++ versions/l-/libsm.json | 9 +++++++++ 9 files changed, 170 insertions(+) create mode 100644 ports/libice/fix_build.patch create mode 100644 ports/libice/portfile.cmake create mode 100644 ports/libice/vcpkg.json create mode 100644 ports/libsm/portfile.cmake create mode 100644 ports/libsm/vcpkg.json create mode 100644 ports/libsm/windows.patch create mode 100644 versions/l-/libice.json create mode 100644 versions/l-/libsm.json diff --git a/ports/libice/fix_build.patch b/ports/libice/fix_build.patch new file mode 100644 index 00000000000000..3d936ac2efe71a --- /dev/null +++ b/ports/libice/fix_build.patch @@ -0,0 +1,34 @@ +diff --git a/src/error.c b/src/error.c +index 055452ec3..0ce530a96 100644 +--- a/src/error.c ++++ b/src/error.c +@@ -32,7 +32,11 @@ Author: Ralph Mor, X Consortium + #include + #include "ICElibint.h" + #include ++#ifdef HAVE_UNISTD_H + #include ++#elif _MSC_VER ++#include ++#endif + #include + + void +diff --git a/src/iceauth.c b/src/iceauth.c +index 147efc76c..ea6d1a67b 100644 +--- a/src/iceauth.c ++++ b/src/iceauth.c +@@ -38,8 +38,12 @@ Author: Ralph Mor, X Consortium + #ifdef HAVE_LIBBSD + #include /* for arc4random_buf() */ + #endif +- ++#ifdef HAVE_UNISTD_H + #include ++#elif _MSC_VER ++#include ++#define ITIMER_REAL ++#endif + + static int was_called_state; + diff --git a/ports/libice/portfile.cmake b/ports/libice/portfile.cmake new file mode 100644 index 00000000000000..e0edd0975cdf2b --- /dev/null +++ b/ports/libice/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libice + REF 8e6a14c63d6b73cde87cb331439f2a4d19cba5b9 # 1.0.10 + SHA512 ad79cfbc3b1d51fb1f019bc088999ac8a64062a71667dbb4ffb62fe6d1b7dba7665944f64be6dcd27de08cc77e91512de97231db1e4ac018088727e90113d040 + HEAD_REF master + PATCHES fix_build.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libice/vcpkg.json b/ports/libice/vcpkg.json new file mode 100644 index 00000000000000..f216bd2e21dae5 --- /dev/null +++ b/ports/libice/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libice", + "version": "1.0.10", + "description": "Inter-Client Exchange Library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libice", + "license": "MIT-open-group", + "dependencies": [ + "bzip2", + "libx11", + "xorg-macros", + "xproto", + "xtrans" + ] +} diff --git a/ports/libsm/portfile.cmake b/ports/libsm/portfile.cmake new file mode 100644 index 00000000000000..f244fb35b64393 --- /dev/null +++ b/ports/libsm/portfile.cmake @@ -0,0 +1,31 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libsm + REF a52c79544fcd6b5e2242b9122dfaa34be07aebb2 # 1.2.3 + SHA512 379e450d90e61d80d4fea8449a582b3eee3968bef137022053cb3bd51fa2815d8fccc43ff11e3b593c4a67ad64e93209c25111a20ac88e38c1f663cd274f5d56 + HEAD_REF master + PATCHES windows.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libsm/vcpkg.json b/ports/libsm/vcpkg.json new file mode 100644 index 00000000000000..035689067a43c4 --- /dev/null +++ b/ports/libsm/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libsm", + "version": "1.2.3", + "description": "X Session Management Library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libsm", + "license": null, + "dependencies": [ + "bzip2", + "libice", + "xorg-macros" + ] +} diff --git a/ports/libsm/windows.patch b/ports/libsm/windows.patch new file mode 100644 index 00000000000000..abf52cb634974e --- /dev/null +++ b/ports/libsm/windows.patch @@ -0,0 +1,22 @@ +diff --git a/src/sm_genid.c b/src/sm_genid.c +index 1a8b9a0ed..3726eb1d2 100644 +--- a/src/sm_genid.c ++++ b/src/sm_genid.c +@@ -64,7 +64,9 @@ in this Software without prior written authorization from The Open Group. + # include + #endif + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + #include + #define Time_t time_t +@@ -84,6 +86,7 @@ in this Software without prior written authorization from The Open Group. + + # include + # include ++# include + # define X_INCLUDE_NETDB_H + # define XOS_USE_MTSAFE_NETDBAPI + # include diff --git a/versions/baseline.json b/versions/baseline.json index ed5c595ce0f798..ac7f024c28d652 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3752,6 +3752,10 @@ "baseline": "3.0.11", "port-version": 1 }, + "libice": { + "baseline": "1.0.10", + "port-version": 0 + }, "libiconv": { "baseline": "1.17", "port-version": 0 @@ -4104,6 +4108,10 @@ "baseline": "4.7.0", "port-version": 0 }, + "libsm": { + "baseline": "1.2.3", + "port-version": 0 + }, "libsmb2": { "baseline": "2021-04-29", "port-version": 1 diff --git a/versions/l-/libice.json b/versions/l-/libice.json new file mode 100644 index 00000000000000..38babced6e8220 --- /dev/null +++ b/versions/l-/libice.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "95b91f0eb6ed362a133896484d1cc4fa5ee3b007", + "version": "1.0.10", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libsm.json b/versions/l-/libsm.json new file mode 100644 index 00000000000000..05961d74c7051d --- /dev/null +++ b/versions/l-/libsm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5e2f29263e1b4b7198b9b564a2400b902f87ae51", + "version": "1.2.3", + "port-version": 0 + } + ] +} From d8f53e80e69de93906647223ddd155f5604d4c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Barbosa?= Date: Tue, 6 Sep 2022 22:54:31 +0100 Subject: [PATCH 554/791] [crashpad] fix linking on macOS (#26682) * [crashpad] link libmig_output.a on macOS * [crashpad] update to latest --- ports/crashpad/crashpadConfig.cmake.in | 2 +- ports/crashpad/portfile.cmake | 6 +++++- ports/crashpad/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/crashpad.json | 5 +++++ 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ports/crashpad/crashpadConfig.cmake.in b/ports/crashpad/crashpadConfig.cmake.in index 1c95bf1b77eef7..4bb7434d136ac1 100644 --- a/ports/crashpad/crashpadConfig.cmake.in +++ b/ports/crashpad/crashpadConfig.cmake.in @@ -15,7 +15,7 @@ if(WIN32) target_compile_definitions(crashpad INTERFACE NOMINMAX) elseif(APPLE) list(APPEND CRASHPAD_LIBRARIES ApplicationServices - CoreFoundation Foundation IOKit Security bsm) + CoreFoundation Foundation IOKit Security bsm mig_output) endif() foreach(LIB_NAME ${CRASHPAD_LIBRARIES}) diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 62b1eddd83a611..9df18b7ac5ad3b 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/crashpad/crashpad - REF 68aba08c48bb428b7b159b3371163f86e8d5a126 + REF 261679b3d2f3336d8531ed38e110254c3e2d1c10 ) vcpkg_find_acquire_program(PYTHON3) @@ -113,6 +113,10 @@ install_headers("${SOURCE_PATH}/third_party/mini_chromium/mini_chromium/build") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/gen/build/chromeos_buildflags.h.flags" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/build") +if(VCPKG_TARGET_IS_OSX) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() # remove empty directories file(REMOVE_RECURSE diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index bc02923447b678..e57a5f6b513dd0 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,6 @@ { "name": "crashpad", - "version-date": "2022-04-16", - "port-version": 3, + "version-date": "2022-09-05", "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/versions/baseline.json b/versions/baseline.json index ac7f024c28d652..91f4af36ac325d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1705,8 +1705,8 @@ "port-version": 1 }, "crashpad": { - "baseline": "2022-04-16", - "port-version": 3 + "baseline": "2022-09-05", + "port-version": 0 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 2d7b0a2fd5efdb..ac717ea892387b 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d39be1cd402a6147c057802a84ffdc1715d6384", + "version-date": "2022-09-05", + "port-version": 0 + }, { "git-tree": "e1338388a039df55d6812726dd2e638684a19509", "version-date": "2022-04-16", From 9b43b7135142565cdda653bb239964673f27ea22 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 7 Sep 2022 21:15:24 +0200 Subject: [PATCH 555/791] [asio-grpc] Update to 2.1.0 (#26707) * asio-grpc: Update to v2.1.0 * asio-grpc: Update baseline to 2.1.0 --- ports/asio-grpc/portfile.cmake | 4 ++-- ports/asio-grpc/vcpkg.json | 2 +- versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index f714d1d212484f..d3e3afa36af2b1 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc - REF v2.0.0 - SHA512 3ae5e52c790b4c5eec819eecfe5687321d629213de57475a62dd80efc1db367685d4eb976f4387e25c4e891169d34c0ecd56f5d011866f84b40fe3a19ea4809d + REF v2.1.0 + SHA512 09a8a34406726057e2db8991a7156ce23e6f1f920d71a5716abcfd303b573929703a6e6af3a1ef6e9fe80ea6d9c7f2a072c6ffca6f06109afd09ab1277835e02 HEAD_REF master ) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index 36420e17e3bf54..7059a5255647ff 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "asio-grpc", - "version": "2.0.0", + "version": "2.1.0", "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "license": "Apache-2.0", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 1f37282e31418b..2b240bb0e2f014 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83bc5845eda6123bd774834bd5f105294720fef2", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "f4cbd771c2f7eb1d18b71df82696cb23292370fe", "version": "2.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 91f4af36ac325d..6c23bc86bed130 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -193,7 +193,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "asiosdk": { From 610176628f867eaee20962aa8236d5b08204d6cb Mon Sep 17 00:00:00 2001 From: Ray Tang <30689714+raytangRT@users.noreply.github.com> Date: Thu, 8 Sep 2022 03:16:07 +0800 Subject: [PATCH 556/791] [crowcpp] Update to 1.0-5 (#26705) * increment crowcpp version * fix version * fix hash * fix hash Co-authored-by: Ray Tang --- ports/crow/portfile.cmake | 4 ++-- ports/crow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/crow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index 5f792e668d151b..39e199334307dd 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF 4d2f26ee8ff2c96c6c93e7e2b7f5162027f2482d # v1.0+1 - SHA512 69a27ae87eaa5523905e80fd1028208f2862cdd76c467e8d12dc1cca388965edb7615ae102bc1af13d824ad681eea17f69a42e790755f88ad57cae11b4268683 + REF edf12f699ec3bf6f751cf73cb97f32919e48ca6e # v1.0+5 + SHA512 615a12d39198f2b3e48d795a65590050e8416a0c36b8b54fadea57e447393c4328f3c3ae04f9a7ce5a769efcf000ab2aa5057d6431569a6ec2ffa5f19055d743 HEAD_REF master ) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index 70e70f380e5133..cf728e59e1d084 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "crow", - "version": "1.0-1", + "version": "1.0-5", "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 6c23bc86bed130..69e15f14e204b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1729,7 +1729,7 @@ "port-version": 2 }, "crow": { - "baseline": "1.0-1", + "baseline": "1.0-5", "port-version": 0 }, "cryptopp": { diff --git a/versions/c-/crow.json b/versions/c-/crow.json index 703a78aca0087a..4ba7ce8daedd14 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9dab5ab4d56d0174fbf2c661e2fab60a1d4e95c", + "version": "1.0-5", + "port-version": 0 + }, { "git-tree": "e21a4fb8fd849bfe3ee8d77dbdb3a4953dd08d55", "version": "1.0-1", From 6e428ec15b3139764119cff659ad17a61f6d793d Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 7 Sep 2022 22:16:23 +0300 Subject: [PATCH 557/791] [restinio] Update to 0.6.17 (#26701) * RESTinio updated to 0.6.17. * RESTinio-0.6.17 added to baseline. --- ports/restinio/portfile.cmake | 4 ++-- ports/restinio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/restinio.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/restinio/portfile.cmake b/ports/restinio/portfile.cmake index 4c7ec25b7352fd..5b8feba268961d 100644 --- a/ports/restinio/portfile.cmake +++ b/ports/restinio/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/restinio - REF 03e69fe720c91c65b8cfe93f463dc6063ab287bd # v.0.6.16 - SHA512 fc333181b4d9c25d8b759663af2e8e805a2a9eb81c0808e950d949e67c15b268e3c2a230fb34ffd4e4c4571004e1aa2136749f7d5ce92c43288089b171637390 + REF a5b668560138da42158511880470b19988566568 # v.0.6.17 + SHA512 fc3cdab9c240ba30b5f4b800ec452442a38db93936d3f7557255e6e7e3176217413fa421afec8b155cfb498df5ca9fc48a74a8e9bf1903aa31c9824d26d9618c ) vcpkg_cmake_configure( diff --git a/ports/restinio/vcpkg.json b/ports/restinio/vcpkg.json index 93751f41017a9f..41353f5e2185e0 100644 --- a/ports/restinio/vcpkg.json +++ b/ports/restinio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "restinio", - "version": "0.6.16", + "version": "0.6.17", "description": "A header-only C++14 library that gives you an embedded HTTP/Websocket server targeted primarily for asynchronous processing of HTTP-requests.", "homepage": "https://github.com/Stiffstream/restinio", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 69e15f14e204b8..36fb5cd07fda4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6389,7 +6389,7 @@ "port-version": 0 }, "restinio": { - "baseline": "0.6.16", + "baseline": "0.6.17", "port-version": 0 }, "rexo": { diff --git a/versions/r-/restinio.json b/versions/r-/restinio.json index 191e9cca5028a2..8e177cb717176f 100644 --- a/versions/r-/restinio.json +++ b/versions/r-/restinio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b285cfa0e43e1964ca4a91d2375516aa8121d79", + "version": "0.6.17", + "port-version": 0 + }, { "git-tree": "d203c65a6c07e890c752ab69d981546bc208763e", "version": "0.6.16", From cbd6d4a8c4b5e4919a1b27d29f8de9cccd3962a8 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Thu, 8 Sep 2022 06:27:15 +0800 Subject: [PATCH 558/791] [atk] fix supports (#26700) * fix supports * update * update --- ports/atk/portfile.cmake | 2 -- ports/atk/vcpkg.json | 2 +- versions/a-/atk.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 952f2075fdbdc5..fe5ffd01abc610 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) - set(ATK_VERSION 2.38.0) vcpkg_from_gitlab( diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index c04346e202a99b..858249eee53ee2 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "atk", "version": "2.38.0", - "port-version": 1, + "port-version": 2, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", "license": "GPL-2.0-only", diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 119e22c2d303ef..e55c6283eb1639 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6aebc3163947c210e176a1e9ab0ddd1c6c7d0bf", + "version": "2.38.0", + "port-version": 2 + }, { "git-tree": "4034b57da4c9eeb30d6904339be721b7e45f8a89", "version": "2.38.0", diff --git a/versions/baseline.json b/versions/baseline.json index 36fb5cd07fda4a..8ed23d4e9d88da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -218,7 +218,7 @@ }, "atk": { "baseline": "2.38.0", - "port-version": 1 + "port-version": 2 }, "atkmm": { "baseline": "2.36.1", From a291bcad8093f9f17988fe66543aefd674812f0e Mon Sep 17 00:00:00 2001 From: Javier Matos Denizac Date: Wed, 7 Sep 2022 16:30:58 -0700 Subject: [PATCH 559/791] [vcpkg baseline][kf5globalaccel] Fix baseline (#26658) * Make x11extras a feature * versions * Remove the feature but keep explicit only-on-linux platform selection. * Fix spelling. Co-authored-by: Billy O'Neal --- ports/kf5globalaccel/make_x11_required.patch | 28 ++++++++++++++++++++ ports/kf5globalaccel/portfile.cmake | 7 ++--- ports/kf5globalaccel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kf5globalaccel.json | 5 ++++ 5 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 ports/kf5globalaccel/make_x11_required.patch diff --git a/ports/kf5globalaccel/make_x11_required.patch b/ports/kf5globalaccel/make_x11_required.patch new file mode 100644 index 00000000000000..797fef2197608c --- /dev/null +++ b/ports/kf5globalaccel/make_x11_required.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f78b454..4858674 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,19 +48,19 @@ find_package(KF5DBusAddons ${KF_DEP_VERSION} REQUIRED) + find_package(KF5WindowSystem ${KF_DEP_VERSION} REQUIRED) + + # no X11 stuff on mac +-if (NOT APPLE) +- find_package(XCB MODULE COMPONENTS XCB KEYSYMS XKB OPTIONAL_COMPONENTS XTEST) ++if (NOT APPLE AND ENABLE_X11EXTRAS) ++ find_package(XCB MODULE REQUIRED COMPONENTS XCB KEYSYMS XKB OPTIONAL_COMPONENTS XTEST) + set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" + URL "http://xcb.freedesktop.org" + TYPE OPTIONAL + ) + +- find_package(X11) ++ find_package(X11 REQUIRED) + endif() + + set(HAVE_X11 0) + +-if(X11_FOUND AND XCB_XCB_FOUND) ++if(X11_FOUND AND XCB_XCB_FOUND AND ENABLE_X11EXTRAS) + set(HAVE_X11 1) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + endif() diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake index 3195ac291ea82f..9cdf648c461c39 100644 --- a/ports/kf5globalaccel/portfile.cmake +++ b/ports/kf5globalaccel/portfile.cmake @@ -4,20 +4,17 @@ vcpkg_from_github( REF v5.89.0 SHA512 824e4d6204189290dcc542ef3004ad2e2e2f83620dbf381ab78edbef996f412996709b9b49b72aad7c23deeeb6be274906b4cbbbd49498be081330e89c5674de HEAD_REF master + PATCHES "make_x11_required.patch" ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n") -if(NOT VCPKG_TARGET_IS_LINUX) - list(APPEND KGLOBALACCEL_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_X11=ON) -endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF - ${KGLOBALACCEL_OPTIONS} + -DENABLE_X11EXTRAS=${VCPKG_TARGET_IS_LINUX} ) vcpkg_cmake_install() diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json index 53ec0ffeab30db..7cfc9ad200137d 100644 --- a/ports/kf5globalaccel/vcpkg.json +++ b/ports/kf5globalaccel/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5globalaccel", "version": "5.89.0", - "port-version": 2, + "port-version": 3, "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8ed23d4e9d88da..b8b81f8590f1a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3270,7 +3270,7 @@ }, "kf5globalaccel": { "baseline": "5.89.0", - "port-version": 2 + "port-version": 3 }, "kf5guiaddons": { "baseline": "5.89.0", diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json index f350738e9c389f..c16e1810a1153a 100644 --- a/versions/k-/kf5globalaccel.json +++ b/versions/k-/kf5globalaccel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12a2d7458be3768c8fefca6986a678aad429b66e", + "version": "5.89.0", + "port-version": 3 + }, { "git-tree": "610034ef9764b5d45569588235e9a5838ae05757", "version": "5.89.0", From c156f35359bbdcdf5ee25eb2470d05d3cb1b3b64 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 9 Sep 2022 02:30:05 +0800 Subject: [PATCH 560/791] [dlfcn-win32] update to v1.3.1 (#26721) * [dlfcn-win32] update to v1.3.1 * update version --- ports/dlfcn-win32/portfile.cmake | 4 ++-- ports/dlfcn-win32/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/d-/dlfcn-win32.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/dlfcn-win32/portfile.cmake b/ports/dlfcn-win32/portfile.cmake index 29726bcc3be8d6..6645a5f03b2d1f 100644 --- a/ports/dlfcn-win32/portfile.cmake +++ b/ports/dlfcn-win32/portfile.cmake @@ -1,10 +1,10 @@ -set(SOURCE_VERSION 1.1.1) +set(SOURCE_VERSION 1.3.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dlfcn-win32/dlfcn-win32 REF v${SOURCE_VERSION} - SHA512 557729511546f574487f8c7de437c53bcf5ae11640349c338ead9965a4ac0f937de647839b63c821003be54dca5bcbf28f2899d2348acf7dfef31e487da1cba1 + SHA512 0aa01c49ee8628c42cdc8b9782b4741a36502764d4442227ea4e9a8062356ff17e8eaa3cdd4113009ad7ad2044b6cfd24128319d71825e13062259dd1906e27e HEAD_REF master ) diff --git a/ports/dlfcn-win32/vcpkg.json b/ports/dlfcn-win32/vcpkg.json index e4d0b1651e60c4..12a9607d273f6d 100644 --- a/ports/dlfcn-win32/vcpkg.json +++ b/ports/dlfcn-win32/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dlfcn-win32", - "version": "1.1.1", - "port-version": 6, + "version": "1.3.1", "description": "dlfcn-win32 is an implementation of dlfcn for Windows.", "homepage": "https://github.com/dlfcn-win32/dlfcn-win32", + "license": "MIT", "supports": "windows & !uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index b8b81f8590f1a9..9b999a033db942 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1957,8 +1957,8 @@ "port-version": 0 }, "dlfcn-win32": { - "baseline": "1.1.1", - "port-version": 6 + "baseline": "1.3.1", + "port-version": 0 }, "dlib": { "baseline": "19.24", diff --git a/versions/d-/dlfcn-win32.json b/versions/d-/dlfcn-win32.json index f3208fac6c871a..b4235433915392 100644 --- a/versions/d-/dlfcn-win32.json +++ b/versions/d-/dlfcn-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eefd0e5c4b4d59e8bfb88842e9562115cb77d078", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "6ae0dd5fc5f29e2299690404410ce7129ec5c035", "version": "1.1.1", From 5d500d15c112877d55629089854bf8e7dd6e3681 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 8 Sep 2022 21:33:41 +0300 Subject: [PATCH 561/791] [qt5] Update to 5.15.6 (#26715) * [qt5] Update to 5.15.6 * Drop icu patch in qt5-tools that has been merged upstream --- ports/qt5-3d/vcpkg.json | 3 +- ports/qt5-activeqt/vcpkg.json | 2 +- ports/qt5-androidextras/vcpkg.json | 2 +- ports/qt5-base/cmake/qt_port_hashes.cmake | 82 ++++++++++----------- ports/qt5-base/vcpkg.json | 3 +- ports/qt5-charts/vcpkg.json | 2 +- ports/qt5-connectivity/vcpkg.json | 2 +- ports/qt5-datavis3d/vcpkg.json | 2 +- ports/qt5-declarative/vcpkg.json | 2 +- ports/qt5-doc/vcpkg.json | 2 +- ports/qt5-gamepad/vcpkg.json | 2 +- ports/qt5-graphicaleffects/vcpkg.json | 2 +- ports/qt5-imageformats/vcpkg.json | 3 +- ports/qt5-location/vcpkg.json | 2 +- ports/qt5-macextras/vcpkg.json | 2 +- ports/qt5-mqtt/vcpkg.json | 2 +- ports/qt5-multimedia/vcpkg.json | 2 +- ports/qt5-networkauth/vcpkg.json | 2 +- ports/qt5-purchasing/vcpkg.json | 2 +- ports/qt5-quickcontrols/vcpkg.json | 2 +- ports/qt5-quickcontrols2/vcpkg.json | 2 +- ports/qt5-remoteobjects/vcpkg.json | 2 +- ports/qt5-script/vcpkg.json | 2 +- ports/qt5-scxml/vcpkg.json | 2 +- ports/qt5-sensors/vcpkg.json | 2 +- ports/qt5-serialbus/vcpkg.json | 2 +- ports/qt5-serialport/vcpkg.json | 2 +- ports/qt5-speech/vcpkg.json | 2 +- ports/qt5-svg/vcpkg.json | 2 +- ports/qt5-tools/icudt-debug-suffix.patch | 13 ---- ports/qt5-tools/portfile.cmake | 4 +- ports/qt5-tools/vcpkg.json | 2 +- ports/qt5-translations/vcpkg.json | 2 +- ports/qt5-virtualkeyboard/vcpkg.json | 2 +- ports/qt5-wayland/vcpkg.json | 2 +- ports/qt5-webchannel/vcpkg.json | 2 +- ports/qt5-webengine/vcpkg.json | 2 +- ports/qt5-webglplugin/vcpkg.json | 2 +- ports/qt5-websockets/vcpkg.json | 2 +- ports/qt5-webview/vcpkg.json | 2 +- ports/qt5-winextras/vcpkg.json | 2 +- ports/qt5-x11extras/vcpkg.json | 2 +- ports/qt5-xmlpatterns/vcpkg.json | 2 +- ports/qt5/vcpkg.json | 2 +- versions/baseline.json | 88 +++++++++++------------ versions/q-/qt5-3d.json | 5 ++ versions/q-/qt5-activeqt.json | 5 ++ versions/q-/qt5-androidextras.json | 5 ++ versions/q-/qt5-base.json | 5 ++ versions/q-/qt5-charts.json | 5 ++ versions/q-/qt5-connectivity.json | 5 ++ versions/q-/qt5-datavis3d.json | 5 ++ versions/q-/qt5-declarative.json | 5 ++ versions/q-/qt5-doc.json | 5 ++ versions/q-/qt5-gamepad.json | 5 ++ versions/q-/qt5-graphicaleffects.json | 5 ++ versions/q-/qt5-imageformats.json | 5 ++ versions/q-/qt5-location.json | 5 ++ versions/q-/qt5-macextras.json | 5 ++ versions/q-/qt5-mqtt.json | 5 ++ versions/q-/qt5-multimedia.json | 5 ++ versions/q-/qt5-networkauth.json | 5 ++ versions/q-/qt5-purchasing.json | 5 ++ versions/q-/qt5-quickcontrols.json | 5 ++ versions/q-/qt5-quickcontrols2.json | 5 ++ versions/q-/qt5-remoteobjects.json | 5 ++ versions/q-/qt5-script.json | 5 ++ versions/q-/qt5-scxml.json | 5 ++ versions/q-/qt5-sensors.json | 5 ++ versions/q-/qt5-serialbus.json | 5 ++ versions/q-/qt5-serialport.json | 5 ++ versions/q-/qt5-speech.json | 5 ++ versions/q-/qt5-svg.json | 5 ++ versions/q-/qt5-tools.json | 5 ++ versions/q-/qt5-translations.json | 5 ++ versions/q-/qt5-virtualkeyboard.json | 5 ++ versions/q-/qt5-wayland.json | 5 ++ versions/q-/qt5-webchannel.json | 5 ++ versions/q-/qt5-webengine.json | 5 ++ versions/q-/qt5-webglplugin.json | 5 ++ versions/q-/qt5-websockets.json | 5 ++ versions/q-/qt5-webview.json | 5 ++ versions/q-/qt5-winextras.json | 5 ++ versions/q-/qt5-x11extras.json | 5 ++ versions/q-/qt5-xmlpatterns.json | 5 ++ versions/q-/qt5.json | 5 ++ 86 files changed, 332 insertions(+), 145 deletions(-) delete mode 100644 ports/qt5-tools/icudt-debug-suffix.patch diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json index 4eaf540464860c..ed1c8997661d82 100644 --- a/ports/qt5-3d/vcpkg.json +++ b/ports/qt5-3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-3d", - "version": "5.15.5", - "port-version": 1, + "version": "5.15.6", "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", "license": null, "dependencies": [ diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json index 57bcdc899a9944..9d4879fbbd1047 100644 --- a/ports/qt5-activeqt/vcpkg.json +++ b/ports/qt5-activeqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-activeqt", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 ActiveQt Module - ActiveX components", "license": null, "supports": "windows", diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json index 8ea70438cc0f57..4c785713e2472a 100644 --- a/ports/qt5-androidextras/vcpkg.json +++ b/ports/qt5-androidextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-androidextras", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 androidextras Module;", "license": null, "supports": "android", diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake index fdc06520369614..a7720ab80baa66 100644 --- a/ports/qt5-base/cmake/qt_port_hashes.cmake +++ b/ports/qt5-base/cmake/qt_port_hashes.cmake @@ -1,53 +1,53 @@ # Every update requires an update of these hashes and the version within the control file of each of the 32 ports. # So it is probably better to have a central location for these hashes and let the ports update via a script set(QT_MAJOR_MINOR_VER 5.15) -set(QT_PATCH_VER 5) +set(QT_PATCH_VER 6) set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes. set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets webview winextras xmlpatterns doc x11extras androidextras translations serialbus webengine webglplugin wayland) -set(QT_HASH_qt5-base ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87) -set(QT_HASH_qt5-3d 92c1af2ff6c3d5c8f570f93c06ae58ec14ab8c8bcbf08fdd8ef8babc497d0883c2322b163035aaa743b7e27774d9b1e97a1d4271f6b8fbea0a480985aae13fd6) -set(QT_HASH_qt5-activeqt d439cd59714671b927aea7e2fac2f041d76f7011793f43d53ef1e098fc1e0ab5e5b92f665a4be3d03a0d7132e92fcfb2d2144029ffa123c86ea62bc30dcbe051) -set(QT_HASH_qt5-androidextras ef9677527036359e97b3be6cc6afea088ad0dd67969f2b00dcd8799428acf2c8ab2d7db1706af8281b717ff26029943d62335e7974abef72d48af7ec0e749d07) -set(QT_HASH_qt5-charts 4ee495e932b288b18d0375b754036ecfda2447284d8a0c08b06be4588c4d5802856b2ee2ac3582427ffd08a7f4ba47626ede6524b6289acc0bbe66df0fe14ec7) -set(QT_HASH_qt5-connectivity 21fa34f6ba500b214e526aeb34308df6be6a42ac11f898f91874e1a32ae5be6f23430257a8af77e3e8b4210f17f4fdf48616500c6c9e77bb3587ceb0eb938d2b) -set(QT_HASH_qt5-datavis3d dbea0c7197765b5eb082bd0d4f911d1465961ff2eba73f304c9934649e68e9a5c6c4948a305b94d5dea586490a633e335c47ef6b44e74ce9b1d136b700c94664) -set(QT_HASH_qt5-declarative b4b2754ae3566bbfa3e0162738ae6ea3b36d506841ce7e4b5651d0b0ca1c341ab19f653aebc23d13a17840d391280137c463c29fcf4866fc1f1c3adf8ebb5e5b) -set(QT_HASH_qt5-doc d5d6aa8dc5fb743276b1dcfef9c3dfb78d6a2fb25bdaa2e9a281dae6181fdc2a27a034f24e82315d144bf3f32ada54508eddfe7000c42a39d5e59df733786298) -set(QT_HASH_qt5-gamepad 504a2fc4c6b764c10af1641b8e3d3c36372ebc41efe95714c7928ae2a0b1a11c3f274e7c85ad4b7b0afeb7e309e5f1237913993a7c30345fa305f6f7ea320f3b) -set(QT_HASH_qt5-graphicaleffects 322caf42ba1be86d8872f9c86184a2b8a3bfe566c1de2492f3e22b73435fb18e0618b48f738a8edf4a1ea0ea5f6bd99862a8611c0fea97f54849bcfcbc570af7) -set(QT_HASH_qt5-imageformats 50a68bbe83fac710f21f05f3c0637beff17de00f9309aab2ceb27cfe7a178a1a56b0906f357584eef3188d7b89504591c924a9d4988a7321fb18a72271bb2dfd) -set(QT_HASH_qt5-location 5090f68926a7bc2f25ea5ae259cb87653b83fcf337c3255a7a2700724f6ac83ec2e1d9b6f38f185ab7dab84e5e042b72c58f4e4cacada6fb7d729378b93d9b3e) -set(QT_HASH_qt5-macextras d5147706a1d1bfba6ce7489d786954dc666b94dc0172f6696e4933560ffffc91857526bf190bb60f54b0f8b2308722ed5fd1393411a55966ce855cb104bb9ff1) -set(QT_HASH_qt5-mqtt 2cc0ae1ba5f7563d2344ee4dc20843374f6f37b2fb0570d9b267ea535bcc5e6ca6ff62b5fc1ea84849fed67d8685e641100935b0dc2e2013d22396b3dabc2b82) -set(QT_HASH_qt5-multimedia f798ffe0a32bc9f16f584b7a322c321dc2ef62c18395987ffce1f7f6cac10722c6f1166c64a1fda9877f3970a8e7b3ef8b7d9763af4c59ff313adc6081a7acfb) -set(QT_HASH_qt5-networkauth b506fc2d44af9947e4150a4a8b1797ac41889341e60d78fbb8ebd3f27d7846e6fd8e10b694df54f04b01f16aa5af36cf1ef8e0bb30f32881074fb72beb471a1d) -set(QT_HASH_qt5-purchasing b96177b68dc2a0e10613174ada4d14e9698692cbbe72468071f50dd86696656eae7e62ccb1ec8a32682c83a47800403f90084fed89f176733a2eaa338b9eaf50) -set(QT_HASH_qt5-quickcontrols e7d7daeb40da76b217f6460f38532b9913e766b99b42551fde82f3a9028cd5ebfcc4874a2f2b3df086e2d17907511993f49d690203d50fa8e0c9fe076d8f47ff) -set(QT_HASH_qt5-quickcontrols2 febc0dee2408e5843a670420ac368c0a01af3ea1234c7dc6d99e3d2bb447dbe063b59e0c3b943f5a6a0705d207c21d9909787f4b80acab8bef9253714ce82a5a) -set(QT_HASH_qt5-remoteobjects a054e22d532971752e35e127a97d51c285a21a03372b1e28f1684bb0c11afc511d461c6d4ae8f26295b4f53f16ff3d8f6e03b48031a72a6b6d2ffd27908051ef) -set(QT_HASH_qt5-script 62b1ca8684fb23357952d775f70675b2acda01d32d1672c1bdf362482632a772f1896764668c42fbc93597d6ea34afa602479d6b88e2d061f4554ab82fcd86cd) -set(QT_HASH_qt5-scxml 7c24ba2c679f74e1ef06e2c49989665d58943376dea6ddf0c92c97e7a12f57af23d2c2df98d893d2f2754658a233e3091fa669e463ee421c0aafe01fee622ca4) -set(QT_HASH_qt5-sensors a52439dc7008dc4ee7d9af98338ed42951190d44eddca1154080f2dbfb4547fe30519b7f87f16ede2db34e0b9da2751ccd605eb9cd1bee06ab19b6122d86d620) -set(QT_HASH_qt5-serialbus 58f0e63d2af70d39190323abc29f218e657eb892eacf4886a7eb9b7558f9c06288a51c85ebeb2982af58c8909f1de865b5089907cfffa1ff2938723b66b0d7a8) -set(QT_HASH_qt5-serialport 479bc5a4bddc4cb7659d2768b51947847f3c413102554fe3883e1decc42e6c9d0ad693627f607bd8cec43fd014e495fa9812934dd1b8ce1cf3f3ad46b5f6c774) -set(QT_HASH_qt5-speech b2f3a83a462c1f067804f8c2c28e47e76588cc5d70e3f0ec66a1955890b6a419371a769ec6f8867947f4a81cfc91db3bc65c1d628038cdec6c722cbfc1217aba) -set(QT_HASH_qt5-svg 7938a84abca282f263f7840425863379ed9e0f9854ecfe38e5d1edacdaf39b2516e9e9b8b5dbcf52113785d8c4123ebea550f441abc000d01c07a20a6a742ac4) -set(QT_HASH_qt5-tools ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b) -set(QT_HASH_qt5-translations 56a13156f7a7cde347b6413eb1f1f29121a70a8e20fd1d947fe093d6721598da26f63fc49aa6f99a4f4c1d213ea426d8e6897b51d858881a2d31d121740a60d3) -set(QT_HASH_qt5-virtualkeyboard d6ef4a067fc0af3bf562f68382b32c2eccaf21638cd89a79ad011fd640581448e997d67f5994ef1ac975df501cf6a57321d6f37426901f3db70c28c14925737b) -set(QT_HASH_qt5-wayland 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327) -set(QT_HASH_qt5-webchannel 74ac09f418fd918cf5930f7d985fd69477da3ef1ecdedcf4b59eb9c17b43849876141ed6483dc32ef3e5e3f3fbc2a6babeb281f72da7850bfc677f2acfaad3fe) -set(QT_HASH_qt5-webengine 9dc7891c452397878fb20bd64ec00b13a056e9eff33f74ac3a9c06bc93992ae2ce49b8f8cef553d3f681c37d81a81ee5af29d317ca1963b4793d32841aa316f0) -set(QT_HASH_qt5-webglplugin c9e5451ced0e3cf12612edf7744d1a916d83307ded70fe61cbbf21f13966d3e42d0647f76a6d848f75dd0477efdfb87367634be3af8f187aec310d88f4b0acf5) -set(QT_HASH_qt5-websockets 2d44983e462a899c4adb90998b84d24466d70d8fab340481bc916228b289c45456ea5acde61a70aa9e3f9233216c5ca80375f190d9cbc406f8d40b535e90e480) -set(QT_HASH_qt5-webview ad6a9839c1a6e5b037b687bc1cec75a3cf8d10d66861ce88137c32107fca7351e8801da2a7ff623b0aaa1ced7430c4733593b5ec2d2bfdb7de98d9aeb9411287) -set(QT_HASH_qt5-winextras 2986aa9403fd3d5a5415d93fe607bc0e36fd90fa56c01af817054aaca9e7614259343a7c16db75a2f5a96c05e1a38b3e068fc4e45de967ebcd3ed136bc6a886a) -set(QT_HASH_qt5-x11extras 19ca14f0d4bcee08077cbbe81a8e6537fcc134036da1217c9744411d53ca5ebc14e96a8c25b15eb81795697628e6f64611dd3bc822621adcd4420a58a0c335b1) -set(QT_HASH_qt5-xmlpatterns 553456f299c6812c058496f5e1d6a089df1f693dd1105fed80e6d6dd0cf143a0d74ade44408f48553ff3fac0951ab3f7384bc08535888354d921aa2d8428317d) +set(QT_HASH_qt5-3d 33fe30bd08d352b1e80fa62b344bfb3d69b1d3220a65ffbdb0b92fd4aa134ad7f923bc827753bb8f6c42f51ea1ef723acb8655b19b0b42f9bb450dda42937527) +set(QT_HASH_qt5-activeqt 95f701bed16f7d5c6152a95dd725e7143538ec6e08af54715aba4f45d364dfbfa2f2b2599132fa5d979a509dc4378404867ca0bb068a6a23d90c4041ced427f6) +set(QT_HASH_qt5-androidextras b818c5894134812eed976a6b8b5b5aa94bdd8baaeda90820dacf85af9d2093ce9619c8990436afb5ce261e7b6f45c4ccbbd38b2473bf2bde851338cd299f5d05) +set(QT_HASH_qt5-base 4fc6973b9250cd78c4797ed9bb58bec949243cc5e8c3a546b5fbe8c6e6480d5e0745d273fac812f9f5f1fcd675cd8b867d47f57563bf6d23118b58032550103f) +set(QT_HASH_qt5-charts b3f3594a1fd648a6afd459c8165d74690902240ef826a8bd87245ea49464aabcf5c0d4094ce1035de1d40e7e49d95dc381db37f8f4c4735265cb60241666715e) +set(QT_HASH_qt5-connectivity 8d6b634b46aca9a54a391cad9be056d5bac70401dc4d94426fb7a6038c12608ba2cb94cdafe3e8786d2f0a00aa7e60dc92fcca7ef09d136e1bd9763e2868d20a) +set(QT_HASH_qt5-datavis3d 921f2d050b6b61824e308f9d8dd095da002914b28568403214ed727055eb9fdd43d8b71190bf0b1dc82df4333d6d65b2d5ac61f3646f711c693dec2a46967a96) +set(QT_HASH_qt5-declarative a4824b6ec2de5e78819b726850767db6d4280208d6cc985219f4c33b6b0dcd6194557f32b577df97b0596d157190aa9c00e99bf6879554936a356fa7afe8a7d5) +set(QT_HASH_qt5-doc 9f510d2bfa4174b66547b5ab3bfd08c2b04a2267f926066a006058b97de6722d5c15b147ffda9f726f4c634639df7e29452b2a91820e08d235c7a58cbb39102e) +set(QT_HASH_qt5-gamepad 6faa59ea92d8046e6b377fd18f7049dbe4b230ab591f0513c2de974df723a77b0845339cf7d7507bb4415f005d21754dd8dc35a1082c7b86f63a0a5fdbdb8126) +set(QT_HASH_qt5-graphicaleffects 2de1f6a0a980949d02baaaa7576e628faf34bea10fa7e11e9ad7da5ae0511449f8edf98558f77ecf7727d26f0d2f13c5389f73d128cceef71cdef6788050d689) +set(QT_HASH_qt5-imageformats a1b86db145d73933295b355156b401177e2c61e39beb6114ce9e7cfef693697e019c1a1299e18153542d7c229fa95e1b122812d2058ad66da28b78e521da9d30) +set(QT_HASH_qt5-location 25ea53bfc5dd8569931eaa5bba7e0021377f747d0304d1320cbfa5a87d052fbee86330d23dc0516be618cd6380216212a0b2e981a2ce4e1b6cb571995d3b0684) +set(QT_HASH_qt5-macextras 679f752dfa53a4fbfd9e950407da7d1f2ce505e4bf58083a99812d339cc1163c5be5b0ace4a81fee7a58a8a9322fbf8d04ac5835dcfcf1570396dc01ffb25cdc) +set(QT_HASH_qt5-mqtt ef4891cff6388f515e70a3d1eea05b5ac0251e0fa2e258b91b3d03e9a565438153068b0949870348acbb0e781dd85b2ef649a6833af2a68bdcf2d4c472ffb172) +set(QT_HASH_qt5-multimedia abf07c26e4aba1442c506e06d91cb584c4a3d04c8e572b7d3aaa5a2341cd5609af2604e352557bda9f6bbe015793d24c43b1d580f60568cd1051515f541e342d) +set(QT_HASH_qt5-networkauth 04d5f07f5076dbd8e5bd435e7e91605819574dcab16217e9b49e60b3932db09d9c0f8088cd705fba5da7eddf98df1a61f2fcf7640f942ba6ee87576994268445) +set(QT_HASH_qt5-purchasing 39325482c97fd5ec0cfcf6bde14e0bedfd7b61902493d15916644010802220b5188b130a6cd011b906c8da9f4993a62be579f94df659f9eddde3fd97e9897afe) +set(QT_HASH_qt5-quickcontrols 43aa77ee50f95c8546abea2cd307cdcc3810cc20c8a373e7941675d62702bf8294078cf5cec89d8d26dd9eec5c025b712db1bdc1b1acb264f38368f0662e9829) +set(QT_HASH_qt5-quickcontrols2 5de1ae719c394a315dc019bdaa876b6b735ca5eed4455b6c4da5e2150c0bc85a6c691ad9124b76e26704aaf799b6067d47fe48d98926ea000407d163441d4114) +set(QT_HASH_qt5-remoteobjects 7cad6d7b03267a566044ae97ef23bcf66fa6ae7da7b4e6fc3c8e5082518ae1ec9ab00ceb935ced857696fafc5d3346df3f2b083793f2f520bb146fdbf6c54242) +set(QT_HASH_qt5-script 1ea055d5ee8a80ac1919fe1e0e59e011654ccf5e1392f49933b104c8ff390755b3677c34981c168a8e492600d0243fd2d8f3c0f87bf44a61a55c763149a1ccc8) +set(QT_HASH_qt5-scxml 6ba6edcb69dc43be58a150cfa21537251c6944051a9d01ec68272f91ce64399ad5a9c37dd0cccc8903dd76de0e04369d79e38bbe96ec55bdc9f970ede137b3e3) +set(QT_HASH_qt5-sensors 1937e7fc466bf0ad679fa1ec9f876015791d42a9a89f17449a2585451c5b3fc13c523930416da535c88babc016f52d35537d837a62cdb4e1de1c7d81a5d0e511) +set(QT_HASH_qt5-serialbus b972d312be8bc822282fff48c20d2330edf14aa5e7ebd6b5b9a03b61b21fc637ad4d969d55e35b145a7bddc967a9e9dda17e2df14df3ab0151d08898468c1230) +set(QT_HASH_qt5-serialport 8161b4aba2c7410b878482035b5bc141083953dcaf466361ff3d30b6e397ab78e84f698dcbc14f4218e2c175efcb8c9ee494f75d6099a1215b5be6a378c8a322) +set(QT_HASH_qt5-speech e20e3d59804bc6ee8ce65cd10e61aabc3771ebd7d20c853b8c6358b08bfbe0796905b50efcdc755857388bcb8528d18ec2bd8e5840bd2500f5f5ee5e043ea47d) +set(QT_HASH_qt5-svg 8e6e35a098baaae03043c1c177c2e93bc6c8bec1094b3becd797cddc1b62d24f51956b84a4e6bbe0565069f862243a791285232f78d4a0c2281344308071ef17) +set(QT_HASH_qt5-tools 8539930c3facb4a2b43ce7f76f461181489952d79c4d9e11c8acf6b342c3466f5868adcef1a1bfdfa9c142217c0e43853c3297fc0701030c63d0b349e0767297) +set(QT_HASH_qt5-translations 36baebb9a5b34d9965d087b5f0a509a8a83086db61eed54a9cad63f4a548d32c4809007b2f6dad7c983fa0cbaf5fe7ab016ec244546feb824cdd2c78347aee16) +set(QT_HASH_qt5-virtualkeyboard e0aed691a381067c9a5d7f76bdafc15c6df4b5f04f86b09f0dc6d4fced4181dcc676792efd2718bc530d3c50759b0d2666261a9cf6bc522ff75907e2bb717de6) +set(QT_HASH_qt5-wayland 824cb4dfd2bd9d858f38430332a359cf6cd2b256c91b0bafcbe49c8847cb41a7ced79ef8abd5469170837525639df26fcbcdfb49ffefc4fc4cde0830d9afe98c) +set(QT_HASH_qt5-webchannel 8c82f040f9aa5cb5c8a927fc770123bbc5dfffd4d6ab243da86a53eb2aee1ab9b7f14d8f7e9b2dbd42728f203158d1ad46b488c6221e589777fed150b2e467d7) +set(QT_HASH_qt5-webengine 775d44612a81314c914bf03e8d368d6426516cdd9ce15e50513b346a85f94da603a5c65343d3ed6aecd442ac38a2273f38deae161916cd0c008e473b2606962b) +set(QT_HASH_qt5-webglplugin 665dcd971f1995567f4a8f2ca8ed4201f2aa0829e091c30e5e5420a99c76ef5882429197fb852f2d4a3fbb62cae0e072ab82233804b7f98aa342a179de5c1124) +set(QT_HASH_qt5-websockets b2ab319bfd9b0839ee2aa23d508b96a4e86e02a3cab1fec7a1282cfc018e5baf7aa5340d3749f237562f8f74e562e49cd31432e5bed8db781f158aaba914068b) +set(QT_HASH_qt5-webview bb6e70a95899cb129dc11d565587cfd9f5d0ca09b40357ab404d1f74e77d7cb3c420362c5cbb4b74fa864449c1d8cd3cef2b4b50caad242f1941378e877cee7a) +set(QT_HASH_qt5-winextras d2ff6b4b0831d78e44a7434ac43fd9174f08a904fdb3c076ef829379b06ea499c8962daaa450fa2c320224aad00c0aa567ab4d6f789de7a7ded952d159b3adc8) +set(QT_HASH_qt5-x11extras 6c651cdfd5c3420877e8d9e5a90119401f516beb42d814255520c8223b34dbaca40da23f8d8e218ce933a76fd415e62a2aa0334359594053ce6becaf08150cd6) +set(QT_HASH_qt5-xmlpatterns b4070f33d4b590af6dcb40decd4fdcc44f53897eacc7af65ac0e718b9e4c8f8ebbf6e5700ca4b293a6c0a41fc49c4f540b918749e8f3493f0a290e567dc2a95b) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index f0fe96392292d6..c2fa135c310b37 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-base", - "version": "5.15.5", - "port-version": 1, + "version": "5.15.6", "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json index 4c80bd5767b72e..291edce5a1f83d 100644 --- a/ports/qt5-charts/vcpkg.json +++ b/ports/qt5-charts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-charts", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", "license": null, "dependencies": [ diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json index b91ba55f00c197..3c0a98e0e679f3 100644 --- a/ports/qt5-connectivity/vcpkg.json +++ b/ports/qt5-connectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-connectivity", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json index a8afb0044e978f..2e0cb4bf994316 100644 --- a/ports/qt5-datavis3d/vcpkg.json +++ b/ports/qt5-datavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-datavis3d", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", "license": null, "dependencies": [ diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index 2002251b2f4edd..d64668c9ab1bd3 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-declarative", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "license": null, "dependencies": [ diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json index 5dac8e6f3b6843..6c6a43541005a2 100644 --- a/ports/qt5-doc/vcpkg.json +++ b/ports/qt5-doc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-doc", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 doc Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json index 17735971c3cb8f..7a4db1bcef3e0d 100644 --- a/ports/qt5-gamepad/vcpkg.json +++ b/ports/qt5-gamepad/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-gamepad", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", "license": null, "dependencies": [ diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json index 2113201759537e..eecd0e1e5ef64f 100644 --- a/ports/qt5-graphicaleffects/vcpkg.json +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-graphicaleffects", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 GraphicalEffects Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json index fe6f4b63da9940..7eb03cf2197124 100644 --- a/ports/qt5-imageformats/vcpkg.json +++ b/ports/qt5-imageformats/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt5-imageformats", - "version": "5.15.5", - "port-version": 1, + "version": "5.15.6", "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", "license": null, "dependencies": [ diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json index 9df96526698c79..c219c65c8c05cf 100644 --- a/ports/qt5-location/vcpkg.json +++ b/ports/qt5-location/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-location", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", "license": null, "dependencies": [ diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json index bfb3792e359a46..c2d32f40255210 100644 --- a/ports/qt5-macextras/vcpkg.json +++ b/ports/qt5-macextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-macextras", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", "license": null, "supports": "osx", diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json index 4b9510538db7b6..dd65b83ab36a14 100644 --- a/ports/qt5-mqtt/vcpkg.json +++ b/ports/qt5-mqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-mqtt", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 MQTT module.", "license": null, "dependencies": [ diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json index e7b292145f1e09..09f636f1f0211c 100644 --- a/ports/qt5-multimedia/vcpkg.json +++ b/ports/qt5-multimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-multimedia", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", "license": null, "dependencies": [ diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json index 3c0306ba99b9e2..2de9ac085567cd 100644 --- a/ports/qt5-networkauth/vcpkg.json +++ b/ports/qt5-networkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-networkauth", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Network Authorization Module", "license": null, "dependencies": [ diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json index 3b9fb56f6df274..5a5dc742d639a5 100644 --- a/ports/qt5-purchasing/vcpkg.json +++ b/ports/qt5-purchasing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-purchasing", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json index a497b6e945ea53..72d274f55877df 100644 --- a/ports/qt5-quickcontrols/vcpkg.json +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 QuickControls Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json index 97b1014deb7409..a8adf551f334fb 100644 --- a/ports/qt5-quickcontrols2/vcpkg.json +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-quickcontrols2", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 QuickControls2 Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json index 7631a3cb77cae1..83246a76674367 100644 --- a/ports/qt5-remoteobjects/vcpkg.json +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-remoteobjects", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", "license": null, "dependencies": [ diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json index acb8ccfabd5195..5d93bf46127693 100644 --- a/ports/qt5-script/vcpkg.json +++ b/ports/qt5-script/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-script", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Script Module.", "license": null, "dependencies": [ diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json index 19d6bee6de8ea9..e2f3e51e8644ca 100644 --- a/ports/qt5-scxml/vcpkg.json +++ b/ports/qt5-scxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-scxml", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", "license": null, "dependencies": [ diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json index af009324c5b71b..f696e7d8db559b 100644 --- a/ports/qt5-sensors/vcpkg.json +++ b/ports/qt5-sensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-sensors", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", "license": null, "dependencies": [ diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json index b9605bbe1ce187..0aa77711fa98c0 100644 --- a/ports/qt5-serialbus/vcpkg.json +++ b/ports/qt5-serialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialbus", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Serialbus Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json index 37c3e859b8ecdd..640a21f3eb2cea 100644 --- a/ports/qt5-serialport/vcpkg.json +++ b/ports/qt5-serialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-serialport", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", "license": null, "dependencies": [ diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json index 0f5c9f3637719a..851346bbecc418 100644 --- a/ports/qt5-speech/vcpkg.json +++ b/ports/qt5-speech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-speech", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Speech Module", "license": null, "dependencies": [ diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json index 4247d8b0f73e19..a25b6600f558d5 100644 --- a/ports/qt5-svg/vcpkg.json +++ b/ports/qt5-svg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-svg", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", "license": null, "dependencies": [ diff --git a/ports/qt5-tools/icudt-debug-suffix.patch b/ports/qt5-tools/icudt-debug-suffix.patch deleted file mode 100644 index 9d9d8bb395b2ab..00000000000000 --- a/ports/qt5-tools/icudt-debug-suffix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp -index 4e480bb..e15f076 100644 ---- a/src/windeployqt/main.cpp -+++ b/src/windeployqt/main.cpp -@@ -1324,7 +1324,7 @@ static DeployResult deploy(const Options &options, - const QString icuVersion = icuLibs.front().mid(index, numberExpression.matchedLength()); - if (optVerboseLevel > 1) - std::wcout << "Adding ICU version " << icuVersion << '\n'; -- icuLibs.push_back(QStringLiteral("icudt") + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); -+ icuLibs.push_back(QStringLiteral("icudt") + (result.isDebug && platformHasDebugSuffix(options.platform) ? QStringLiteral("d") : QString()) + icuVersion + QLatin1String(windowsSharedLibrarySuffix)); - } - for (const QString &icuLib : qAsConst(icuLibs)) { - const QString icuPath = findInPath(icuLib); diff --git a/ports/qt5-tools/portfile.cmake b/ports/qt5-tools/portfile.cmake index c166ed7f5701c1..ecc14c6e0df5cd 100644 --- a/ports/qt5-tools/portfile.cmake +++ b/ports/qt5-tools/portfile.cmake @@ -1,8 +1,6 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation(PATCHES - icudt-debug-suffix.patch # https://bugreports.qt.io/browse/QTBUG-87677 -) +qt_submodule_installation() if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json index 34058d03fa0a75..a9772603e28413 100644 --- a/ports/qt5-tools/vcpkg.json +++ b/ports/qt5-tools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-tools", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", "license": null, "dependencies": [ diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json index 9d3deca1375c47..df8a1c3a5247d5 100644 --- a/ports/qt5-translations/vcpkg.json +++ b/ports/qt5-translations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-translations", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 translations module", "license": null, "dependencies": [ diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json index 063d403f993fb7..96ac9c30baed6a 100644 --- a/ports/qt5-virtualkeyboard/vcpkg.json +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-virtualkeyboard", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", "license": null, "dependencies": [ diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json index 2ac0baffc95af9..6049b0a23933f3 100644 --- a/ports/qt5-wayland/vcpkg.json +++ b/ports/qt5-wayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-wayland", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 wayland Module;", "license": null, "supports": "linux", diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json index e0b2765b5a3b6a..a927e053e91589 100644 --- a/ports/qt5-webchannel/vcpkg.json +++ b/ports/qt5-webchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webchannel", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", "license": null, "dependencies": [ diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index 2fa3411a2e6bc4..da0765e9ab6530 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webengine", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 webengine Module;", "license": null, "supports": "!static", diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json index 6a7a96dd119a01..03852ff6fce206 100644 --- a/ports/qt5-webglplugin/vcpkg.json +++ b/ports/qt5-webglplugin/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webglplugin", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 webglplugin Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json index 9d50e4c7099499..970accb00fc719 100644 --- a/ports/qt5-websockets/vcpkg.json +++ b/ports/qt5-websockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-websockets", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", "license": null, "dependencies": [ diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json index fb3a79106b0e02..681b7dacc6fb67 100644 --- a/ports/qt5-webview/vcpkg.json +++ b/ports/qt5-webview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-webview", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "license": null, "dependencies": [ diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json index 37a147cf1787a3..bd0316ac12aa4f 100644 --- a/ports/qt5-winextras/vcpkg.json +++ b/ports/qt5-winextras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-winextras", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", "license": null, "supports": "windows", diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json index c23fccba38c053..2e6fe2f1c6741a 100644 --- a/ports/qt5-x11extras/vcpkg.json +++ b/ports/qt5-x11extras/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-x11extras", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 x11extras Module;", "license": null, "dependencies": [ diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json index 0111a4b3d491b8..b373fd86fad33e 100644 --- a/ports/qt5-xmlpatterns/vcpkg.json +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5-xmlpatterns", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", "license": null, "dependencies": [ diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json index 5296dda4650636..614401e0528039 100644 --- a/ports/qt5/vcpkg.json +++ b/ports/qt5/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5", - "version": "5.15.5", + "version": "5.15.6", "description": "Qt5 Application Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 9b999a033db942..a31e58675506ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5873,67 +5873,67 @@ "port-version": 0 }, "qt5": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-3d": { - "baseline": "5.15.5", - "port-version": 1 + "baseline": "5.15.6", + "port-version": 0 }, "qt5-activeqt": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-androidextras": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-base": { - "baseline": "5.15.5", - "port-version": 1 + "baseline": "5.15.6", + "port-version": 0 }, "qt5-canvas3d": { "baseline": "0", "port-version": 1 }, "qt5-charts": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-connectivity": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-datavis3d": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-declarative": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-doc": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-gamepad": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-graphicaleffects": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-imageformats": { - "baseline": "5.15.5", - "port-version": 1 + "baseline": "5.15.6", + "port-version": 0 }, "qt5-location": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-macextras": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-modularscripts": { @@ -5941,107 +5941,107 @@ "port-version": 1 }, "qt5-mqtt": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-multimedia": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-networkauth": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-purchasing": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-quickcontrols": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-quickcontrols2": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-remoteobjects": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-script": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-scxml": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-sensors": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-serialbus": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-serialport": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-speech": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-svg": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-tools": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-translations": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-virtualkeyboard": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-wayland": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-webchannel": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-webengine": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-webglplugin": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-websockets": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-webview": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-winextras": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-x11extras": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5-xmlpatterns": { - "baseline": "5.15.5", + "baseline": "5.15.6", "port-version": 0 }, "qt5compat": { diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index de753f204df261..098c9616933ab6 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a085f6772db0df5dfe00fb16194b857a9f6bdba3", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "47a71a5fc9720cda647f0d1693f95024b434b5d3", "version": "5.15.5", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index fc3f4ffecfabe1..5abb55997d7b27 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3229267d9f245462b0cae0632505cc2d3ceefc69", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "dac80735405e39d0a83de3d46e9462045062da11", "version": "5.15.5", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index eaf752254dacd4..9955c8edfe0355 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "368c21ed42b41f6fcde054661465a3152e67cdff", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "2695f2680a28a32235de0bf07cfd8a4230b2b2ac", "version": "5.15.5", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 54438544a99db5..9cc38a61b5f6fe 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "432a70f67a01e3348d79cd158563b033a0304452", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "21a6678f36c765307bd8d36052790ab2d59a494d", "version": "5.15.5", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index 9a8dda081ec5e6..70fe64f3bb62e0 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f3a916cb0dfbd6e0ea62d8b62466cb89fd6ae3e", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "588bdf1227f8682fc19986b88b0b3e68190c2e00", "version": "5.15.5", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 378e95fd1d2374..e572ec4244c73d 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b31cd7440b3016f1bfd883394622da941f0d791d", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "25e38041d8b557befa01eb6d3eaa9e62fba0ab58", "version": "5.15.5", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index 6b18d9d043e038..77406fd50978a7 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b43afc9dd3b040a70a4410d0b12958302b23168", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "1f678398846a4542168355a9b857168edf7ce36f", "version": "5.15.5", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index 1e694a0462a187..62e17231a5cf98 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e8f967f4192fc2902d88bdda402d70253d7c4cb", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "713673abbea4c2f934d48fc95833758fc595f88f", "version": "5.15.5", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index 28119b41b0b486..ce45698f8434b7 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f23a84b9637b652b2109fee8a47f0e0d1f7315c", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "9281cb973df81d6e58551695de177c309d2bc7e8", "version": "5.15.5", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 72bb1d63f6b1de..cc98cf8d6b248b 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aca12953a747c1746052786f5bfc5a61914d8221", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "1570d7b61ed6170ff2e844a1cd575f1d671832ce", "version": "5.15.5", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 3dd945898316e2..e13d2af236d570 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a60d1b4c3416cd44b1f6f0082e748e984f5677f8", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "2a98bf1e90586c3f0b8f75f40c3a048bfbe5a0e7", "version": "5.15.5", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index 3794ec3508f736..f50c7dd4192a62 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46f87c0dc7ec464b65997a361d2f7df19f81c11e", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "a82ad93d08d83fcf90c4803f142585ac1f27c0da", "version": "5.15.5", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index 6a70760490192d..4f2a709b446325 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "428ea508b4b239cbc827fcc2066cc5c71a481ba2", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "1359ca0e6b8f97eccbd81ff9732be896b0572096", "version": "5.15.5", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index 60c6b09cff652b..722ede103f3def 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35e6445fde079f5a65e3375e58ee1ab096ae797c", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "a32dfee89a54742bd6002b64d1274ff250598179", "version": "5.15.5", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index c7fb03aba57de7..1e8388fcb86de0 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6be2f9cb73c5adff57d996453797bf1a7c5b029c", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "44ae7444966ab5f243fd2cd0028b403fdcb286d7", "version": "5.15.5", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index a254c924dc2f8b..3948f82348eb1f 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11a822009048b4b827650ef003c229b2c3baf241", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "a607da4681ec2a2e5c8916bcc588bcf656192583", "version": "5.15.5", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 56a6418377214a..d2e734639b65a5 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c549ddc8096118245602526ac247deb1c2092e5c", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "ebb8a14f6282f9fc7b576b36133210b9027fd8a0", "version": "5.15.5", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index 6bfc7f2009c83b..47b6bf29823297 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f44ac5872f60dba0fbb31d07944a32b87d788a49", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "a65c16c77f8df1595cdd0045263f15499b46ecd5", "version": "5.15.5", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index be726deaee67ea..251cb01e4b088c 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c660d5cf5bc79f926233b3a11f9e8413d0e3135", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "2692aa4bc8d7c32494df72815bf952c403afe2af", "version": "5.15.5", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index f9a8bbe66e283f..16f106fa696a03 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ee332712ba27d51d95908475b239279079d8140", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "16b3a5092e0e2f5db01b402b6d31d6713b70fa61", "version": "5.15.5", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index 14d9a9eb1f941a..ca11f92a501a45 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae646bdc592795629b986e08b765c6b450a44079", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "d9bb1305dbf952aeb74dfb504105c73699df16e1", "version": "5.15.5", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index c7ed2e9d63918b..c7733844c42870 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bd82b3745af7ac2eea950abdc919794516de10a", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "6ea49f33c3a82afeff14d62385b01be448590f2f", "version": "5.15.5", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 5d15d8a85efeda..1090be3b82be14 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f3d66073c10915d5900e5cd86cc60b53c619028", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "9e68f9a7ae89d042c84bb3ec32f330914291c009", "version": "5.15.5", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index b9115e2f37cd3d..d3d13c8caabbf8 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cdf3d0d022434bec187e052a21525573119e2d8", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "12a80269ffe2959c8c32a3a45322b319e1ea4e42", "version": "5.15.5", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index e41e283fd2a0cf..11030ba64a265d 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96cae052cc1dadf32a238d0e6764f0c529ac288d", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "ba84a7f42c2b9d8d68172d5a78680ccfcf1d83d7", "version": "5.15.5", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index 2a38bbb135fbeb..9bf6601d93c618 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7d397d9c51a80f70d242913c67dfa671f82634a", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "82f215875bee2312091ab88c2136adc5bf6aac89", "version": "5.15.5", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 0f5b83a360a499..1419e0ed755465 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "249a91927a349fac1d1568ac1e8c633327d82697", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "92c9d91bc48823b05c940313c18fa5fbce6ce4de", "version": "5.15.5", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 932334fb65825a..16723a4124d226 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4447da6172d30437f1577d746cb4b8e02cf1bc95", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "97b04510d3c94d68e1a46e891ae27ce98e112ad0", "version": "5.15.5", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index f6dbf1506a075a..e71db8340cb235 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0037e21d33817b94a17874a9fbaafd0b9d9228b", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "40aebcfa61ced5500429ccc3533c7f294510ab0e", "version": "5.15.5", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index 29cf0da685cc7b..a5e84d08ae55eb 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b06e77b9da2dd117f4a948e66d9e0253f7b3f019", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "726f0e5f2b92624ad638686cdf6c3c76a0a60c84", "version": "5.15.5", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 278d78a3fed3ba..d9da07e1f04548 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dec6f196b45dbf68cd4b9f987c551ed95e3750c7", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "4ff73811f0c4030472b036babb8f5d1fd0425cd8", "version": "5.15.5", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index 5d21cbc6e1c435..a865814d745eee 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6aa87ec473aec6885891eb84d84c506c019b3b3d", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "31180bab6e373741da2e2527e60a9515908754b8", "version": "5.15.5", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index a59aede3333331..9bd1a43c077a15 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "211eb036ef0264f4f1baa61feac460def0954a61", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "0c3272e390c783bcdd740392077b124b4786d49a", "version": "5.15.5", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index 3433cad5e346fa..f8908c35ea09f6 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "271be6655c1ca2a56c800353ee0db4c906ec04e4", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "afcb720c703b3ae92374d971e8a4047f589430c0", "version": "5.15.5", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 33e20fd2d65d3a..7238b5d42df25c 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4ba6a5b78ae3319296f29a0d21b70add16960f5", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "a58546017a29746294932e5f21d1b1077407f53e", "version": "5.15.5", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index d073f7756f89b0..4cb3c284dadba1 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47083d05c3a15c58ed56b058e206d8f772cbb13d", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "0ca101ba6c7820798fce809358f6a5a6daad3146", "version": "5.15.5", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index 55490fa347ec8a..ce83c50fa11616 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "735f17c73004fe1415cd47fcb5d71d95eb20b9ee", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "db57029476ead2ed6bada3ee98efdc9933685d5c", "version": "5.15.5", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 18061e41f73938..117020313ac134 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80498973e03d07a6bb603913a8e5ed43e93a8289", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "ffc879425da05407e5079b8e86870dd1bc6d64e4", "version": "5.15.5", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 768dcdc9cdfce9..941d1ec9cce3f8 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d143a32da0dc634058405b2553d48337a1014175", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "56678d6bfe2f27b14f7790464721400c1b05c1ff", "version": "5.15.5", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index b4e5d40f485dee..c32b10ab0d3d80 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0684fc4d4cdfd2f6019e4657fb9d9ca9c8f3a704", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "41265adfd2c35f7d5c56be696ae57e2d63dd4634", "version": "5.15.5", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 130241a24cf076..443060cd91ff17 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1be1c7149cfbdf1af817b70e2d32d2648d34af78", + "version": "5.15.6", + "port-version": 0 + }, { "git-tree": "5a71d754b8b0e033e9588dfc5d84b0b1d81a8c45", "version": "5.15.5", From 0c1a8fea7046ee72e4f49bfecbc00e52e6b308da Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 8 Sep 2022 11:36:51 -0700 Subject: [PATCH 562/791] [ncurses] Add file(MAKE_DIRECTORY) to create the missing directories (#26690) * [ncurses] Add dependence pkgconf * Add MAKE_DIRECTORY --- ports/ncurses/portfile.cmake | 9 ++++++--- ports/ncurses/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/ncurses.json | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/ncurses/portfile.cmake b/ports/ncurses/portfile.cmake index f93d4d9c328ce1..445d4ae71197ae 100644 --- a/ports/ncurses/portfile.cmake +++ b/ports/ncurses/portfile.cmake @@ -9,8 +9,8 @@ vcpkg_download_distfile( SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE_PATH}" ) @@ -38,6 +38,9 @@ if(VCPKG_TARGET_IS_MINGW) ) endif() +file(MAKE_DIRECTORY "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig") +file(MAKE_DIRECTORY "${CURRENT_INSTALLED_DIR}/lib/pkgconfig") + set(OPTIONS_DEBUG "--with-pkg-config-libdir=${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" --with-debug @@ -50,7 +53,7 @@ set(OPTIONS_RELEASE ) vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} OPTIONS_DEBUG ${OPTIONS_DEBUG} OPTIONS_RELEASE ${OPTIONS_RELEASE} diff --git a/ports/ncurses/vcpkg.json b/ports/ncurses/vcpkg.json index 465e15d472ca88..37498c2a65786c 100644 --- a/ports/ncurses/vcpkg.json +++ b/ports/ncurses/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ncurses", "version": "6.3", - "port-version": 1, + "port-version": 2, "description": "free software emulation of curses in System V Release 4.0", "homepage": "https://invisible-island.net/ncurses/announce.html", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a31e58675506ec..a0aaeeb6319f6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4970,7 +4970,7 @@ }, "ncurses": { "baseline": "6.3", - "port-version": 1 + "port-version": 2 }, "neargye-semver": { "baseline": "0.3.0", diff --git a/versions/n-/ncurses.json b/versions/n-/ncurses.json index 26698d56191cd5..f0a3c5bdd99830 100644 --- a/versions/n-/ncurses.json +++ b/versions/n-/ncurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f61c866b4032d902b9c31cec60a4418615ae921b", + "version": "6.3", + "port-version": 2 + }, { "git-tree": "ea7aecbf38cef7f64f929c679d55812e679ca496", "version": "6.3", From 3d802bb22482e01566dee4b3173c2e4634b5fc60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Aubrecht?= Date: Thu, 8 Sep 2022 20:40:05 +0200 Subject: [PATCH 563/791] [Libxpm] ADD new port (#25935) * first batch of xwindow PR ports - up to dbus * first batch of xwindow PR ports - up to dbus * format manifest * version stuff * remove if block * version stuff * fix xcb hash * fix xproto dependency on meson blocking cross builds * adjust message * use X11_xcb_LIB * version stuff * put xlib arm64-windows on baseline * fix dbus on osx and linux * version stuff * forget to set the value * fix --export-dynamic on osx * version dbus * ci-retrigger * add license (needs tool update) * version adjustments * version update * Added libxml port. * remove unnecessary comments * v db * Remove port version as it's initial port. * Added baseline version * Support only for windows and static * Allowed building debug version * update versions * Update ports/libxpm/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Added new lines * Update ports/libxpm/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update ports/libxpm/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update ports/libxpm/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Regenerated versions * Update ports/libxpm/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Libxpm is taken from gitlab now. * Apply suggestions from code review Co-authored-by: Billy O'Neal * nitpicks * rename xau to libxau * use vcpkg_install_copyright and silence usage * xtrans silence usage * format-manifest * v db * make license null for ports without exact match * xdmcp rename to libxdmcp * merge x11 wrapper into xlib rename xlib to libx11 to avoid a metaport * v db * missed dbus depending on x11. * v db * Update scripts/ci.baseline.txt * Initial switch to make * Added required dependencies * Build fixed * Updated versions * Update version database * format * version * Dropped not used code * versions * Enabled support for linux * versions Co-authored-by: Alexander Neumann Co-authored-by: Alexander Neumann Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Alexander Neumann Co-authored-by: Neumann-A <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: JackBoosY Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy O'Neal --- ports/libxpm/portfile.cmake | 36 +++++++++++++++++++++++++++++ ports/libxpm/remove_strings_h.patch | 16 +++++++++++++ ports/libxpm/vcpkg.json | 17 ++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libxpm.json | 9 ++++++++ 5 files changed, 82 insertions(+) create mode 100644 ports/libxpm/portfile.cmake create mode 100644 ports/libxpm/remove_strings_h.patch create mode 100644 ports/libxpm/vcpkg.json create mode 100644 versions/l-/libxpm.json diff --git a/ports/libxpm/portfile.cmake b/ports/libxpm/portfile.cmake new file mode 100644 index 00000000000000..907930754d6d41 --- /dev/null +++ b/ports/libxpm/portfile.cmake @@ -0,0 +1,36 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxpm + REF libXpm-3.5.13 + SHA512 250c8bf672789a81cfa258a516d40936f48a56cfaee94bf3f628e3f4a462bdd90eaaea787d66daf09ce4809b89c3eaea1e0771de03a6d7f1a59b31cc82be1c44 + PATCHES remove_strings_h.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + ) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() \ No newline at end of file diff --git a/ports/libxpm/remove_strings_h.patch b/ports/libxpm/remove_strings_h.patch new file mode 100644 index 00000000000000..6afeee016647b9 --- /dev/null +++ b/ports/libxpm/remove_strings_h.patch @@ -0,0 +1,16 @@ +diff --git a/src/XpmI.h b/src/XpmI.h +index 4360ad3b9..a8d78b0ba 100644 +--- a/src/XpmI.h ++++ b/src/XpmI.h +@@ -325,8 +325,10 @@ FUNC(xpmstrcasecmp, int, (char *s1, char *s2)); + #else + #undef xpmstrcasecmp + #define xpmstrcasecmp strcasecmp ++#if !defined(_MSC_VER) + #include + #endif ++#endif + + FUNC(xpmatoui, unsigned int, + (char *p, unsigned int l, unsigned int *ui_return)); + \ No newline at end of file diff --git a/ports/libxpm/vcpkg.json b/ports/libxpm/vcpkg.json new file mode 100644 index 00000000000000..90af303deeb77e --- /dev/null +++ b/ports/libxpm/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libxpm", + "version": "3.5.11", + "description": "XPM format pixmap library", + "homepage": "https://github.com/freedesktop/libXpm", + "license": "MIT", + "supports": "windows | linux", + "dependencies": [ + "libx11", + { + "name": "vcpkg-cmake", + "host": true + }, + "xorg-macros", + "xproto" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a0aaeeb6319f6d..8d82bdd5107767 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4348,6 +4348,10 @@ "baseline": "4.4.1", "port-version": 8 }, + "libxpm": { + "baseline": "3.5.11", + "port-version": 0 + }, "libxslt": { "baseline": "1.1.35", "port-version": 2 diff --git a/versions/l-/libxpm.json b/versions/l-/libxpm.json new file mode 100644 index 00000000000000..482bb46819aa30 --- /dev/null +++ b/versions/l-/libxpm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d72a962542b4175f99f5127b477866f2a5eba510", + "version": "3.5.11", + "port-version": 0 + } + ] +} From 4cde015b16d3d6b7ef1ea9a6e17e41757461eccb Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 8 Sep 2022 20:49:08 +0200 Subject: [PATCH 564/791] [Mesa] Update to 22.1.7 (#25890) * [mesa] 22.1.4 * delete correct patch ... * v db * fix feature names * v db * add enable-rtti * v db * update to latest and add offscreen feature * f m * v db --- ports/mesa/clang.patch | 52 --------------------------------------- ports/mesa/portfile.cmake | 13 ++++++---- ports/mesa/vcpkg.json | 30 +++++++++++++++++++++- versions/baseline.json | 2 +- versions/m-/mesa.json | 5 ++++ 5 files changed, 43 insertions(+), 59 deletions(-) delete mode 100644 ports/mesa/clang.patch diff --git a/ports/mesa/clang.patch b/ports/mesa/clang.patch deleted file mode 100644 index b8c7b547af1bdd..00000000000000 --- a/ports/mesa/clang.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/meson.build b/meson.build -index 53ec2c2ef95e65447dd0f0eb65c0f92a5906590d..c124b5fb0d2b28424f33aac54cd4f87c4249dc40 100644 ---- a/meson.build -+++ b/meson.build -@@ -1087,7 +1087,18 @@ elif host_machine.system() == 'windows' - '-DNOMINMAX', - ] - else -- pre_args += ['-D__MSVCRT_VERSION__=0x0700'] -+ # When the target is not mingw/ucrt -+ # NOTE: clang's stddef.h are conflict with mingw/ucrt's stddef.h -+ # So do not include headers that defined in clang for detecting -+ # _UCRT -+ if cc.compiles(''' -+ #include -+ #if defined(__MINGW32__) && defined(_UCRT) -+ #error -+ #endif -+ int main(void) { return 0; }''') -+ pre_args += ['-D__MSVCRT_VERSION__=0x0700'] -+ endif - endif - elif host_machine.system() == 'openbsd' - pre_args += '-D_ISOC11_SOURCE' -diff --git a/src/compiler/nir/nir_lower_atomics_to_ssbo.c b/src/compiler/nir/nir_lower_atomics_to_ssbo.c -index c1799d0b9d0af70148928a4b224172c188c64194..448f63bdc7cc3b9cae123e3c0abe79b4b5af380b 100644 ---- a/src/compiler/nir/nir_lower_atomics_to_ssbo.c -+++ b/src/compiler/nir/nir_lower_atomics_to_ssbo.c -@@ -27,10 +27,6 @@ - #include "nir.h" - #include "nir_builder.h" - --#if defined(_WIN32) && !defined(snprintf) --#define snprintf _snprintf --#endif -- - /* - * Remap atomic counters to SSBOs, starting from the shader's next SSBO slot - * (info.num_ssbos). -diff --git a/src/compiler/spirv/vtn_private.h b/src/compiler/spirv/vtn_private.h -index b1b40c8ee992eaeea985c58f4e8923724c1d385b..6053c2544a2628300cc8dc3311c8e4f0f69d36d5 100644 ---- a/src/compiler/spirv/vtn_private.h -+++ b/src/compiler/spirv/vtn_private.h -@@ -41,7 +41,7 @@ struct vtn_builder; - struct vtn_decoration; - - /* setjmp/longjmp is broken on MinGW: https://sourceforge.net/p/mingw-w64/bugs/406/ */ --#ifdef __MINGW32__ -+#if defined(__MINGW32__) && !defined(_UCRT) - #define vtn_setjmp __builtin_setjmp - #define vtn_longjmp __builtin_longjmp - #else diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 03ee3c3d992353..1e29f998da8bba 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -5,8 +5,6 @@ set(PATCHES # Fix symbols exporting for MinGW GCC x86 def-fixes.patch - # Fix MinGW clang build - clang.patch # Clover build on Windows clover.patch ) @@ -20,8 +18,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF mesa-22.0.2 - SHA512 1139bae1fa9f9b49727c5aaddad9b2908c7643d7c6c435544e8322c84d17c012f04aa73876bef8cab9b517e36957eb2a678b3001da2d69a32497ef4569f6172e + REF mesa-22.1.7 + SHA512 41302fc55ef429c14b1595832db3a898380230f86d2b84ac1ae3bd453d0aad87ec7ad310004dc64fcf34f58d8ea2736c13971c04eba056bcc549a4e3cc7c9470 FILE_DISAMBIGUATOR 1 HEAD_REF master PATCHES ${PATCHES} @@ -63,7 +61,12 @@ list(APPEND MESA_OPTIONS -Dvalgrind=disabled) list(APPEND MESA_OPTIONS -Dglvnd=false) list(APPEND MESA_OPTIONS -Dglx=disabled) list(APPEND MESA_OPTIONS -Dgbm=disabled) -list(APPEND MESA_OPTIONS -Dosmesa=true) + +if("offscreen" IN_LIST FEATURES) + list(APPEND MESA_OPTIONS -Dosmesa=true) +else() + list(APPEND MESA_OPTIONS -Dosmesa=false) +endif() if("llvm" IN_LIST FEATURES) list(APPEND MESA_OPTIONS -Dllvm=enabled) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 6218984c0b0231..4fd11853b2ada0 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mesa", - "version": "22.0.2", + "version": "22.1.7", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "license": "MIT AND BSL-1.0 AND SGI-B-2.0", @@ -89,11 +89,39 @@ "name": "llvm", "default-features": false, "features": [ + "enable-rtti", "libclc" ] + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-arm" + ], + "platform": "arm32" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-aarch64" + ], + "platform": "arm64" + }, + { + "name": "llvm", + "default-features": false, + "features": [ + "target-x86" + ], + "platform": "x64 | x86" } ] }, + "offscreen": { + "description": "Build with support for offscreen rendering (OSMesa)" + }, "opengl": { "description": "Build support for OpenGL (all versions)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8d82bdd5107767..46079e67fc1ea8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4629,7 +4629,7 @@ "port-version": 2 }, "mesa": { - "baseline": "22.0.2", + "baseline": "22.1.7", "port-version": 0 }, "meschach": { diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index 47f3b1968ea992..9151abe24ef6d8 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7febde5a35ffc0cc975e25219121f5dc7048e0ef", + "version": "22.1.7", + "port-version": 0 + }, { "git-tree": "7df282d97d0ef5ec5a19b770dced8cd773e570c0", "version": "22.0.2", From 0e9a28874c5aa581499ea11461d970269d1f3702 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Thu, 8 Sep 2022 17:01:20 -0400 Subject: [PATCH 565/791] Add VCPKG_TARGET_IS_EMSCRIPTEN, fix opus and libsodium ports for wasm32-emscripten (#26318) * vcpkg_common_definitions: Add VCPKG_TARGET_IS_EMSCRIPTEN * [opus] Fix wasm32-emscripten builds * [libsodium] Fix wasm32-emscripten builds * Run x-add-version --- docs/maintainers/vcpkg_common_definitions.md | 2 +- ports/libsodium/portfile.cmake | 5 +++++ ports/libsodium/vcpkg.json | 2 +- ports/opus/portfile.cmake | 2 ++ ports/opus/vcpkg.json | 2 +- scripts/cmake/vcpkg_common_definitions.cmake | 2 ++ versions/baseline.json | 4 ++-- versions/l-/libsodium.json | 5 +++++ versions/o-/opus.json | 5 +++++ 9 files changed, 24 insertions(+), 5 deletions(-) diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index b96dd3cbc5e56e..a8111b122736eb 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -5,7 +5,7 @@ The latest version of this document lives in the [vcpkg repo](https://github.com This file defines the following variables which are commonly needed or used in portfiles: ```cmake -VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD, EMSCRIPTEN. only defined if VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index 6fd98241f59b26..934cf8cf791e03 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -8,10 +8,15 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +if(VCPKG_TARGET_IS_EMSCRIPTEN) + set(ADDITIONAL_OPTIONS "-DENABLE_SSP=OFF") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + ${ADDITIONAL_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/libsodium/vcpkg.json b/ports/libsodium/vcpkg.json index d2b01af14e65dd..b4f0e9dea5a98e 100644 --- a/ports/libsodium/vcpkg.json +++ b/ports/libsodium/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsodium", "version": "1.0.18", - "port-version": 7, + "port-version": 8, "description": "A modern and easy-to-use crypto library", "homepage": "https://github.com/jedisct1/libsodium", "license": "ISC", diff --git a/ports/opus/portfile.cmake b/ports/opus/portfile.cmake index a9782d883682a5..02f784ed31bc58 100644 --- a/ports/opus/portfile.cmake +++ b/ports/opus/portfile.cmake @@ -16,6 +16,8 @@ if(VCPKG_TARGET_IS_MINGW) set(STACK_PROTECTOR OFF) string(APPEND VCPKG_C_FLAGS "-D_FORTIFY_SOURCE=0") string(APPEND VCPKG_CXX_FLAGS "-D_FORTIFY_SOURCE=0") +elseif(VCPKG_TARGET_IS_EMSCRIPTEN) + set(STACK_PROTECTOR OFF) else() set(STACK_PROTECTOR ON) endif() diff --git a/ports/opus/vcpkg.json b/ports/opus/vcpkg.json index e56ce6f8027b4d..8f4eee903f066c 100644 --- a/ports/opus/vcpkg.json +++ b/ports/opus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opus", "version": "1.3.1", - "port-version": 7, + "port-version": 8, "description": "Totally open, royalty-free, highly versatile audio codec", "homepage": "https://github.com/xiph/opus", "license": "BSD-3-Clause", diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index 599cc088a1b8f5..58730a89780d14 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -20,6 +20,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") set(VCPKG_TARGET_IS_WINDOWS ON) set(VCPKG_TARGET_IS_MINGW ON) +elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten") + set(VCPKG_TARGET_IS_EMSCRIPTEN ON) endif() #Helper variables to identify the host system name diff --git a/versions/baseline.json b/versions/baseline.json index 46079e67fc1ea8..dcf7ee0d98ee9f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4126,7 +4126,7 @@ }, "libsodium": { "baseline": "1.0.18", - "port-version": 7 + "port-version": 8 }, "libsoundio": { "baseline": "2.0.0", @@ -5414,7 +5414,7 @@ }, "opus": { "baseline": "1.3.1", - "port-version": 7 + "port-version": 8 }, "opusfile": { "baseline": "0.12", diff --git a/versions/l-/libsodium.json b/versions/l-/libsodium.json index b193c35e2707e7..9cf0250a355542 100644 --- a/versions/l-/libsodium.json +++ b/versions/l-/libsodium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72748d8d6030aac034e5b74229898016f833b33a", + "version": "1.0.18", + "port-version": 8 + }, { "git-tree": "9ffdf9b217021918c33311af9faa9b4a3086d004", "version": "1.0.18", diff --git a/versions/o-/opus.json b/versions/o-/opus.json index e9dfc1e319f0a1..bf880e70ac6288 100644 --- a/versions/o-/opus.json +++ b/versions/o-/opus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f69aedcd28796dfac85514ee0934e7f91ab05e06", + "version": "1.3.1", + "port-version": 8 + }, { "git-tree": "ad2b9149564516603dab6b996af3d4bc7ba29017", "version": "1.3.1", From d60e320788b84fd5f8901a6b9c8c460fecc1fc9d Mon Sep 17 00:00:00 2001 From: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Date: Thu, 8 Sep 2022 23:01:49 +0200 Subject: [PATCH 566/791] [z4kn4fein-semver] Add new port (#26644) * [semver] Add new port * [semver] semver.json git-tree update * [semver] vcpkg-cmake + vcpkg-cmake-config deps * [semver] semver.json git-tree update * [z4kn4fein-semver] Add new port * [z4kn4fein-semver] Add new port * [z4kn4fein-semver] remove semver --- ports/z4kn4fein-semver/portfile.cmake | 17 +++++++++++++++++ ports/z4kn4fein-semver/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/z-/z4kn4fein-semver.json | 9 +++++++++ 4 files changed, 47 insertions(+) create mode 100644 ports/z4kn4fein-semver/portfile.cmake create mode 100644 ports/z4kn4fein-semver/vcpkg.json create mode 100644 versions/z-/z4kn4fein-semver.json diff --git a/ports/z4kn4fein-semver/portfile.cmake b/ports/z4kn4fein-semver/portfile.cmake new file mode 100644 index 00000000000000..bc1ea10cf1e72f --- /dev/null +++ b/ports/z4kn4fein-semver/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO z4kn4fein/cpp-semver + REF v0.2.1 + SHA512 1eac4bfc87d8719c3172a32897ff50063959faee0df747cb9b45a1bc32dd4f2a2e4f6ac5700e99854f9c06e7e70f3bfbc4a1bedbb99730fef06c0e587f4614ff + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSEMVER_BUILD_TESTS=OFF +) +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/z4kn4fein-semver/vcpkg.json b/ports/z4kn4fein-semver/vcpkg.json new file mode 100644 index 00000000000000..87120737b007a5 --- /dev/null +++ b/ports/z4kn4fein-semver/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "z4kn4fein-semver", + "version": "0.2.1", + "description": "Semantic Versioning 2.0.0 library for modern C++", + "homepage": "https://github.com/z4kn4fein/cpp-semver", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index dcf7ee0d98ee9f..d2b57ff99dabdd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7976,6 +7976,10 @@ "baseline": "4.11.0", "port-version": 0 }, + "z4kn4fein-semver": { + "baseline": "0.2.1", + "port-version": 0 + }, "z85": { "baseline": "1.0", "port-version": 1 diff --git a/versions/z-/z4kn4fein-semver.json b/versions/z-/z4kn4fein-semver.json new file mode 100644 index 00000000000000..7869b1a814ca0d --- /dev/null +++ b/versions/z-/z4kn4fein-semver.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "55540e32df4b2fe6743a954483b361808460adb6", + "version": "0.2.1", + "port-version": 0 + } + ] +} From 1ddafcb6f62ee3488b6e32621d6aa343038a8ccc Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 9 Sep 2022 05:33:38 +0800 Subject: [PATCH 567/791] [zserge-webview] update to 2022-09-07 (#26711) * [zserge-webview] update to 2022-09-06-1 * update version * update repo * update version * add double quotes * update version * update portfile.cmake * update version --- ports/zserge-webview/portfile.cmake | 18 +++++++++--------- ports/zserge-webview/vcpkg.json | 7 ++++--- versions/baseline.json | 4 ++-- versions/z-/zserge-webview.json | 5 +++++ 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ports/zserge-webview/portfile.cmake b/ports/zserge-webview/portfile.cmake index 47b3e0c5808261..9bd482b8b2efd3 100644 --- a/ports/zserge-webview/portfile.cmake +++ b/ports/zserge-webview/portfile.cmake @@ -2,27 +2,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO zserge/webview - REF 16c93bcaeaeb6aa7bb5a1432de3bef0b9ecc44f3 - SHA512 153824bd444eafe6cc5ae00800422b41d4047dc85a164c465990c3be06d82003b532e1e869bb40e3a77cbe4789ff970fcda50ef00ac7b3e2f22ef3f566340026 + REPO webview/webview + REF 2ee04ccd0530e3928a872f5d508c114403803e61 #commit-2022-09-07 + SHA512 c784635a0c0948d91fea12643b04f0125e0be64d34aeddafbd0240aa977e867fa74efaf4e5dea7fe207bc0d1461b544f483d6228bf92dade7dc0d5e2c5a585a6 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/webview.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/webview.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") set(WEBVIEW_GTK "0") -set(WEBVIEW_WINAPI "0") +set(WEBVIEW_EDGE "0") set(WEBVIEW_COCOA "0") if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(WEBVIEW_WINAPI "1") + set(WEBVIEW_EDGE "1") elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") set(WEBVIEW_COCOA "1") elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") set(WEBVIEW_GTK "1") endif() -file(READ ${CURRENT_PACKAGES_DIR}/include/webview.h _contents) +file(READ "${CURRENT_PACKAGES_DIR}/include/webview.h" _contents) string(REPLACE "#ifdef WEBVIEW_STATIC" "#if 1 // #ifdef WEBVIEW_STATIC" @@ -48,7 +48,7 @@ string(REPLACE "${WEBVIEW_COCOA} // defined(WEBVIEW_COCOA)" _contents "${_contents}" ) -file(WRITE ${CURRENT_PACKAGES_DIR}/include/webview.h "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/webview.h" "${_contents}") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zserge-webview/vcpkg.json b/ports/zserge-webview/vcpkg.json index dbdfa5bf12e410..f7b41f31464104 100644 --- a/ports/zserge-webview/vcpkg.json +++ b/ports/zserge-webview/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zserge-webview", - "version-string": "2019-04-27", - "port-version": 3, - "description": "Tiny cross-platform webview library for C/C++/Golang." + "version-date": "2022-09-07", + "description": "Tiny cross-platform webview library for C/C++/Golang.", + "homepage": "https://github.com/webview/webview", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index d2b57ff99dabdd..53b0bf52b9f9d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8021,8 +8021,8 @@ "port-version": 0 }, "zserge-webview": { - "baseline": "2019-04-27", - "port-version": 3 + "baseline": "2022-09-07", + "port-version": 0 }, "zstd": { "baseline": "1.5.2", diff --git a/versions/z-/zserge-webview.json b/versions/z-/zserge-webview.json index a25f30fe0f0c18..6d2c4538ab144c 100644 --- a/versions/z-/zserge-webview.json +++ b/versions/z-/zserge-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "173fd4ea0d862f8cca595a8726fe7e0ef6444d45", + "version-date": "2022-09-07", + "port-version": 0 + }, { "git-tree": "e10cdad91c0d47a7dc03717d941254291abfd0eb", "version-string": "2019-04-27", From 03db827306e7b2e260ae99fb7a954a33d648623f Mon Sep 17 00:00:00 2001 From: Dancho <42138976+dzlaus@users.noreply.github.com> Date: Fri, 9 Sep 2022 20:53:46 +0200 Subject: [PATCH 568/791] [alpaca] Add port (#26729) * [alpaca] Add port * add comment #header-only library * x-add-version Co-authored-by: Lily Wang <494550702@qq.com> --- ports/alpaca/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/alpaca/vcpkg.json | 17 +++++++++++++++++ versions/a-/alpaca.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 58 insertions(+) create mode 100644 ports/alpaca/portfile.cmake create mode 100644 ports/alpaca/vcpkg.json create mode 100644 versions/a-/alpaca.json diff --git a/ports/alpaca/portfile.cmake b/ports/alpaca/portfile.cmake new file mode 100644 index 00000000000000..78643e9bb64ea0 --- /dev/null +++ b/ports/alpaca/portfile.cmake @@ -0,0 +1,28 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO p-ranav/alpaca + REF v0.2.0 + SHA512 0ac2c1c4f8e0534319bf852bac3852ee3674db7b1a9eda30462821ec4c9ddeeb6ceff09ef5f16eed9131af6c357a09f2cb909a12ea2f135ca7d496d90ff1865d + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DALPACA_BUILD_TESTS=OFF + -DALPACA_BUILD_BENCHMARKS=OFF + -DALPACA_BUILD_SAMPLES=OFF +) + +vcpkg_cmake_install() + +#Copy missing details/types folder from source path +file(COPY "${SOURCE_PATH}/include/alpaca/detail/types" DESTINATION "${CURRENT_PACKAGES_DIR}/include/alpaca/detail/") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/alpaca PACKAGE_NAME alpaca) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/alpaca/vcpkg.json b/ports/alpaca/vcpkg.json new file mode 100644 index 00000000000000..9cfb77d80af111 --- /dev/null +++ b/ports/alpaca/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "alpaca", + "version": "0.2.0", + "description": "Alpaca is a serialization library written in C++17 - Pack C++ structs into a compact byte-array without any macros or boilerplate code", + "homepage": "https://github.com/p-ranav/alpaca", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/alpaca.json b/versions/a-/alpaca.json new file mode 100644 index 00000000000000..402a7fdb981520 --- /dev/null +++ b/versions/a-/alpaca.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d8a880634d8e1b510b01820aea947721639c0d14", + "version": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 53b0bf52b9f9d4..41d24eca4201a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -68,6 +68,10 @@ "baseline": "5.2.6.0", "port-version": 2 }, + "alpaca": { + "baseline": "0.2.0", + "port-version": 0 + }, "alsa": { "baseline": "1.2.6.1", "port-version": 0 From 29787a71b3276aee4e3766245531b21219f4eaff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Fri, 9 Sep 2022 20:55:55 +0200 Subject: [PATCH 569/791] [status-code,outcome,llfio,ned14-internal-quickcpplib] Update to 2022-09-08 (#26724) * [quickcpplib] Update to 2022-09-08 * [status-code] Update to 2022-09-08 * [outcome] Update to version 2.2.4 * [llfio] Update to 2022-09-08 * [status-code,outcome,llfio] Update version database --- .../fix-vendored-status-code-include.patch | 16 --------- ports/llfio/issue-83-fix-backport.patch | 35 ------------------- ports/llfio/portfile.cmake | 10 ++---- ports/llfio/vcpkg.json | 7 ++-- .../ned14-internal-quickcpplib/portfile.cmake | 2 +- .../sha_manifest.cmake | 4 +-- ports/ned14-internal-quickcpplib/vcpkg.json | 6 +++- ports/outcome/portfile.cmake | 13 +++---- ports/outcome/vcpkg.json | 6 +++- ports/status-code/no-target-sources.patch | 12 ------- ports/status-code/portfile.cmake | 10 ++---- ports/status-code/vcpkg.json | 6 +++- versions/baseline.json | 10 +++--- versions/l-/llfio.json | 5 +++ versions/n-/ned14-internal-quickcpplib.json | 5 +++ versions/o-/outcome.json | 5 +++ versions/s-/status-code.json | 5 +++ 17 files changed, 59 insertions(+), 98 deletions(-) delete mode 100644 ports/llfio/fix-vendored-status-code-include.patch delete mode 100644 ports/llfio/issue-83-fix-backport.patch delete mode 100644 ports/status-code/no-target-sources.patch diff --git a/ports/llfio/fix-vendored-status-code-include.patch b/ports/llfio/fix-vendored-status-code-include.patch deleted file mode 100644 index 381b9143be561d..00000000000000 --- a/ports/llfio/fix-vendored-status-code-include.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/include/llfio/v2.0/status_code.hpp b/include/llfio/v2.0/status_code.hpp -index 03eb0f67..0c3f5e41 100644 ---- a/include/llfio/v2.0/status_code.hpp -+++ b/include/llfio/v2.0/status_code.hpp -@@ -57,7 +57,11 @@ as that (a) enables safe header only LLFIO on Windows (b) produces better codege - #include "outcome/try.hpp" - // Bring in status code utility - #include "outcome/experimental/coroutine_support.hpp" -+#if 0 - #include "outcome/experimental/status-code/include/system_code_from_exception.hpp" -+#else -+#include -+#endif - #if !defined(LLFIO_ENABLE_COROUTINES) && defined(OUTCOME_FOUND_COROUTINE_HEADER) - #define LLFIO_ENABLE_COROUTINES 1 - #endif diff --git a/ports/llfio/issue-83-fix-backport.patch b/ports/llfio/issue-83-fix-backport.patch deleted file mode 100644 index dbf4c53a921a21..00000000000000 --- a/ports/llfio/issue-83-fix-backport.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/include/llfio/v2.0/map_handle.hpp b/include/llfio/v2.0/map_handle.hpp -index 55cefa8f..3962be16 100644 ---- a/include/llfio/v2.0/map_handle.hpp -+++ b/include/llfio/v2.0/map_handle.hpp -@@ -294,8 +294,8 @@ support this operation). You may find the `is_nvram()` observer of particular us - */ - inline io_handle::const_buffer_type nvram_barrier(io_handle::const_buffer_type req, bool evict = false) noexcept - { -- auto *tp = (io_handle::const_buffer_type::pointer)(((uintptr_t) req.data()) & ~63); -- io_handle::const_buffer_type ret{tp, (size_t)(req.data() + 63 + req.size() - tp) & ~63}; -+ auto *tp = (io_handle::const_buffer_type::pointer) (((uintptr_t) req.data()) & ~63); -+ io_handle::const_buffer_type ret{tp, (size_t) (req.data() + 63 + req.size() - tp) & ~63}; - if(memory_flush_none == mem_flush_stores(ret.data(), ret.size(), evict ? memory_flush_evict : memory_flush_retain)) - { - ret = {tp, 0}; -@@ -954,7 +954,8 @@ namespace detail - { - try - { -- auto make_shared = [](map_handle h) { -+ auto make_shared = [](map_handle h) -> io_handle::registered_buffer_type -+ { - struct registered_buffer_type_indirect : io_multiplexer::_registered_buffer_type - { - map_handle h; -@@ -964,8 +965,7 @@ namespace detail - { - } - }; -- auto ptr = std::make_shared(std::move(h)); -- return ptr; -+ return io_handle::registered_buffer_type(std::make_shared(std::move(h))); - }; - const auto &page_sizes = utils::page_sizes(true); - size_t idx = 0; diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index 0f9674fb032960..cf02917a7c4afe 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -8,14 +8,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF 4a117d683b82a2e3e456c2ecc47a99c8406280fa - SHA512 7880356dbff10664a146a09558ba15f95cf6883ebe8e0af3d392fbd6f86f3455b9b5c8b6c5c1281c8fca93c358fcafd3468ab575eee0b483ec5b136ca59eef04 + REF ae7f9c5a92879285ad5100c89efc47ce1cb0031b + SHA512 aa8563e4e78e4355ae1041bd8d2984e33e8c8b7634a6eac029e4716dff564a9616ba1826504709f428f789103e8f4ab90447208e66583536ad692400e51eec60 HEAD_REF develop PATCHES - # https://github.com/ned14/llfio/issues/83 - # To be removed on next update - issue-83-fix-backport.patch - fix-vendored-status-code-include.patch ) vcpkg_from_github( @@ -88,4 +84,4 @@ if("status-code" IN_LIST FEATURES) else() file(INSTALL "${CURRENT_PORT_DIR}/usage-error-code-${VCPKG_LIBRARY_LINKAGE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") endif() -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 6856dc814836fa..6b8a3d03eb4de3 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,7 +1,10 @@ { "name": "llfio", - "version": "2.0-20220112", - "port-version": 3, + "version-date": "2022-09-08", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", "license": "Apache-2.0 OR BSL-1.0", diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index d9878b6bf9c9a5..c002bd691e6afb 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -99,4 +99,4 @@ vcpkg_cmake_config_fixup( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index 25aa1d36afd32b..76d249460efa5f 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF 9cdcd45d9036247dcade3d3ab1ff4adbe14b1927) -set(QUICKCPPLIB_SHA512 c23831c7a43b678bc33f11b3ccfc31ccb580f7225bfb7771010cdb5bc2d6a45a1d3c7b6b2dda7c5691fae817da3b303265156d434d7cb6efb9a86714b0095675) +set(QUICKCPPLIB_REF 1dac5b6bf79b5ec8eb3a75fa75844a30f88b8559) +set(QUICKCPPLIB_SHA512 c53f0a3d651db8be60a4a1308da1cc8458f3eb1fcb9296324bdce472c968a2ff4239a666e609755007f2397b146248a82aeab03824d7816eea9963339c989dca) set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643) set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4) diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index d3dbc2869563f0..f59ccf008096aa 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,6 +1,10 @@ { "name": "ned14-internal-quickcpplib", - "version-date": "2022-07-04", + "version-date": "2022-09-08", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", "license": "Apache-2.0 OR BSL-1.0", diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index 573b028e0c1ef4..a33baaf52352b1 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -24,16 +24,14 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF 147ec1e8673c34cb7cf431dfdbf211d8072d7656 - SHA512 139723be3618b9f3c26c7da6fa5682e6810fc93192bd8752fb7a39378fa1bee8c14b8077d30f71852995bc323dd7beb6676635991995577797b054913cb10231 + REF 90032f99503b4620f21d8160dc3af06fa343541f + SHA512 7eda0694098a118633c8ad0ef812f8b03db536548f51d1ca71ca98b9f9e445bcb24019cd4d1046da9215227ad85205c5b3631d0c66de6edc1fcc904b2d9e0e0f HEAD_REF develop PATCHES - fix-find-library.patch - fix-status-code-include.patch + fix-find-library.patch # incorporated into upstream after 2.2.4 + fix-status-code-include.patch # incorporated into upstream after 2.2.4 ) -set(extra_config) - # Because outcome's deployed files are header-only, the debug build is not necessary set(VCPKG_BUILD_TYPE release) @@ -47,7 +45,6 @@ vcpkg_cmake_configure( -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON - ${extra_config} ) if("run-tests" IN_LIST FEATURES) @@ -61,4 +58,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/outcome) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 1f4f2fe98a4ffd..4c34cefe95b381 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,6 +1,10 @@ { "name": "outcome", - "version": "2.2.3", + "version": "2.2.4", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "Provides very lightweight outcome and result (non-Boost edition)", "homepage": "https://github.com/ned14/outcome", "license": "Apache-2.0 OR BSL-1.0", diff --git a/ports/status-code/no-target-sources.patch b/ports/status-code/no-target-sources.patch deleted file mode 100644 index 38527094f7b617..00000000000000 --- a/ports/status-code/no-target-sources.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf3e8c1..aa380ca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,7 +108,6 @@ foreach(source - ) - target_sources(status-code INTERFACE - "$" -- "$" - ) - get_filename_component(dir ${source} DIRECTORY) - install(FILES "${source}" diff --git a/ports/status-code/portfile.cmake b/ports/status-code/portfile.cmake index 5530f0bfe4ef91..2e754a347151b2 100644 --- a/ports/status-code/portfile.cmake +++ b/ports/status-code/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/status-code - REF 60ec9e46916e5170051293e7925729ba88951934 - SHA512 f7a9448419f8e9228cd29c3b2e9268712de985675acea3b51f742ce88e524e7f51ccea7e08c89bf4e6d38eb1131416af052192531c168eed1f45e7eeda20fed6 + REF 8d5e162c9b02169fc6c95a79c54d1213027187b7 + SHA512 0af5a93a5015e070c2db8689f9a560c4a739ea40df3d7fee79f461d0274d7e79d27732cd339cb36e3af969adee0215c827b1fe63c177e8d7853c3fbe237f839f HEAD_REF master PATCHES - no-target-sources.patch # see https://github.com/ned14/status-code/issues/43 ) # Because status-code's deployed files are header-only, the debug build is not necessary @@ -22,9 +21,6 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/status-code) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") -file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/status-code") file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/Licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Licence.txt") diff --git a/ports/status-code/vcpkg.json b/ports/status-code/vcpkg.json index d76b0280a18c76..209d93bd7aacfc 100644 --- a/ports/status-code/vcpkg.json +++ b/ports/status-code/vcpkg.json @@ -1,6 +1,10 @@ { "name": "status-code", - "version-string": "1.0.0-20220104", + "version-date": "2022-09-08", + "maintainers": [ + "Niall Douglas ", + "Henrik Gaßmann " + ], "description": "Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028).", "homepage": "https://github.com/ned14/status-code", "license": "Apache-2.0 OR BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 41d24eca4201a1..0b513c15c9e961 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4409,8 +4409,8 @@ "port-version": 0 }, "llfio": { - "baseline": "2.0-20220112", - "port-version": 3 + "baseline": "2022-09-08", + "port-version": 0 }, "llgl": { "baseline": "2019-08-15", @@ -4985,7 +4985,7 @@ "port-version": 0 }, "ned14-internal-quickcpplib": { - "baseline": "2022-07-04", + "baseline": "2022-09-08", "port-version": 0 }, "neon2sse": { @@ -5453,7 +5453,7 @@ "port-version": 1 }, "outcome": { - "baseline": "2.2.3", + "baseline": "2.2.4", "port-version": 0 }, "p-ranav-csv": { @@ -7001,7 +7001,7 @@ "port-version": 1 }, "status-code": { - "baseline": "1.0.0-20220104", + "baseline": "2022-09-08", "port-version": 0 }, "status-value-lite": { diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index e9831a037feb51..257225bdc16717 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7974159a11b2a1a1f5aed7b6c500eae3fa54481f", + "version-date": "2022-09-08", + "port-version": 0 + }, { "git-tree": "b6959e579906ce5c4ea9aa59f467499dce49a3b6", "version": "2.0-20220112", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index aea00332456c68..8bc26ec4256681 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89d5a8630a97d2e3a7cae1a56253de75014a0738", + "version-date": "2022-09-08", + "port-version": 0 + }, { "git-tree": "081192c8586e086ef1fe8beb576255f86dc9458e", "version-date": "2022-07-04", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 55d1d3735d79e5..1bc47fa4d3eac5 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e3ec2f8aff33b12210dc924ff285b3cf23abb2a", + "version": "2.2.4", + "port-version": 0 + }, { "git-tree": "527591e7e0e55bc20c74cdc5553c08635b350999", "version": "2.2.3", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json index 24f644bba72ccb..dc729bc925c6dd 100644 --- a/versions/s-/status-code.json +++ b/versions/s-/status-code.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6862c7199dafad1c85c5fabb09a4842c3fa1fa3", + "version-date": "2022-09-08", + "port-version": 0 + }, { "git-tree": "acf45fde7be9ba87dd72d79d3d8f79bc639e8530", "version-string": "1.0.0-20220104", From 7e430e3a9024207d1b1c63448cc35a4965f3d3a0 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 9 Sep 2022 21:56:55 +0300 Subject: [PATCH 570/791] [libxslt] Update to 1.1.37 (#26718) --- ports/libxslt/extern_export.patch | 30 --------------------------- ports/libxslt/fix-gcrypt-deps.patch | 2 +- ports/libxslt/portfile.cmake | 5 ++--- ports/libxslt/skip-install-docs.patch | 2 +- ports/libxslt/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libxslt.json | 5 +++++ 7 files changed, 12 insertions(+), 39 deletions(-) delete mode 100644 ports/libxslt/extern_export.patch diff --git a/ports/libxslt/extern_export.patch b/ports/libxslt/extern_export.patch deleted file mode 100644 index df82ab5dc761cb..00000000000000 --- a/ports/libxslt/extern_export.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/libexslt/exsltexports.h b/libexslt/exsltexports.h -index 381567e0a..5088e0ec4 100644 ---- a/libexslt/exsltexports.h -+++ b/libexslt/exsltexports.h -@@ -48,8 +48,8 @@ - #undef EXSLTPUBVAR - #undef EXSLTCALL - #if defined(IN_LIBEXSLT) && !defined(LIBEXSLT_STATIC) -- #define EXSLTPUBFUN __declspec(dllexport) -- #define EXSLTPUBVAR __declspec(dllexport) -+ #define EXSLTPUBFUN extern __declspec(dllexport) -+ #define EXSLTPUBVAR extern __declspec(dllexport) - #else - #define EXSLTPUBFUN - #if !defined(LIBEXSLT_STATIC) -diff --git a/libxslt/xsltexports.h b/libxslt/xsltexports.h -index 99b6ac387..bbc556fb6 100644 ---- a/libxslt/xsltexports.h -+++ b/libxslt/xsltexports.h -@@ -50,8 +50,8 @@ - #undef XSLTPUBVAR - #undef XSLTCALL - #if defined(IN_LIBXSLT) && !defined(LIBXSLT_STATIC) -- #define XSLTPUBFUN __declspec(dllexport) -- #define XSLTPUBVAR __declspec(dllexport) -+ #define XSLTPUBFUN extern __declspec(dllexport) -+ #define XSLTPUBVAR extern __declspec(dllexport) - #else - #define XSLTPUBFUN - #if !defined(LIBXSLT_STATIC) diff --git a/ports/libxslt/fix-gcrypt-deps.patch b/ports/libxslt/fix-gcrypt-deps.patch index 681e15cf843434..6d91a7248d4f7b 100644 --- a/ports/libxslt/fix-gcrypt-deps.patch +++ b/ports/libxslt/fix-gcrypt-deps.patch @@ -4,7 +4,7 @@ index 6dc6501..d36a049 100644 +++ b/CMakeLists.txt @@ -317,7 +317,9 @@ target_include_directories( - if(LIBXSLT_WITH_CRYPTO) + if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) target_link_libraries(LibExslt PRIVATE Gcrypt::Gcrypt) - set(LIBGCRYPT_LIBS "-lgcrypt") + # For libexslt.pc diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index cf38cf6a74b689..275644836c4761 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxslt - REF v1.1.35 - SHA512 1ab264a8d3996d74a89a22e4062950ef968b9252736e0b5f975e6f45d63a6484993fe383b85831cef0e4b9c9c90f9b2b3d5432c15ee9381dbaeb2fa681ab9b46 + REF v1.1.37 + SHA512 4e7a57cbe02ceea34404213a88bdbb63a756edfab63063ce3979b670816ae3f6fb3637a49508204e6e46b936628e0a3b8b77e9201530a1184225bd68da403b25 HEAD_REF master PATCHES python3.patch @@ -10,7 +10,6 @@ vcpkg_from_github( libexslt-pkgconfig.patch fix-gcrypt-deps.patch skip-install-docs.patch - extern_export.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libxslt/skip-install-docs.patch b/ports/libxslt/skip-install-docs.patch index 542cae3b803e19..a5d59f3254031b 100644 --- a/ports/libxslt/skip-install-docs.patch +++ b/ports/libxslt/skip-install-docs.patch @@ -13,5 +13,5 @@ index 6dc6501..d36a049 100644 install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxslt COMPONENT documentation PATTERN Makefile.* EXCLUDE) +endif() - if(LIBXSLT_WITH_CRYPTO) + if(LIBXSLT_WITH_CRYPTO AND NOT WIN32) install(FILES FindGcrypt.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxslt-${PROJECT_VERSION} COMPONENT development) diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index d67f9d8565cd25..3526b489dcbe44 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxslt", - "version": "1.1.35", - "port-version": 2, + "version": "1.1.37", "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 0b513c15c9e961..1b5b40ec35b798 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4357,8 +4357,8 @@ "port-version": 0 }, "libxslt": { - "baseline": "1.1.35", - "port-version": 2 + "baseline": "1.1.37", + "port-version": 0 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 42335a998d8f3e..0c97d9e82e239c 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9aebd365040f19a4060880bbf942aeda189e94ed", + "version": "1.1.37", + "port-version": 0 + }, { "git-tree": "fb07abefc8894accd9967f41c8db983dcc031189", "version": "1.1.35", From 8e3595fad04f60f55250ff0e2f2d4e7e7a580a50 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 9 Sep 2022 21:08:05 +0200 Subject: [PATCH 571/791] [speex] Use native autotools for all triplets (#26502) * Use autotools build for windows * Fix license * Limit subdirs for vpckg build * Update versions * CI [skip actions] --- ...ake-pkg-config-lib-name-configurable.patch | 13 -- ports/speex/CMakeLists.txt | 111 ------------------ ports/speex/fix-vla-check.patch | 13 ++ ports/speex/portfile.cmake | 56 +++------ ports/speex/subdirs.patch | 13 ++ ports/speex/vcpkg.json | 10 +- versions/baseline.json | 2 +- versions/s-/speex.json | 5 + 8 files changed, 53 insertions(+), 170 deletions(-) delete mode 100644 ports/speex/0001-make-pkg-config-lib-name-configurable.patch delete mode 100644 ports/speex/CMakeLists.txt create mode 100644 ports/speex/fix-vla-check.patch create mode 100644 ports/speex/subdirs.patch diff --git a/ports/speex/0001-make-pkg-config-lib-name-configurable.patch b/ports/speex/0001-make-pkg-config-lib-name-configurable.patch deleted file mode 100644 index 72b61f4cc5a4e3..00000000000000 --- a/ports/speex/0001-make-pkg-config-lib-name-configurable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/speex.pc.in b/speex.pc.in -index 97bba4f..52a1d3c 100644 ---- a/speex.pc.in -+++ b/speex.pc.in -@@ -10,6 +10,6 @@ Description: Speex is an audio codec tuned for speech - Version: @SPEEX_VERSION@ - Requires: - Conflicts: --Libs: -L${libdir} -lspeex -+Libs: -L${libdir} -l@SPEEXLIB@ - Libs.private: @LIBM@ - Cflags: -I${includedir} - diff --git a/ports/speex/CMakeLists.txt b/ports/speex/CMakeLists.txt deleted file mode 100644 index b151b2439f7077..00000000000000 --- a/ports/speex/CMakeLists.txt +++ /dev/null @@ -1,111 +0,0 @@ -cmake_minimum_required (VERSION 3.8.0) -project (libspeex C) - -include(GNUInstallDirs) -include(CheckLibraryExists) - -option(USE_SSE "USE_SSE used Note: USE_SSE and FIXED_POINT are mutually exclusive." ON) -if(MSVC) - add_definitions(-DHAVE_CONFIG_H) - if(USE_SSE) - add_definitions(-DUSE_SSE -DFLOATING_POINT) - else() - add_definitions(-DFIXED_POINT) - endif() -endif() - -include_directories(win32 include) - -set(CMAKE_DEBUG_POSTFIX d) - -file(READ "win32/libspeex.def" _contents) -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - string(REPLACE "LIBRARY libspeex" "LIBRARY libspeexd" _contents "${_contents}") -endif() -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/libspeex.def" - "${_contents}\n" - "speex_nb_mode\n" - "speex_wb_mode\n" - "speex_uwb_mode\n" - "speex_mode_list\n" - "speex_header_free\n" -) - -file(STRINGS "configure.ac" - _speex_version_defines REGEX "SPEEX_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") -foreach(ver ${_speex_version_defines}) - if(ver MATCHES "SPEEX_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") - set(SPEEX_${CMAKE_MATCH_1}_VERSION "${CMAKE_MATCH_2}" CACHE INTERNAL "") - endif() -endforeach() -set(SPEEX_VERSION ${SPEEX_MAJOR_VERSION}.${SPEEX_MINOR_VERSION}.${SPEEX_MICRO_VERSION}) - -set(SRC - "libspeex/bits.c" - "libspeex/cb_search.c" - "libspeex/exc_10_16_table.c" - "libspeex/exc_10_32_table.c" - "libspeex/exc_20_32_table.c" - "libspeex/exc_5_256_table.c" - "libspeex/exc_5_64_table.c" - "libspeex/exc_8_128_table.c" - "libspeex/fftwrap.c" - "libspeex/filters.c" - "libspeex/gain_table.c" - "libspeex/gain_table_lbr.c" - "libspeex/hexc_10_32_table.c" - "libspeex/hexc_table.c" - "libspeex/high_lsp_tables.c" - "libspeex/kiss_fft.c" - "libspeex/kiss_fftr.c" - "libspeex/lpc.c" - "libspeex/lsp.c" - "libspeex/lsp_tables_nb.c" - "libspeex/ltp.c" - "libspeex/modes.c" - "libspeex/modes_wb.c" - "libspeex/nb_celp.c" - "libspeex/quant_lsp.c" - "libspeex/sb_celp.c" - "libspeex/smallft.c" - "libspeex/speex.c" - "libspeex/speex_callbacks.c" - "libspeex/speex_header.c" - "libspeex/stereo.c" - "libspeex/vbr.c" - "libspeex/vq.c" - "libspeex/window.c" - "${CMAKE_CURRENT_BINARY_DIR}/libspeex.def" -) - -add_library(libspeex ${SRC}) - -install( - TARGETS libspeex - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) - -if(NOT DISABLE_INSTALL_HEADERS) - install(DIRECTORY include/ DESTINATION include FILES_MATCHING PATTERN "*.h") -endif() - -# pkgconfig file -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) -set(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) -set(LIBM ) -check_library_exists(m ceil "" LIBMEXIST) -if(LIBMEXIST) - list(APPEND LIBM -lm) -endif() -set(SPEEXLIB "${CMAKE_PROJECT_NAME}") -if(CMAKE_BUILD_TYPE STREQUAL "Debug") - set(SPEEXLIB "${CMAKE_PROJECT_NAME}d") -endif() -configure_file(speex.pc.in speex.pc @ONLY) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/speex.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) diff --git a/ports/speex/fix-vla-check.patch b/ports/speex/fix-vla-check.patch new file mode 100644 index 00000000000000..9c64922c5b3a0e --- /dev/null +++ b/ports/speex/fix-vla-check.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index d94c2fe..b813148 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -37,7 +37,7 @@ AC_C_RESTRICT + + + AC_MSG_CHECKING(for C99 variable-size arrays) +-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ + int foo; + foo = 10; + int array[foo]; diff --git a/ports/speex/portfile.cmake b/ports/speex/portfile.cmake index b37fb9e1891ee2..3bd2df656212d7 100644 --- a/ports/speex/portfile.cmake +++ b/ports/speex/portfile.cmake @@ -1,47 +1,29 @@ -if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND PATCHES "0001-make-pkg-config-lib-name-configurable.patch") -endif() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO xiph/speex - REF 5dceaaf3e23ee7fd17c80cb5f02a838fd6c18e01 #Speex-1.2.1 - SHA512 d03da906ec26ddcea2e1dc4157ac6dd056e1407381b0f37edd350552a02a7372e9108b4e39ae522f1b165be04b813ee11db0b47d17607e4dad18118b9041636b - HEAD_REF master - PATCHES ${PATCHES} + OUT_SOURCE_PATH SOURCE_PATH + REPO xiph/speex + REF 5dceaaf3e23ee7fd17c80cb5f02a838fd6c18e01 #Speex-1.2.1 + SHA512 d03da906ec26ddcea2e1dc4157ac6dd056e1407381b0f37edd350552a02a7372e9108b4e39ae522f1b165be04b813ee11db0b47d17607e4dad18118b9041636b + HEAD_REF master + PATCHES + fix-vla-check.patch + subdirs.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON - ) - vcpkg_cmake_install() - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/speex/speex.h" - "extern const SpeexMode" - "__declspec(dllimport) extern const SpeexMode" - ) - endif() -else() - if(VCPKG_TARGET_IS_OSX) +if(VCPKG_TARGET_IS_OSX) message("${PORT} currently requires the following libraries from the system package manager:\n autoconf\n automake\n libtool\n\nIt can be installed with brew install autoconf automake libtool") - elseif(VCPKG_TARGET_IS_LINUX) +elseif(VCPKG_TARGET_IS_LINUX) message("${PORT} currently requires the following libraries from the system package manager:\n autoconf\n automake\n libtool\n\nIt can be installed with apt-get install autoconf automake libtool") - endif() - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - OPTIONS --disable-binaries # no example programs (require libogg) - ) - vcpkg_install_make() - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + --disable-binaries # no example programs (GPL, require libogg) +) +vcpkg_install_make() vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/speex/subdirs.patch b/ports/speex/subdirs.patch new file mode 100644 index 00000000000000..6832de2b327842 --- /dev/null +++ b/ports/speex/subdirs.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.am b/Makefile.am +index dc90415..3b3c16d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -14,7 +14,7 @@ pkgconfig_DATA = speex.pc + EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP + + #Fools KDevelop into including all files +-SUBDIRS = libspeex include doc win32 symbian ti ++SUBDIRS = libspeex include + + if BUILD_BINARIES + SUBDIRS += src diff --git a/ports/speex/vcpkg.json b/ports/speex/vcpkg.json index 3da263af821bc5..c317c34116cdce 100644 --- a/ports/speex/vcpkg.json +++ b/ports/speex/vcpkg.json @@ -1,14 +1,8 @@ { "name": "speex", "version": "1.2.1", + "port-version": 1, "description": "Speex is an Open Source/Free Software patent-free audio compression format designed for speech.", "homepage": "https://github.com/xiph/speex", - "license": "LGPL-2.0-or-later", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true, - "platform": "windows" - } - ] + "license": "BSD-3-Clause" } diff --git a/versions/baseline.json b/versions/baseline.json index 1b5b40ec35b798..d8e769be6947a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6910,7 +6910,7 @@ }, "speex": { "baseline": "1.2.1", - "port-version": 0 + "port-version": 1 }, "speexdsp": { "baseline": "1.2.1", diff --git a/versions/s-/speex.json b/versions/s-/speex.json index 092587ccc1a502..0b5a6a4621a50a 100644 --- a/versions/s-/speex.json +++ b/versions/s-/speex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83710ad0fb1dfab0d1de32a44d440abca53f1f6e", + "version": "1.2.1", + "port-version": 1 + }, { "git-tree": "0520509fd60e20c5362959a7549dd29f7d04d54b", "version": "1.2.1", From f2453e0619f21b4d657051a298dce7eaf76c76b4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 12 Sep 2022 22:30:47 +0200 Subject: [PATCH 572/791] [Qt5|qmake] pass toolchain setup (#26354) * [qt5/qmake] Pass toolchain flags to build * v db * forgot a dependency * v db * add required ar flags * v db * Apply suggestions from code review Co-authored-by: Javier Matos Denizac * v db * inc port version * v db * qt5-base * v db Co-authored-by: Javier Matos Denizac --- ports/qt5-base/cmake/configure_qt.cmake | 73 +++++++++++++++++-- ports/qt5-base/cmake/qt_build_submodule.cmake | 3 - ports/qt5-base/portfile.cmake | 3 - ports/qt5-base/vcpkg.json | 5 ++ scripts/cmake/vcpkg_configure_qmake.cmake | 71 +++++++++++++++++- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 ++ 7 files changed, 145 insertions(+), 17 deletions(-) diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake index ff2c8bc320554a..32aa35220e57d4 100644 --- a/ports/qt5-base/cmake/configure_qt.cmake +++ b/ports/qt5-base/cmake/configure_qt.cmake @@ -29,6 +29,46 @@ function(configure_qt) #Cleanup previous build folders file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + vcpkg_cmake_get_vars(detected_file) + include("${detected_file}") + function(qmake_append_program var qmake_var value) + get_filename_component(prog "${value}" NAME) + # QMake assumes everything is on PATH? + vcpkg_list(APPEND ${var} "${qmake_var}=${prog}") + find_program(${qmake_var} NAMES "${prog}") + cmake_path(COMPARE "${${qmake_var}}" EQUAL "${value}" correct_prog_on_path) + if(NOT correct_prog_on_path AND NOT "${value}" MATCHES "|:") + message(FATAL_ERROR "Detect path mismatch for '${qmake_var}'. '${value}' is not the same as '${${qmake_var}}'. Please correct your PATH!") + endif() + unset(${qmake_var}) + unset(${qmake_var} CACHE) + set(${var} "${${var}}" PARENT_SCOPE) + endfunction() + # Setup Build tools + set(qmake_build_tools "") + qmake_append_program(qmake_build_tools "QMAKE_CC" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_CXX" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_AR" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_RANLIB" "${VCPKG_DETECTED_CMAKE_RANLIB}") + qmake_append_program(qmake_build_tools "QMAKE_STRIP" "${VCPKG_DETECTED_CMAKE_STRIP}") + qmake_append_program(qmake_build_tools "QMAKE_NM" "${VCPKG_DETECTED_CMAKE_NM}") + qmake_append_program(qmake_build_tools "QMAKE_RC" "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_MT" "${VCPKG_DETECTED_CMAKE_MT}") + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_DETECTED_CMAKE_AR MATCHES "ar$") + # This is the reason why users should probably use a + # customized qt.conf with more domain knowledge. + vcpkg_list(APPEND qmake_build_tools "QMAKE_AR+=qc") + endif() + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + qmake_append_program(qmake_build_tools "QMAKE_LIB" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_LINKER}") + else() + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_SHLIB" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C_SHLIB" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + endif() + #Find and ad Perl to PATH vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) @@ -39,7 +79,7 @@ function(configure_qt) else() #list(APPEND _csc_OPTIONS_DEBUG -separate-debug-info) endif() - + if(VCPKG_TARGET_IS_WINDOWS AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") list(APPEND _csc_OPTIONS -static-runtime) endif() @@ -69,7 +109,7 @@ function(configure_qt) set(ENV{PKG_CONFIG} "${PKGCONFIG}") get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY) vcpkg_add_to_path("${PKGCONFIG_PATH}") - + foreach(_buildname ${BUILDTYPES}) set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${_path_suffix_${_buildname}}/lib/pkgconfig") set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig") @@ -86,6 +126,25 @@ function(configure_qt) message(STATUS "Configuring ${_build_triplet}") set(_build_dir "${CURRENT_BUILDTREES_DIR}/${_build_triplet}") file(MAKE_DIRECTORY ${_build_dir}) + + set(qmake_comp_flags "") + # Note sure about these. VCPKG_QMAKE_OPTIONS offers a way to opt out of these. (earlier values being overwritten by later values; = set +=append *=append unique -=remove) + macro(qmake_add_flags qmake_var operation flags) + string(STRIP "${flags}" striped_flags) + if(striped_flags) + vcpkg_list(APPEND qmake_comp_flags "${qmake_var}${operation}${striped_flags}") + endif() + endmacro() + + qmake_add_flags("QMAKE_LIBS" "+=" "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + qmake_add_flags("QMAKE_RC" "+=" "${VCPKG_COMBINED_RC_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_CFLAGS_${_buildname}" "+=" "${VCPKG_COMBINED_C_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_CXXFLAGS_${_buildname}" "+=" "${VCPKG_COMBINED_CXX_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LFLAGS" "+=" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LFLAGS_SHLIB" "+=" "${VCPKG_COMBINED_SHARED_LINKER_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LFLAGS_PLUGIN" "+=" "${VCPKG_COMBINED_MODULE_LINKER_FLAGS_${_buildname}}") + qmake_add_flags("QMAKE_LIBFLAGS_${_buildname}" "+=" "${VCPKG_COMBINED_STATIC_LINKER_FLAGS_${_buildname}}") + # These paths get hardcoded into qmake. So point them into the CURRENT_INSTALLED_DIR instead of CURRENT_PACKAGES_DIR # makefiles will be fixed to install into CURRENT_PACKAGES_DIR in install_qt set(BUILD_OPTIONS ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildname}} @@ -113,19 +172,19 @@ function(configure_qt) -L ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib/manual-link -platform ${_csc_TARGET_PLATFORM} ) - + if(DEFINED _csc_HOST_TOOLS_ROOT) #use qmake if(WIN32) set(INVOKE_OPTIONS "QMAKE_CXX.QMAKE_MSC_VER=1911" "QMAKE_MSC_VER=1911") endif() vcpkg_execute_required_process( - COMMAND ${INVOKE} "${_csc_SOURCE_PATH}" "${INVOKE_OPTIONS}" -- ${BUILD_OPTIONS} + COMMAND ${INVOKE} "${_csc_SOURCE_PATH}" "${INVOKE_OPTIONS}" -- ${BUILD_OPTIONS} ${qmake_build_tools} ${qmake_comp_flags} WORKING_DIRECTORY ${_build_dir} LOGNAME config-${_build_triplet} ) else()# call configure (builds qmake for triplet and calls it like above) vcpkg_execute_required_process( - COMMAND "${INVOKE}" ${BUILD_OPTIONS} + COMMAND "${INVOKE}" ${BUILD_OPTIONS} ${qmake_build_tools} ${qmake_comp_flags} WORKING_DIRECTORY ${_build_dir} LOGNAME config-${_build_triplet} ) @@ -145,7 +204,7 @@ function(configure_qt) string(REGEX REPLACE "\\[EffectiveSourcePaths\\]\r?\nPrefix=[^\r\n]+\r?\n" "" _contents ${_contents}) string(REPLACE "Sysroot=\n" "" _contents ${_contents}) string(REPLACE "SysrootifyPrefix=false\n" "" _contents ${_contents}) - file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}") - endforeach() + file(WRITE "${CURRENT_PACKAGES_DIR}/tools/qt5/qt_${_build_type_${_buildname}}.conf" "${_contents}") + endforeach() endfunction() diff --git a/ports/qt5-base/cmake/qt_build_submodule.cmake b/ports/qt5-base/cmake/qt_build_submodule.cmake index e2e390cec1cf43..24e6385cfbdb6a 100644 --- a/ports/qt5-base/cmake/qt_build_submodule.cmake +++ b/ports/qt5-base/cmake/qt_build_submodule.cmake @@ -1,8 +1,5 @@ function(qt_build_submodule SOURCE_PATH) - # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings - set(ENV{_CL_} "/utf-8") - if(NOT PORT STREQUAL "qt5-webengine") vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 4ce58f4e764008..4ce376a6f26300 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -80,9 +80,6 @@ endforeach() ######################### ## Setup Configure options -# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings -set(ENV{_CL_} "/utf-8") - set(CORE_OPTIONS -confirm-license -opensource diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index c2fa135c310b37..21902bc92fd448 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-base", "version": "5.15.6", + "port-version": 1, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, @@ -31,6 +32,10 @@ "default-features": false }, "sqlite3", + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, { "name": "vcpkg-pkgconfig-get-modules", "host": true diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index 9a5ed00ceb2e4b..86678d29685757 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -13,6 +13,52 @@ function(vcpkg_configure_qmake) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") endif() + z_vcpkg_get_cmake_vars(cmake_vars_file) + include("${cmake_vars_file}") + + function(qmake_append_program var qmake_var value) + get_filename_component(prog "${value}" NAME) + # QMake assumes everything is on PATH? + vcpkg_list(APPEND ${var} "${qmake_var}=${prog}") + find_program(${qmake_var} NAMES "${prog}") + cmake_path(COMPARE "${${qmake_var}}" EQUAL "${value}" correct_prog_on_path) + if(NOT correct_prog_on_path AND NOT "${value}" MATCHES "|:") + message(FATAL_ERROR "Detect path mismatch for '${qmake_var}'. '${value}' is not the same as '${${qmake_var}}'. Please correct your PATH!") + endif() + unset(${qmake_var}) + unset(${qmake_var} CACHE) + set(${var} "${${var}}" PARENT_SCOPE) + endfunction() + # Setup Build tools + set(qmake_build_tools "") + qmake_append_program(qmake_build_tools "QMAKE_CC" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_CXX" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_AR" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_RANLIB" "${VCPKG_DETECTED_CMAKE_RANLIB}") + qmake_append_program(qmake_build_tools "QMAKE_STRIP" "${VCPKG_DETECTED_CMAKE_STRIP}") + qmake_append_program(qmake_build_tools "QMAKE_NM" "${VCPKG_DETECTED_CMAKE_NM}") + qmake_append_program(qmake_build_tools "QMAKE_RC" "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_MT" "${VCPKG_DETECTED_CMAKE_MT}") + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_DETECTED_CMAKE_AR MATCHES "ar$") + vcpkg_list(APPEND qmake_build_tools "QMAKE_AR+=qc") + endif() + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + qmake_append_program(qmake_build_tools "QMAKE_LIB" "${VCPKG_DETECTED_CMAKE_AR}") + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_LINKER}") + else() + qmake_append_program(qmake_build_tools "QMAKE_LINK" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_SHLIB" "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + qmake_append_program(qmake_build_tools "QMAKE_LINK_C_SHLIB" "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + endif() + set(qmake_comp_flags "") + macro(qmake_add_flags qmake_var operation flags) + string(STRIP "${flags}" striped_flags) + if(striped_flags) + vcpkg_list(APPEND qmake_comp_flags "${qmake_var}${operation}${striped_flags}") + endif() + endmacro() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_list(APPEND arg_OPTIONS "CONFIG-=shared" "CONFIG*=static") else() @@ -25,7 +71,7 @@ function(vcpkg_configure_qmake) endif() if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) - set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) + set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} "${VCPKG_OSX_DEPLOYMENT_TARGET}") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -41,13 +87,22 @@ function(vcpkg_configure_qmake) message(STATUS "Configuring ${TARGET_TRIPLET}-rel") file(MAKE_DIRECTORY "${current_binary_dir}") + qmake_add_flags("QMAKE_LIBS" "+=" "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + qmake_add_flags("QMAKE_RC" "+=" "${VCPKG_DETECTED_CMAKE_RC_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_CFLAGS_RELEASE" "+=" "${VCPKG_DETECTED_CMAKE_C_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_CXXFLAGS_RELEASE" "+=" "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LFLAGS" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LFLAGS_SHLIB" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LFLAGS_PLUGIN" "+=" "${VCPKG_DETECTED_CMAKE_MODULE_LINKER_FLAGS_RELEASE}") + qmake_add_flags("QMAKE_LIBFLAGS_RELEASE" "+=" "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_RELEASE}") + vcpkg_list(SET build_opt_param) if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_RELEASE) vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_RELEASE}) endif() vcpkg_execute_required_process( - COMMAND "${qmake_executable}" CONFIG-=debug CONFIG+=release + COMMAND "${qmake_executable}" CONFIG-=debug CONFIG+=release ${qmake_build_tools} ${qmake_comp_flags} ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} ${arg_SOURCE_PATH} -qtconf "${current_binary_dir}/qt.conf" ${build_opt_param} @@ -76,12 +131,22 @@ function(vcpkg_configure_qmake) message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") file(MAKE_DIRECTORY "${current_binary_dir}") + set(qmake_comp_flags "") + qmake_add_flags("QMAKE_LIBS" "+=" "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES} ${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + qmake_add_flags("QMAKE_RC" "+=" "${VCPKG_DETECTED_CMAKE_RC_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_CFLAGS_DEBUG" "+=" "${VCPKG_DETECTED_CMAKE_C_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_CXXFLAGS_DEBUG" "+=" "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LFLAGS" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LFLAGS_SHLIB" "+=" "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LFLAGS_PLUGIN" "+=" "${VCPKG_DETECTED_CMAKE_MODULE_LINKER_FLAGS_DEBUG}") + qmake_add_flags("QMAKE_LIBFLAGS_DEBUG" "+=" "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_DEBUG}") + vcpkg_list(SET build_opt_param) if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_DEBUG) vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_DEBUG}) endif() vcpkg_execute_required_process( - COMMAND "${qmake_executable}" CONFIG-=release CONFIG+=debug + COMMAND "${qmake_executable}" CONFIG-=release CONFIG+=debug ${qmake_build_tools} ${qmake_comp_flags} ${arg_OPTIONS} ${arg_OPTIONS_DEBUG} ${arg_SOURCE_PATH} -qtconf "${current_binary_dir}/qt.conf" ${build_opt_param} diff --git a/versions/baseline.json b/versions/baseline.json index d8e769be6947a3..57a3709c0b42de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5898,7 +5898,7 @@ }, "qt5-base": { "baseline": "5.15.6", - "port-version": 0 + "port-version": 1 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 9cc38a61b5f6fe..b37d83c7a98ca0 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7881b89de5ec007d8ea1cd868fd76dd74a2f08ad", + "version": "5.15.6", + "port-version": 1 + }, { "git-tree": "432a70f67a01e3348d79cd158563b033a0304452", "version": "5.15.6", From 16f5ba45a9be82a05c3c5a45b729516cb0f26bbd Mon Sep 17 00:00:00 2001 From: Gabe Rundlett Date: Mon, 12 Sep 2022 14:43:31 -0600 Subject: [PATCH 573/791] [glslang] Bump version to 11.11.0 (#26671) * Bump glslang port to 11.11.0 * Fix sha to match the one shown on the microsoft build server * Fix portfile issues (at least for Windows) * Potentially fix shaderc port * update shaderc version * shaderc appears to require Threads? * change shaderc port version? * fix local port-version * Added custom usage as per PR suggestion! * Updated glslang port tree version hash --- .../always-install-resource-limits.patch | 13 ------------ ports/glslang/glslang-config.cmake | 7 ------- ports/glslang/portfile.cmake | 15 ++++--------- ports/glslang/usage | 4 ++++ ports/glslang/vcpkg.json | 2 +- ports/shaderc/glslang/CMakeLists.txt | 21 +++++++++++++------ ports/shaderc/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/g-/glslang.json | 5 +++++ versions/s-/shaderc.json | 5 +++++ 10 files changed, 37 insertions(+), 41 deletions(-) delete mode 100644 ports/glslang/always-install-resource-limits.patch delete mode 100644 ports/glslang/glslang-config.cmake create mode 100644 ports/glslang/usage diff --git a/ports/glslang/always-install-resource-limits.patch b/ports/glslang/always-install-resource-limits.patch deleted file mode 100644 index 56c34dfc44386a..00000000000000 --- a/ports/glslang/always-install-resource-limits.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 751d1cd71..0f5cf0dc0 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -98,7 +98,7 @@ if(ENABLE_GLSLANG_INSTALL) - install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() - -- if(BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS OR TRUE) - install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ports/glslang/glslang-config.cmake b/ports/glslang/glslang-config.cmake deleted file mode 100644 index 5eb356151f53ae..00000000000000 --- a/ports/glslang/glslang-config.cmake +++ /dev/null @@ -1,7 +0,0 @@ -include(CMakeFindDependencyMacro) - -find_dependency(Threads) - -foreach(targets OGLCompiler OSDependent glslang glslang-default-resource-limits glslangValidator HLSL SPIRV spirv-remap SPVRemapper) - include("${CMAKE_CURRENT_LIST_DIR}/${targets}Targets.cmake" OPTIONAL) -endforeach() diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index e153195dcaf384..90620f64b52175 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF 11.8.0 - SHA512 b60d328fab6d5319e49fbf8aeb86c31a7c8dfb4bc75d39c081cbb72f90750fd98f2a4f3ab091614187ad9e0d2e27471f9dab7ca5547cabb856d17bff694f8c98 + REF 11.11.0 + SHA512 c018271d499efff03540e4572a9c2f1f752c81c87efe7f2e63c2631ac47cecfedffdcfee68eddaf9187603eaae8ccd9a3e5640a022ba9fd7d05950f7827bf8cd HEAD_REF master PATCHES ignore-crt.patch - always-install-resource-limits.patch ) vcpkg_find_acquire_program(PYTHON3) @@ -43,13 +42,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/bin") -if(EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake" OR EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake") - message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile") -endif() - -file(COPY - "${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" -) +# Install custom usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glslang/usage b/ports/glslang/usage new file mode 100644 index 00000000000000..795414824a60a7 --- /dev/null +++ b/ports/glslang/usage @@ -0,0 +1,4 @@ +The package glslang provides CMake targets: + + find_package(glslang CONFIG REQUIRED) + target_link_libraries(main PRIVATE glslang::OSDependent glslang::glslang glslang::MachineIndependent glslang::GenericCodeGen glslang::OGLCompiler glslang::glslangValidator glslang::spirv-remap glslang::glslang-default-resource-limits glslang::SPVRemapper glslang::SPIRV glslang::HLSL) \ No newline at end of file diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index b09ee8dedbd1b6..1642c12981fa15 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glslang", - "version": "11.8.0", + "version": "11.11.0", "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", "homepage": "https://github.com/KhronosGroup/glslang", "dependencies": [ diff --git a/ports/shaderc/glslang/CMakeLists.txt b/ports/shaderc/glslang/CMakeLists.txt index 0e745779dbd5d1..3b31564f9f8367 100644 --- a/ports/shaderc/glslang/CMakeLists.txt +++ b/ports/shaderc/glslang/CMakeLists.txt @@ -2,12 +2,21 @@ cmake_minimum_required(VERSION 3.11) find_package(glslang CONFIG REQUIRED) -set_property(TARGET glslang PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET OSDependent PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET HLSL PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET SPIRV PROPERTY IMPORTED_GLOBAL TRUE) -set_property(TARGET MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::glslang PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::OSDependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::HLSL PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::SPIRV PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET glslang::MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) + +add_library(glslang ALIAS glslang::glslang) +add_library(OSDependent ALIAS glslang::OSDependent) +add_library(OGLCompiler ALIAS glslang::OGLCompiler) +add_library(HLSL ALIAS glslang::HLSL) +add_library(SPIRV ALIAS glslang::SPIRV) +add_library(MachineIndependent ALIAS glslang::MachineIndependent) + +find_package(Threads REQUIRED) find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h) set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE) diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json index 903544d805f8f4..b3c400f80cc9fa 100644 --- a/ports/shaderc/vcpkg.json +++ b/ports/shaderc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shaderc", "version": "2021.1", - "port-version": 2, + "port-version": 3, "description": "A collection of tools, libraries and tests for shader compilation.", "homepage": "https://github.com/google/shaderc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 57a3709c0b42de..593878e909c83b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2641,7 +2641,7 @@ "port-version": 0 }, "glslang": { - "baseline": "11.8.0", + "baseline": "11.11.0", "port-version": 0 }, "glui": { @@ -6686,7 +6686,7 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 2 + "port-version": 3 }, "shaderwriter": { "baseline": "2.4.0", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 2d97b899d6d6fa..f2868c35375f91 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15f0fd6fda1d1a10fb5e605b3e38cb66ec7b5011", + "version": "11.11.0", + "port-version": 0 + }, { "git-tree": "4d7780995e9523d16a56714fcef0159f18ecfa52", "version": "11.8.0", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index 840e9fe99157fa..768c3396021d18 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d93e78fd464f2f378c8faf94e40e16410e1c41e0", + "version": "2021.1", + "port-version": 3 + }, { "git-tree": "376570ffd232d9c4e0dad095ae3dea964dec52ed", "version": "2021.1", From 4e73d1b47a7e5428e2ea9dbec43b136a6632a7cb Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Mon, 12 Sep 2022 13:50:09 -0700 Subject: [PATCH 574/791] [libmariadb] Fix build error on Linux (#26704) * [libmariadb] Fix build error on Linux * x-add-version * Revert ci.baseline.txt * fix CMake export * change ci.baseline.txt to open test libmariadb * x-add-version * Revert ci.baseline.txt * remove CMAKE_SHARED_LIBRARY_C_FLAGS * x-add-version --- ports/libmariadb/export-cmake-targets.patch | 45 ----------- ports/libmariadb/fix-CMakeLists.patch | 83 +++++++++++++++++++++ ports/libmariadb/fix-InstallPath.patch | 42 ----------- ports/libmariadb/no-extra-static-lib.patch | 20 ----- ports/libmariadb/portfile.cmake | 7 +- ports/libmariadb/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libmariadb.json | 5 ++ 8 files changed, 93 insertions(+), 112 deletions(-) delete mode 100644 ports/libmariadb/export-cmake-targets.patch create mode 100644 ports/libmariadb/fix-CMakeLists.patch delete mode 100644 ports/libmariadb/no-extra-static-lib.patch diff --git a/ports/libmariadb/export-cmake-targets.patch b/ports/libmariadb/export-cmake-targets.patch deleted file mode 100644 index df2ed81e20f6c3..00000000000000 --- a/ports/libmariadb/export-cmake-targets.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index d4e07f7..4823858 100644 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -423,6 +423,7 @@ ELSE() - ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) - SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) - ENDIF() -+TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $) - - TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) - -@@ -472,13 +473,32 @@ ENDIF() - - INSTALL(TARGETS mariadbclient - COMPONENT Development -+ EXPORT unofficial-libmariadb-targets - LIBRARY DESTINATION lib) - IF(WIN32) - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries -+ EXPORT unofficial-libmariadb-targets - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -+ -+install(EXPORT unofficial-libmariadb-targets -+ NAMESPACE unofficial:: -+ DESTINATION share/unofficial-libmariadb -+) -+ -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" -+[[include(CMakeFindDependencyMacro) -+find_dependency(ZLIB) -+if("@WITH_SSL@" STREQUAL "OPENSSL") -+ find_dependency(OpenSSL) -+endif() -+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake") -+]]) -+configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) -+ - ELSE() - # in cmake 3.12+ we can use - #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} diff --git a/ports/libmariadb/fix-CMakeLists.patch b/ports/libmariadb/fix-CMakeLists.patch new file mode 100644 index 00000000000000..a31d9a61762814 --- /dev/null +++ b/ports/libmariadb/fix-CMakeLists.patch @@ -0,0 +1,83 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index 7faf827..d7300b0 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -417,13 +417,13 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) + TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) + + IF(UNIX) +- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) +- SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") ++ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) + ELSE() +- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) ++ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) + SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) + ENDIF() + ++TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $) + TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) + + SIGN_TARGET(libmariadb) +@@ -460,7 +460,9 @@ IF(WITH_MYSQLCOMPAT) + ENDIF() + ENDIF() + ++IF(0) + create_symlink(libmariadb${CMAKE_STATIC_LIBRARY_SUFFIX} mariadbclient ${INSTALL_LIBDIR}) ++ENDIF() + + SET_TARGET_PROPERTIES(libmariadb PROPERTIES VERSION + ${CPACK_PACKAGE_VERSION_MAJOR} +@@ -470,13 +472,39 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") + ENDIF() + ++IF(VCPKG_MARIADBCLIENT) + INSTALL(TARGETS mariadbclient + COMPONENT Development +- DESTINATION ${INSTALL_LIBDIR}) +-IF(WIN32) ++ EXPORT unofficial-libmariadb-targets ++ LIBRARY DESTINATION lib) ++ELSE() ++ set_target_properties(mariadbclient PROPERTIES EXCLUDE_FROM_ALL 1) ++ENDIF() ++ ++IF(1) + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries +- DESTINATION ${INSTALL_LIBDIR}) ++ EXPORT unofficial-libmariadb-targets ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ ++install(EXPORT unofficial-libmariadb-targets ++ NAMESPACE unofficial:: ++ DESTINATION share/unofficial-libmariadb ++) ++ ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" ++[[include(CMakeFindDependencyMacro) ++find_dependency(ZLIB) ++if("@WITH_SSL@" STREQUAL "OPENSSL") ++ find_dependency(OpenSSL) ++endif() ++include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake") ++]]) ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) ++ + ELSE() + # in cmake 3.12+ we can use + #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} +@@ -488,7 +516,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} + COMPONENT Development NAMELINK_ONLY) + ENDIF() + +-IF(MSVC) ++IF(0) + # On Windows, install PDB + INSTALL(FILES $ DESTINATION "${INSTALL_LIBDIR}" + CONFIGURATIONS Debug RelWithDebInfo diff --git a/ports/libmariadb/fix-InstallPath.patch b/ports/libmariadb/fix-InstallPath.patch index 44a27c04a39aba..010fbb45d2c105 100644 --- a/ports/libmariadb/fix-InstallPath.patch +++ b/ports/libmariadb/fix-InstallPath.patch @@ -11,48 +11,6 @@ index a82dbb7..e9005fa 100644 /* mysqld compile time options */ #ifndef MYSQL_CHARSET -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 7faf827..d4e07f7 100644 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -417,10 +417,10 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) - TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS}) - - IF(UNIX) -- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) -+ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) - SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") - ELSE() -- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) -+ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) - SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) - ENDIF() - -@@ -472,11 +472,13 @@ ENDIF() - - INSTALL(TARGETS mariadbclient - COMPONENT Development -- DESTINATION ${INSTALL_LIBDIR}) -+ LIBRARY DESTINATION lib) - IF(WIN32) - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries -- DESTINATION ${INSTALL_LIBDIR}) -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib) - ELSE() - # in cmake 3.12+ we can use - #INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} -@@ -488,7 +490,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR} - COMPONENT Development NAMELINK_ONLY) - ENDIF() - --IF(MSVC) -+IF(0) - # On Windows, install PDB - INSTALL(FILES $ DESTINATION "${INSTALL_LIBDIR}" - CONFIGURATIONS Debug RelWithDebInfo diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in index 36c0117..4184e4b 100644 --- a/mariadb_config/mariadb_config.c.in diff --git a/ports/libmariadb/no-extra-static-lib.patch b/ports/libmariadb/no-extra-static-lib.patch deleted file mode 100644 index 41463c29e4ddf2..00000000000000 --- a/ports/libmariadb/no-extra-static-lib.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 4823858..018101f 100644 ---- a/libmariadb/CMakeLists.txt -+++ b/libmariadb/CMakeLists.txt -@@ -471,10 +471,15 @@ IF(NOT WIN32) - SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") - ENDIF() - -+if(VCPKG_MARIADBCLIENT) - INSTALL(TARGETS mariadbclient - COMPONENT Development - EXPORT unofficial-libmariadb-targets - LIBRARY DESTINATION lib) -+else() -+ set_target_properties(mariadbclient PROPERTIES EXCLUDE_FROM_ALL 1) -+endif() -+ - IF(WIN32) - INSTALL(TARGETS libmariadb - COMPONENT SharedLibraries diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index d43acc4358fca6..281ad55d7cd5a3 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -17,16 +17,15 @@ vcpkg_from_github( disable-test-build.patch fix-InstallPath.patch fix-iconv.patch - export-cmake-targets.patch pkgconfig.patch - no-extra-static-lib.patch fix-openssl.patch + fix-CMakeLists.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - iconv WITH_ICONV - mariadbclient VCPKG_MARIADBCLIENT + iconv WITH_ICONV + mariadbclient VCPKG_MARIADBCLIENT ) if("openssl" IN_LIST FEATURES) diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json index 002c4e1116b8f4..0d40cc465db0c6 100644 --- a/ports/libmariadb/vcpkg.json +++ b/ports/libmariadb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmariadb", "version-semver": "3.3.1", + "port-version": 1, "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 593878e909c83b..518485283fb7e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3854,7 +3854,7 @@ }, "libmariadb": { "baseline": "3.3.1", - "port-version": 0 + "port-version": 1 }, "libmaxminddb": { "baseline": "1.4.3", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index 972d74f8e56941..6b89163e9bf04b 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34106302d34bd62e9298357aa8b47b2c3aabf204", + "version-semver": "3.3.1", + "port-version": 1 + }, { "git-tree": "ab286c57741848d9bb9a806ad29f5366283af520", "version-semver": "3.3.1", From 23905f6f86ab3e210ac84e4d8c49dd7923fa25be Mon Sep 17 00:00:00 2001 From: Noah <37805707+Curve@users.noreply.github.com> Date: Mon, 12 Sep 2022 14:04:41 -0700 Subject: [PATCH 575/791] [saucer, ereignis] Update `saucer` port and add `ereignis` (#26683) * [saucer] add new port [saucer] add lockpp dependency beleg * [lockpp] add new port * [saucer] update ref * [saucer] only support static * fix: revert cibaseline * refactor: also disable uwp * [saucer,lockpp] remove superflous dependencies * [lockpp] update version * [saucer] update to 1.0.0 * [saucer] specifiy only static library * [saucer] bump ref * [saucer] remove unused dependency Co-authored-by: Robert Schumacher * [saucer] use vcpkg webview2 * [ereignis] add new port * [saucer] update port * [ereignis] fix description * [saucer] update ref * [qt5-webengine] use host for nodejs * [qt5-webengine] bump `port-version` * [ereignis] remove unused dependency * [qt5-webengine] revert git-tree of old port * [ereignis] add empty line * fix: formatting & versions * fix: reset modified files Co-authored-by: Robert Schumacher --- ports/ereignis/portfile.cmake | 14 ++++++++++++++ ports/ereignis/vcpkg.json | 13 +++++++++++++ ports/qt5-webengine/vcpkg.json | 6 +++++- ports/saucer/portfile.cmake | 4 ++-- ports/saucer/vcpkg.json | 3 ++- versions/baseline.json | 8 ++++++-- versions/e-/ereignis.json | 9 +++++++++ versions/q-/qt5-webengine.json | 5 +++++ versions/s-/saucer.json | 5 +++++ 9 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 ports/ereignis/portfile.cmake create mode 100644 ports/ereignis/vcpkg.json create mode 100644 versions/e-/ereignis.json diff --git a/ports/ereignis/portfile.cmake b/ports/ereignis/portfile.cmake new file mode 100644 index 00000000000000..42aea9b4ed77c8 --- /dev/null +++ b/ports/ereignis/portfile.cmake @@ -0,0 +1,14 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Soundux/ereignis + REF v1.1 + SHA512 506a54e8d109028cd9e85597fbd6bf77694d55e78727d2889aa15846eb4ef00390153b719c6eb3d7f8d424eb7607b66f18adc24a2d907887e32c30ca0dca7034 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ereignis/vcpkg.json b/ports/ereignis/vcpkg.json new file mode 100644 index 00000000000000..4508f421410b33 --- /dev/null +++ b/ports/ereignis/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "ereignis", + "version": "1.1", + "description": "A thread-safe C++17 Event Library", + "homepage": "https://github.com/Soundux/ereignis", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json index da0765e9ab6530..27cce1623eb362 100644 --- a/ports/qt5-webengine/vcpkg.json +++ b/ports/qt5-webengine/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qt5-webengine", "version": "5.15.6", + "port-version": 1, "description": "Qt5 webengine Module;", "license": null, "supports": "!static", @@ -24,7 +25,10 @@ "qt5-quickcontrols2", "qt5-tools", "qt5-webchannel", - "vcpkg-tool-nodejs" + { + "name": "vcpkg-tool-nodejs", + "host": true + } ], "features": { "proprietary-codecs": { diff --git a/ports/saucer/portfile.cmake b/ports/saucer/portfile.cmake index ea1a6520957069..a4adbd028cff28 100644 --- a/ports/saucer/portfile.cmake +++ b/ports/saucer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO saucer/saucer - REF 4d41e0f356c5b95f77803cdb760a3c01eac0aabd - SHA512 b5fe7484c80f0efde3c9f445a3a38421aff48d589ee27778495b501de4d232da44d55072664371ade79891ea7218ab1ddab385e2316b7ae20b5c32cd2332dd56 + REF 6ae482092cca4d4a408e6bdf24714153d9203797 + SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0 HEAD_REF dev PATCHES "unofficial-webview2.patch" ) diff --git a/ports/saucer/vcpkg.json b/ports/saucer/vcpkg.json index e418e6db72184d..2477c3c57f41f5 100644 --- a/ports/saucer/vcpkg.json +++ b/ports/saucer/vcpkg.json @@ -1,11 +1,12 @@ { "name": "saucer", - "version": "1.0.0", + "version": "1.0.1", "description": "Next-gen desktop apps with web-frontend in C++", "homepage": "https://saucer.github.io/", "license": "MIT", "supports": "!uwp", "dependencies": [ + "ereignis", "fmt", "lockpp", "nlohmann-json", diff --git a/versions/baseline.json b/versions/baseline.json index 518485283fb7e2..ea4dfd83a8b0e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2148,6 +2148,10 @@ "baseline": "0.9.2", "port-version": 7 }, + "ereignis": { + "baseline": "1.1", + "port-version": 0 + }, "esaxx": { "baseline": "ca7cb332011ec37", "port-version": 1 @@ -6026,7 +6030,7 @@ }, "qt5-webengine": { "baseline": "5.15.6", - "port-version": 0 + "port-version": 1 }, "qt5-webglplugin": { "baseline": "5.15.6", @@ -6545,7 +6549,7 @@ "port-version": 0 }, "saucer": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "sbp": { diff --git a/versions/e-/ereignis.json b/versions/e-/ereignis.json new file mode 100644 index 00000000000000..f5ec1c4e6652f1 --- /dev/null +++ b/versions/e-/ereignis.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9fae65f1e52927feaf919019a722da7f20982e4c", + "version": "1.1", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index f8908c35ea09f6..6854d0f6a448f8 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc917e5d2d2394fea8b0617ed4cf6f6bb1adad23", + "version": "5.15.6", + "port-version": 1 + }, { "git-tree": "271be6655c1ca2a56c800353ee0db4c906ec04e4", "version": "5.15.6", diff --git a/versions/s-/saucer.json b/versions/s-/saucer.json index 3818ed071fd4b6..53887495f688e8 100644 --- a/versions/s-/saucer.json +++ b/versions/s-/saucer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66e466405fa3632e2b1539329a3ce71a65db5598", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "3c2191312af1f74d46d991b955b6c7071dba82d2", "version": "1.0.0", From 999825f5cb08e2d074d385df6ab6aafd926902f3 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 14 Sep 2022 07:31:27 +0800 Subject: [PATCH 576/791] [wxwidgets] update version to v3.2.1 (#26774) * [wxwidgets] update version to v3.2.1 * update version * format patch * overwrite version --- ports/wxwidgets/fix-libs-export.patch | 2 +- ports/wxwidgets/install-layout.patch | 26 ++++++++++++------------ ports/wxwidgets/nanosvg-ext-depend.patch | 4 ++-- ports/wxwidgets/portfile.cmake | 4 ++-- ports/wxwidgets/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wxwidgets.json | 5 +++++ 7 files changed, 26 insertions(+), 22 deletions(-) diff --git a/ports/wxwidgets/fix-libs-export.patch b/ports/wxwidgets/fix-libs-export.patch index a334be306a6df3..63bb9d35391009 100644 --- a/ports/wxwidgets/fix-libs-export.patch +++ b/ports/wxwidgets/fix-libs-export.patch @@ -1,5 +1,5 @@ diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index 52ae69d3f6..f261d5d262 100644 +index b359560..7504458 100644 --- a/build/cmake/config.cmake +++ b/build/cmake/config.cmake @@ -39,8 +39,14 @@ macro(wx_get_dependencies var lib) diff --git a/ports/wxwidgets/install-layout.patch b/ports/wxwidgets/install-layout.patch index e55381d3ec8088..e9edfa16760607 100644 --- a/ports/wxwidgets/install-layout.patch +++ b/ports/wxwidgets/install-layout.patch @@ -1,8 +1,8 @@ diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 32bd959..74f31ed 100644 +index 7182364..4f90430 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake -@@ -418,7 +418,7 @@ macro(wx_add_library name) +@@ -428,7 +428,7 @@ macro(wx_add_library name) set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short}) # Setup install @@ -12,7 +12,7 @@ index 32bd959..74f31ed 100644 # configure puts the .dll in the bin directory set(runtime_dir "bin") diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index 3ff14ab..7bd00d3 100644 +index ef28c99..928bc0b 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -146,7 +146,7 @@ if(WIN32) @@ -25,28 +25,28 @@ index 3ff14ab..7bd00d3 100644 set(lib_suffix "_dll") else() diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake -index 84cb9f5..e2f460a 100644 +index 384c683..a662a48 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake -@@ -48,7 +48,7 @@ else() +@@ -41,7 +41,7 @@ else() install(DIRECTORY DESTINATION "bin") install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ + COMMAND ${CMAKE_COMMAND} -E copy \ - ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ - ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ + \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ )" diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt -index d6b3465..870897b 100644 +index dbed8cc..f1da8e3 100644 --- a/build/cmake/utils/CMakeLists.txt +++ b/build/cmake/utils/CMakeLists.txt -@@ -38,7 +38,7 @@ if(wxUSE_XRC) - endif() +@@ -39,7 +39,7 @@ if(wxUSE_XRC) - wx_install(CODE "execute_process( \ + # Don't use wx_install() here to preserve escaping. + install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ + COMMAND ${CMAKE_COMMAND} -E copy \ - ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \ - ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \ + \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ + \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ )" diff --git a/ports/wxwidgets/nanosvg-ext-depend.patch b/ports/wxwidgets/nanosvg-ext-depend.patch index 029b8c707be8e8..3a1577768c2763 100644 --- a/ports/wxwidgets/nanosvg-ext-depend.patch +++ b/ports/wxwidgets/nanosvg-ext-depend.patch @@ -15,14 +15,14 @@ index 401bf48..b9e4b57 100644 continue() endif() diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake -index 49c536a..5630526 100644 +index 2b120e5..26651f9 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -114,7 +114,7 @@ wx_add_thirdparty_library(wxUSE_EXPAT EXPAT "use expat for XML parsing" DEFAULT_ wx_add_thirdparty_library(wxUSE_LIBJPEG JPEG "use libjpeg (JPEG file format)") wx_add_thirdparty_library(wxUSE_LIBPNG PNG "use libpng (PNG image format)") wx_add_thirdparty_library(wxUSE_LIBTIFF TIFF "use libtiff (TIFF file format)") --wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG") +-wx_add_thirdparty_library(wxUSE_NANOSVG NanoSVG "use NanoSVG for rasterizing SVG" DEFAULT builtin) +wx_add_thirdparty_library(wxUSE_NANOSVG unofficial-nanosvg "use NanoSVG for rasterizing SVG") wx_option(wxUSE_LIBLZMA "use LZMA compression" OFF) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 5bee63f32bfdac..6dd536089f7be6 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wxWidgets/wxWidgets - REF v3.2.0 - SHA512 0bb40ccab51f5e83a38feeaf462c9d1852f821d19592328327f829890d89a3abb2a991c43cdbac55da8f5ee40aab8bd5fea6abcd052198302770292f92f9f9ad + REF 97e99707c5d2271a70cb686720b48dbf34ced496 # v3.2.1 + SHA512 b47d3f4560f0ba24e95ce4fba0a807cc47807df57d54b70e22a34a5a15fc1e35ccedf1938203046c8950db9115ed09cb66fa1ca30b2e5f1b4c0d529a812497c4 HEAD_REF master PATCHES install-layout.patch diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index de290c2cf681f7..d724fb32238b88 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wxwidgets", - "version": "3.2.0", - "port-version": 2, + "version": "3.2.1", "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", diff --git a/versions/baseline.json b/versions/baseline.json index ea4dfd83a8b0e7..691a135028a952 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7813,8 +7813,8 @@ "port-version": 0 }, "wxwidgets": { - "baseline": "3.2.0", - "port-version": 2 + "baseline": "3.2.1", + "port-version": 0 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 19a6f9457a0c8b..715eb5b9b73562 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a113e248e95bf2305a91b4d7c2a93579cc911b15", + "version": "3.2.1", + "port-version": 0 + }, { "git-tree": "39e102a05ff8b8e2f8a137b1f3bbe8e44f88a8ad", "version": "3.2.0", From 0399e7964ad8e31b8e36c3f84f4108dee221f95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 13 Sep 2022 23:33:28 +0000 Subject: [PATCH 577/791] [arrayfire] Fix feature opencl dependency clFFT (#26773) * [arrayfire] Fix feature opencl dependency clFFT * version * Add homepage and license * version --- ports/arrayfire/fix-dependency-clfft.patch | 14 ++++++++++++++ ports/arrayfire/portfile.cmake | 11 +++++++---- ports/arrayfire/vcpkg.json | 4 ++++ versions/a-/arrayfire.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 ports/arrayfire/fix-dependency-clfft.patch diff --git a/ports/arrayfire/fix-dependency-clfft.patch b/ports/arrayfire/fix-dependency-clfft.patch new file mode 100644 index 00000000000000..8072746e3ce008 --- /dev/null +++ b/ports/arrayfire/fix-dependency-clfft.patch @@ -0,0 +1,14 @@ +diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt +index f970da0..b543433 100644 +--- a/src/backend/opencl/CMakeLists.txt ++++ b/src/backend/opencl/CMakeLists.txt +@@ -12,7 +12,8 @@ set_property(CACHE AF_OPENCL_BLAS_LIBRARY PROPERTY STRINGS "clBLAS" "CLBlast") + + af_deprecate(OPENCL_BLAS_LIBRARY AF_OPENCL_BLAS_LIBRARY) + +-include(build_clFFT) ++find_package(clFFT CONFIG REQUIRED) ++add_library(clFFT::clFFT ALIAS clFFT) + + file(GLOB kernel_src kernel/*.cl kernel/KParam.hpp) + diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake index 29322df6c38d3a..ee6fab1d8c331d 100644 --- a/ports/arrayfire/portfile.cmake +++ b/ports/arrayfire/portfile.cmake @@ -7,7 +7,8 @@ vcpkg_from_github( PATCHES build.patch Fix-constexpr-error-with-vs2019-with-half.patch - ) + fix-dependency-clfft.patch +) # arrayfire cpu thread lib needed as a submodule for the CPU backend vcpkg_from_github( @@ -16,7 +17,7 @@ vcpkg_from_github( REF b666773940269179f19ef11c8f1eb77005e85d9a SHA512 b3e8b54acf3a588b1f821c2774d5da2d8f8441962c6d99808d513f7117278b9066eb050b8b501bddbd3882e68eb5cc5da0b2fca54e15ab1923fe068a3fe834f5 HEAD_REF master - ) +) # Get forge. We only need headers and aren't actually linking. # We don't want to use the vcpkg dependency since it is broken in many @@ -45,7 +46,7 @@ set(AF_DEFAULT_VCPKG_CMAKE_FLAGS -DAF_FORGE_PATH=${FORGE_PATH} # forge headers for building the graphics lib -DAF_BUILD_FORGE=OFF -DAF_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets - ) +) # bin/dll directory for Windows non-static builds for the unified backend dll if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -73,7 +74,9 @@ vcpkg_cmake_configure( OPTIONS ${AF_DEFAULT_VCPKG_CMAKE_FLAGS} ${AF_BACKEND_FEATURE_OPTIONS} - ) + MAYBE_UNUSED_VARIABLES + AF_CPU_THREAD_PATH +) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index 91a39717c7672a..886bd8ffae3d55 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,7 +1,10 @@ { "name": "arrayfire", "version-semver": "3.8.0", + "port-version": 1, "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", + "homepage": "https://github.com/arrayfire/arrayfire", + "license": "BSD-3-Clause", "supports": "x64", "dependencies": [ "boost-compute", @@ -39,6 +42,7 @@ "opencl": { "description": "ArrayFire OpenCL backend", "dependencies": [ + "clfft", "opencl" ] }, diff --git a/versions/a-/arrayfire.json b/versions/a-/arrayfire.json index 59f07bb59138c8..e1b20d72395fd0 100644 --- a/versions/a-/arrayfire.json +++ b/versions/a-/arrayfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "137eb0d15f469e75ad3255cf1de871d83b3dff49", + "version-semver": "3.8.0", + "port-version": 1 + }, { "git-tree": "e6c5e8b4e1c52380ebd2050683a185c44a2dbae4", "version-semver": "3.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index 691a135028a952..1e6216b1ef66da 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -182,7 +182,7 @@ }, "arrayfire": { "baseline": "3.8.0", - "port-version": 0 + "port-version": 1 }, "arrow": { "baseline": "9.0.0", From 521611caa746126522de1887d97a4e23a3006688 Mon Sep 17 00:00:00 2001 From: Matt Swann <3lemenopy@gmail.com> Date: Tue, 13 Sep 2022 16:40:10 -0700 Subject: [PATCH 578/791] [yara] Update to 4.2.3 to resolve security vulnerability (#26770) * Update yara version * Update ref to v4.2.3 * Update portfile.cmake Update SHA512 hash with value from build * Update versions to 4.2.3 per x-add-version --- ports/yara/portfile.cmake | 4 ++-- ports/yara/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/y-/yara.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/yara/portfile.cmake b/ports/yara/portfile.cmake index 5d179593a24690..207bca6d758353 100644 --- a/ports/yara/portfile.cmake +++ b/ports/yara/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VirusTotal/yara - REF 136794355c51242b595af42309a234846d534e8b #v4.2.0 - SHA512 b0aabbf4d0ba585e3adab7dbdb708264c4d4140179e69c8bc57a2ea85cdd6d97f61e67e2ce06c8436450b4e0add7f475ff76d7ca549a9b1168ac057a6cbae776 + REF ba94b4f8ebb6d56786d14f6a0f7529b32d7c216f #v4.2.3 + SHA512 34bbe80c0f108691c7dd36fe56a2f866fc90424417a14df80781670f8150662a6160fecc4b697c6ff7eca3f98d78cdcb91f38e7f2a6542814b739869662d6608 HEAD_REF master ) diff --git a/ports/yara/vcpkg.json b/ports/yara/vcpkg.json index 0dee97a5df2ad1..8e9f328562e8cb 100644 --- a/ports/yara/vcpkg.json +++ b/ports/yara/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yara", - "version": "4.2.0", + "version": "4.2.3", "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1e6216b1ef66da..466b8483741725 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7945,7 +7945,7 @@ "port-version": 1 }, "yara": { - "baseline": "4.2.0", + "baseline": "4.2.3", "port-version": 0 }, "yas": { diff --git a/versions/y-/yara.json b/versions/y-/yara.json index 5931955d992dd3..e10d3ead51c054 100644 --- a/versions/y-/yara.json +++ b/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0551c4f9ac51859d9063f6482ff44acf3d7bfa2a", + "version": "4.2.3", + "port-version": 0 + }, { "git-tree": "f071df4391cee4f96e8f7bb5820d7d3f70db50e1", "version": "4.2.0", From 274e8be31464b60a38b9a1a8910757dc3e5cd75e Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Tue, 13 Sep 2022 16:42:55 -0700 Subject: [PATCH 579/791] Update to 1.22.3 (#26746) Add unicode feature. Enabled by default. --- ports/libtcod/portfile.cmake | 6 ++++-- ports/libtcod/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/l-/libtcod.json | 5 +++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index a4ee5f67c9590b..bc5f09c71c6c84 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.22.2 - SHA512 c02b6bb205f610416ea6cd9bdeb89a6976141e03a2cd2c44838f0d35edf2544e61af86d2ba904c6a913bbc3754592eed6063b732277bede55b79ffe3b983ee4d + REF 1.22.3 + SHA512 350b741f8738f5ba3c6f282e76c1124326144111eb2444b17b1126e8ddead52cff1dba1d0ed80e6fefbb0db8f032b95d08292d73746eec149e191a8fa78651d7 HEAD_REF main ) @@ -12,6 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "sdl" CMAKE_DISABLE_FIND_PACKAGE_SDL2 "sdl" CMAKE_DISABLE_FIND_PACKAGE_GLAD "threads" CMAKE_DISABLE_FIND_PACKAGE_Threads + "unicode" CMAKE_DISABLE_FIND_PACKAGE_utf8proc + "unicode" CMAKE_DISABLE_FIND_PACKAGE_unofficial-utf8proc "zlib" CMAKE_DISABLE_FIND_PACKAGE_ZLIB ) diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index e4f0bde6d21c9a..841959eb21441a 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version": "1.22.2", + "version": "1.22.3", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", @@ -8,7 +8,6 @@ "license": "BSD-3-Clause", "dependencies": [ "stb", - "utf8proc", { "name": "vcpkg-cmake", "host": true @@ -21,6 +20,7 @@ "default-features": [ "png", "sdl", + "unicode", "zlib" ], "features": { @@ -40,6 +40,12 @@ "threads": { "description": "Support for deprecated threading functions. If in doubt then leave this disabled." }, + "unicode": { + "description": "Support for non-ASCII characters. Required for text printing functions", + "dependencies": [ + "utf8proc" + ] + }, "zlib": { "description": "Support for REXPaint files and TCODZip archives.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 466b8483741725..0b41109711effd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4189,7 +4189,7 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.22.2", + "baseline": "1.22.3", "port-version": 0 }, "libtess2": { diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index c605268d0d8aa6..81ad78b537454c 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98a04c69b32d8e84d25d2913a2f0ad7ec7b4b833", + "version": "1.22.3", + "port-version": 0 + }, { "git-tree": "b8a26dfda1df684c3d88697b774c3e0a9c91f9b9", "version": "1.22.2", From 9e6aab16668122f4a5082ac2d4c26e3e6a148e76 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 13 Sep 2022 19:46:28 -0400 Subject: [PATCH 580/791] [grpc] fix upb library order in pkgconfig (#26752) --- ports/grpc/00014-pkgconfig-upbdefs.patch | 2 +- ports/grpc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index 8ba4dd52061ff3..2307c996f6f0df 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -7,7 +7,7 @@ index 25990a5d8a..4c7831cba5 100644 "${gRPC_CORE_VERSION}" "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" -+ "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz" ++ "-lgrpc -laddress_sorting -lre2 -lupb_json -lupb_textformat -lupb_reflection -lupb -lupb_fastdecode -lupb_utf8_range -ldescriptor_upb_proto -lcares -lz" "" "grpc.pc") diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 140fa1eab36f6d..aa8c2389a65e0f 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "grpc", "version-semver": "1.48.0", - "port-version": 1, + "port-version": 2, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0b41109711effd..b2bd984cb3ecc7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2734,7 +2734,7 @@ }, "grpc": { "baseline": "1.48.0", - "port-version": 1 + "port-version": 2 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index f7bab7cd11a894..605b4fa32e6cc9 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efed7f493dec5fdebaebdec83c521fc860b432a3", + "version-semver": "1.48.0", + "port-version": 2 + }, { "git-tree": "7b2206a9758481b4773a93435aa6cfe7de4bf9e5", "version-semver": "1.48.0", From 24b59b94ab7afaccb2d307204809d5a00d6c39c2 Mon Sep 17 00:00:00 2001 From: Hesham Essam <101147828+hesham-essam@users.noreply.github.com> Date: Wed, 14 Sep 2022 01:49:19 +0200 Subject: [PATCH 581/791] [gdk-pixbuf]: fix pkgconfig tools path (#26744) * [gdk-pixbuf]: fix pkgconfig tools path * gdk_pixbuf binary dir was actually correct * Update version database --- ports/gdk-pixbuf/portfile.cmake | 6 ++---- ports/gdk-pixbuf/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gdk-pixbuf.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake index 32b48a539d693e..5cc405a8dd24f4 100644 --- a/ports/gdk-pixbuf/portfile.cmake +++ b/ports/gdk-pixbuf/portfile.cmake @@ -44,15 +44,13 @@ vcpkg_install_meson(ADD_BIN_TO_PATH) set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc") if(EXISTS "${_file}") file(READ "${_file}" _contents) - string(REPLACE [[${bindir}]] "\${bindir}/../../tools/${PORT}" _contents "${_contents}") - string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + string(REPLACE [[${bindir}]] "\${prefix}/../tools/${PORT}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endif() set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gdk-pixbuf-2.0.pc") if(EXISTS "${_file}") file(READ "${_file}" _contents) - string(REPLACE [[${bindir}]] "\${bindir}/../tools/${PORT}" _contents "${_contents}") - string(REPLACE [[gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0]] "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}") + string(REPLACE [[${bindir}]] "\${prefix}/tools/${PORT}" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") endif() diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json index 0efd7ae5af61fd..f4cb210a7da40a 100644 --- a/ports/gdk-pixbuf/vcpkg.json +++ b/ports/gdk-pixbuf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdk-pixbuf", "version": "2.42.9", + "port-version": 1, "description": "Image loading library.", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index b2bd984cb3ecc7..85495837a36c38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2522,7 +2522,7 @@ }, "gdk-pixbuf": { "baseline": "2.42.9", - "port-version": 0 + "port-version": 1 }, "gemmlowp": { "baseline": "2021-09-28", diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json index d721f0276a74a4..0817d42df125c9 100644 --- a/versions/g-/gdk-pixbuf.json +++ b/versions/g-/gdk-pixbuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec4e9442f7771435547892134cde77081fd013d7", + "version": "2.42.9", + "port-version": 1 + }, { "git-tree": "c4d20ae662c74ed3f4bfec74bb57a68747564c96", "version": "2.42.9", From 88fe6621edb80fe2dbc8444dde6901cb68be930f Mon Sep 17 00:00:00 2001 From: Hesham Essam <101147828+hesham-essam@users.noreply.github.com> Date: Wed, 14 Sep 2022 01:50:41 +0200 Subject: [PATCH 582/791] [glib]: fix pkgconfig tools path (#26743) * [glib]: fix pkgconfig tools path * Update version database --- ports/glib/portfile.cmake | 8 ++++---- ports/glib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 6ef70d2bda037c..5e4f6454e3d1a5 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -88,16 +88,16 @@ else() set(SYSTEM_LIBRARIES resolv mount blkid selinux) endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${prefix}/tools/${PORT}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gio-2.0.pc" "\${bindir}" "\${prefix}/../tools/${PORT}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${prefix}/tools/${PORT}") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${bindir}/../../tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc" "\${bindir}" "\${prefix}/../tools/${PORT}") endif() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 90268a3e24d224..93148fd1209828 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "glib", "version": "2.72.3", - "port-version": 2, + "port-version": 3, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-only", diff --git a/versions/baseline.json b/versions/baseline.json index 85495837a36c38..e6732dfa741917 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2622,7 +2622,7 @@ }, "glib": { "baseline": "2.72.3", - "port-version": 2 + "port-version": 3 }, "glibmm": { "baseline": "2.70.0", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 44a0da5ebaa44c..307e9340ea02eb 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9fbf2ec21948d70e4b8d5e633e600344982069f", + "version": "2.72.3", + "port-version": 3 + }, { "git-tree": "aed4b2abc6c22c9b49d18ad5ab5d3f12cb330d22", "version": "2.72.3", From 09007f767c1339570def85a490cb4749c854fc40 Mon Sep 17 00:00:00 2001 From: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Date: Wed, 14 Sep 2022 01:53:48 +0200 Subject: [PATCH 583/791] [configcat] Add new port (#26713) * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * Update ports/configcat/portfile.cmake Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port * [configcat] Add new port Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/configcat/portfile.cmake | 25 +++++++++++++++++++++++++ ports/configcat/vcpkg.json | 21 +++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/configcat.json | 9 +++++++++ 4 files changed, 59 insertions(+) create mode 100644 ports/configcat/portfile.cmake create mode 100644 ports/configcat/vcpkg.json create mode 100644 versions/c-/configcat.json diff --git a/ports/configcat/portfile.cmake b/ports/configcat/portfile.cmake new file mode 100644 index 00000000000000..5499852915ff91 --- /dev/null +++ b/ports/configcat/portfile.cmake @@ -0,0 +1,25 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO configcat/cpp-sdk + REF v0.1.0 + SHA512 56dee6fe7e54020610c273325d74184ddca7271b434d3527f35eabbdf657bf1c2c84913f4018397ad178f275772fe1207245239237efa95e5692c4845e9a6e7b + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCONFIGCAT_BUILD_TESTS=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/configcat") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/configcat/vcpkg.json b/ports/configcat/vcpkg.json new file mode 100644 index 00000000000000..39677c585e1ca4 --- /dev/null +++ b/ports/configcat/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "configcat", + "version": "0.1.0", + "description": "ConfigCat SDK for C++ provides easy integration for your application to ConfigCat. ConfigCat is a feature flag and configuration management service that lets you separate feature releases from deployments. Alternative to LaunchDarkly.", + "homepage": "https://configcat.com/", + "license": "MIT", + "dependencies": [ + "cpr", + "hash-library", + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "z4kn4fein-semver" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e6732dfa741917..794600be16a9ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1556,6 +1556,10 @@ "baseline": "1.0.3", "port-version": 0 }, + "configcat": { + "baseline": "0.1.0", + "port-version": 0 + }, "console-bridge": { "baseline": "1.0.2", "port-version": 0 diff --git a/versions/c-/configcat.json b/versions/c-/configcat.json new file mode 100644 index 00000000000000..3c86cf258e63e5 --- /dev/null +++ b/versions/c-/configcat.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d163eba9cf1e8cdc7585806666d8f83330c50678", + "version": "0.1.0", + "port-version": 0 + } + ] +} From 34f072dfcb8b9356e6ed2c74947f87390ddb2706 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Wed, 14 Sep 2022 00:54:22 +0100 Subject: [PATCH 584/791] [DPP] Bump to version 10.0.18 (#26669) * vcpkg dpp port built from our CI * fix missing dependency * update * Update Sun Jul 24 11:26:12 UTC 2022 * exclude uwp for dpp * Update Sun Jul 24 13:21:45 UTC 2022 * fix supports * fix supports * Update Sun Jul 24 14:14:29 UTC 2022 * Update Sun Jul 24 15:36:39 UTC 2022 * Update Mon Jul 25 12:04:56 UTC 2022 * * Add https:// to the homepage so that it is a valid URI. * Added usage. * Forced pkgconfig to be required rather than quiet. * Changed tabs to spaces in portfile.cmake. * Update Mon Aug 15 12:38:09 UTC 2022 * Update Mon Aug 15 13:08:33 UTC 2022 * Put back missing patches * Update portfile.cmake * fix breakage of wrapping * Update Mon Aug 15 13:59:12 UTC 2022 * fix up version file * fix newlines where they dont belong * update version * updtae version * update version * Update Wed Aug 31 16:35:42 UTC 2022 * Update Sat Sep 3 20:29:45 UTC 2022 * fix merge Co-authored-by: Billy O'Neal Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/dpp/portfile.cmake | 4 ++-- ports/dpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/d-/dpp.json | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index b515d8d464e8bb..7e8b7744cc157c 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP - REF 3cddd4437f95482424e5cb7c55a46154fe35c47c - SHA512 ea12f9344dfdb1fc196f30623297d3df53b66a19bf0a0f1067d615c34deef2112f2656fa7030ca3a6dd266aacf13210a4b87f048223ed02c0c9ac73b552f4c11 + REF 6832533388ae7437aca481420a40ef1a9b157b89 + SHA512 472ec3379a4c33972dd47624ee492cc144c9c8638c6150bf0fa1e5992ae787a830bb84e41a16134ea3d59ca4f6cdab3b99113e22903287997aafe808bb676c90 HEAD_REF master PATCHES make-pkgconfig-required.patch diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 761cbd128108ff..3d765ed2e03b8d 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dpp", - "version": "10.0.17", - "port-version": 1, + "version": "10.0.18", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 794600be16a9ca..b20536286838e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1993,8 +1993,8 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.17", - "port-version": 1 + "baseline": "10.0.18", + "port-version": 0 }, "draco": { "baseline": "1.5.2", diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index 849266ceedc164..a654bad64a3148 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "be573eeac83a526231011339e0a64c28b513bbd5", - "version": "10.0.17", - "port-version": 1 + "git-tree": "7e80b88acd9bc75ce2b9bcaeae729f758ca2fcde", + "version": "10.0.18", + "port-version": 0 }, { "git-tree": "aee1785670d15751e08e0fee3426faf2d8559ee9", From d4dd1d314a7eb80b30718ab1e6b8698973b13abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 14 Sep 2022 18:19:58 +0000 Subject: [PATCH 585/791] [vcpkg baseline][many ports] Fix baseline issues (#26646) * [vcpkg baseline][kf5globalaccel] Re-fix build on Windows * version * Add license * version * cleanup baseline * [libpq] Fix arm build * [osg] Fix arm64-windows build * version * update baseline * add license * version * set osg license to null * version * Try to use cmake option instead of patching the source * version * revert changes about libpq * version * Fix * version * revert changes about osg * version --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 657b73dfd434a5..a3ace1c696a442 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -809,8 +809,6 @@ opencv3:x64-windows-static-md = skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail -openexr:arm-uwp=fail -openexr:x64-uwp=fail opengl:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 openmama:x64-windows-static-md=fail openmesh:arm64-windows=fail @@ -910,7 +908,6 @@ qt5-x11extras:x64-windows-static-md=fail qwt:x64-osx=fail qwt:arm64-osx=fail qwt-qt6:x64-osx=fail -qwtw:x64-windows=fail rabit:x64-osx=fail rabit:arm64-osx=fail range-v3-vs2015:arm64-windows = skip From b6d92018d47f2e93683f833f347b0c826870ad48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 14 Sep 2022 18:20:47 +0000 Subject: [PATCH 586/791] [vcpkg baseline][many ports] Fix regressions (#26771) * update version to merge fix changes * update baseline * Disable libxpm optional dependency gettext since missing tool xgettext * cleanup atk:x64-windows-static * version * revert update changes * version * add feature gettext, fix patch * version * typo * version --- ports/libxpm/fix-dependency-gettext.patch | 15 +++++++++++++++ ports/libxpm/portfile.cmake | 12 +++++++++++- ports/libxpm/vcpkg.json | 17 ++++++++++++++++- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/l-/libxpm.json | 5 +++++ 6 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 ports/libxpm/fix-dependency-gettext.patch diff --git a/ports/libxpm/fix-dependency-gettext.patch b/ports/libxpm/fix-dependency-gettext.patch new file mode 100644 index 00000000000000..05e31568e0fad3 --- /dev/null +++ b/ports/libxpm/fix-dependency-gettext.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index 365544b..51bc0f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,9 @@ PKG_CHECK_MODULES(SXPM, [x11 xt xext xextproto xproto >= 7.0.17], + AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) + + # Internationalization & localization support +-AC_SEARCH_LIBS([gettext], [intl], [USE_GETTEXT="yes"], [USE_GETTEXT="no"]) ++AC_ARG_WITH([gettext], AC_HELP_STRING([--with-gettext], ++ [Use gettext, default is no]), ++ [USE_GETTEXT=${withval}]) + AC_MSG_CHECKING([where to install localized messages]) + AC_ARG_WITH([localedir], AS_HELP_STRING([--with-localedir=], + [Path to install message files in (default: datadir/locale)]), diff --git a/ports/libxpm/portfile.cmake b/ports/libxpm/portfile.cmake index 907930754d6d41..48bfd5f662b56c 100644 --- a/ports/libxpm/portfile.cmake +++ b/ports/libxpm/portfile.cmake @@ -10,14 +10,24 @@ vcpkg_from_gitlab( REPO lib/libxpm REF libXpm-3.5.13 SHA512 250c8bf672789a81cfa258a516d40936f48a56cfaee94bf3f628e3f4a462bdd90eaaea787d66daf09ce4809b89c3eaea1e0771de03a6d7f1a59b31cc82be1c44 - PATCHES remove_strings_h.patch + PATCHES + remove_strings_h.patch + fix-dependency-gettext.patch ) set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") +if ("gettext" IN_LIST FEATURES) + set(EXTRA_OPTIONS --with-gettext=yes) +else() + set(EXTRA_OPTIONS --with-gettext=no) +endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG + OPTIONS + ${EXTRA_OPTIONS} ) vcpkg_install_make() diff --git a/ports/libxpm/vcpkg.json b/ports/libxpm/vcpkg.json index 90af303deeb77e..88127105ec9b63 100644 --- a/ports/libxpm/vcpkg.json +++ b/ports/libxpm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxpm", "version": "3.5.11", + "port-version": 1, "description": "XPM format pixmap library", "homepage": "https://github.com/freedesktop/libXpm", "license": "MIT", @@ -13,5 +14,19 @@ }, "xorg-macros", "xproto" - ] + ], + "features": { + "gettext": { + "description": "use xgettext to build source", + "dependencies": [ + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + } + ] + } + } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a3ace1c696a442..9863c38cdf35ce 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -36,7 +36,6 @@ # Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h apr:arm64-windows=fail -atk:x64-windows-static=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail @@ -576,8 +575,6 @@ live555:arm-uwp=fail live555:x64-osx=fail live555:arm64-osx=fail live555:x64-uwp=fail -# fails due to an upstream bug -llfio:arm64-windows=fail # fails due to an outdated gcc version llfio:x64-linux=fail llgl:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index b20536286838e6..d92c0beec6cabf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4362,7 +4362,7 @@ }, "libxpm": { "baseline": "3.5.11", - "port-version": 0 + "port-version": 1 }, "libxslt": { "baseline": "1.1.37", diff --git a/versions/l-/libxpm.json b/versions/l-/libxpm.json index 482bb46819aa30..cc9d5fcf4ee5c9 100644 --- a/versions/l-/libxpm.json +++ b/versions/l-/libxpm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04f6484a58c91b33e62feae8a44caa25ab667aaf", + "version": "3.5.11", + "port-version": 1 + }, { "git-tree": "d72a962542b4175f99f5127b477866f2a5eba510", "version": "3.5.11", From 62850c28d041d6b497b6ff265f543e2f40982a81 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 14 Sep 2022 20:24:49 +0200 Subject: [PATCH 587/791] [vcpkg baseline][osg] Fix port dependencies and build errors (#26698) * Don't depend on default features * Use OpenEXR config * Try to skip non-portable check_cxx_source_runs * Ensure PKG_CONFIG_USE_CMAKE_PREFIX_PATH * Use link libraries from pkg-config * Revise feature-to-CMake mapping * Update versions --- ports/osg/link-libraries.patch | 7 ++++++- ports/osg/portfile.cmake | 25 +++++++++++++++++++++++-- ports/osg/unofficial-osg-config.cmake | 3 +++ ports/osg/use-openexr-config.patch | 20 ++++++++++++++++++++ ports/osg/vcpkg.json | 27 ++++++++++++++++++++------- versions/baseline.json | 2 +- versions/o-/osg.json | 5 +++++ 7 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 ports/osg/use-openexr-config.patch diff --git a/ports/osg/link-libraries.patch b/ports/osg/link-libraries.patch index 7eb0a8f37dc890..b65844432d266d 100644 --- a/ports/osg/link-libraries.patch +++ b/ports/osg/link-libraries.patch @@ -2,10 +2,15 @@ diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index ce55be0..9b7107c 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake -@@ -37,6 +37,11 @@ SET(VALID_BUILDER_VERSION OFF) +@@ -37,6 +37,16 @@ SET(VALID_BUILDER_VERSION OFF) MACRO(LINK_WITH_VARIABLES TRGTNAME) FOREACH(varname ${ARGN}) ++ string(REPLACE "_LIBRARY" "_LINK_LIBRARIES" lwv_link_libraries "${varname}") ++ if(DEFINED ${lwv_link_libraries}) ++ TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_link_libraries}}) ++ continue() ++ endif() + string(REPLACE "_LIBRARY" "_LIBRARIES" lwv_libraries "${varname}") + if(DEFINED ${lwv_libraries}) + TARGET_LINK_LIBRARIES(${TRGTNAME} ${${lwv_libraries}}) diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 88ec457c5bc2be..c533d26f05893a 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -14,12 +14,15 @@ vcpkg_from_github( plugin-pdb-install.patch use-boost-asio.patch osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode + use-openexr-config.patch unofficial-export.patch ) file(REMOVE "${SOURCE_PATH}/CMakeModules/FindFontconfig.cmake" "${SOURCE_PATH}/CMakeModules/FindFreetype.cmake" + "${SOURCE_PATH}/CMakeModules/Findilmbase.cmake" + "${SOURCE_PATH}/CMakeModules/FindOpenEXR.cmake" "${SOURCE_PATH}/CMakeModules/FindSDL2.cmake" ) @@ -29,26 +32,43 @@ set(OPTIONS "") if(VCPKG_TARGET_IS_WINDOWS) list(APPEND OPTIONS -DOSG_USE_UTF8_FILENAME=ON) endif() +# Skip try_run checks +if(VCPKG_TARGET_IS_MINGW) + list(APPEND OPTIONS -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=0 -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS=1) +elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS=0) +elseif(VCPKG_TARGET_IS_IOS) + # handled by osg +elseif(VCPKG_CROSSCOMPILING) + message(WARNING "Atomics detection may fail for cross builds. You can set osg cmake variables in a custom triplet.") +endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools BUILD_OSG_APPLICATIONS examples BUILD_OSG_EXAMPLES plugins BUILD_OSG_PLUGINS_BY_DEFAULT + plugins CMAKE_REQUIRE_FIND_PACKAGE_CURL + plugins CMAKE_REQUIRE_FIND_PACKAGE_Jasper + plugins CMAKE_REQUIRE_FIND_PACKAGE_GDAL + plugins CMAKE_REQUIRE_FIND_PACKAGE_GTA packages BUILD_OSG_PACKAGES docs BUILD_DOCUMENTATION docs BUILD_REF_DOCS_SEARCHENGINE docs BUILD_REF_DOCS_TAGFILE fontconfig OSG_TEXT_USE_FONTCONFIG freetype BUILD_OSG_PLUGIN_FREETYPE + freetype CMAKE_REQUIRE_FIND_PACKAGE_Freetype collada BUILD_OSG_PLUGIN_DAE + collada CMAKE_REQUIRE_FIND_PACKAGE_COLLADA nvtt BUILD_OSG_PLUGIN_NVTT + nvtt CMAKE_REQUIRE_FIND_PACKAGE_NVTT openexr BUILD_OSG_PLUGIN_EXR openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR rest-http-device BUILD_OSG_PLUGIN_RESTHTTPDEVICE - sdl BUILD_OSG_PLUGIN_SDL + sdl1 BUILD_OSG_PLUGIN_SDL INVERTED_FEATURES - sdl CMAKE_DISABLE_FIND_PACKAGE_SDL # for apps and examples + sdl1 CMAKE_DISABLE_FIND_PACKAGE_SDL # for apps and examples ) # The package osg can be configured to use different OpenGL profiles via a custom triplet file: @@ -96,6 +116,7 @@ vcpkg_cmake_configure( -DCMAKE_DISABLE_FIND_PACKAGE_GStreamer=ON -DCMAKE_DISABLE_FIND_PACKAGE_GLIB=ON -DCMAKE_DISABLE_FIND_PACKAGE_Inventor=ON + -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON ${OPTIONS} OPTIONS_DEBUG -DBUILD_OSG_APPLICATIONS=OFF diff --git a/ports/osg/unofficial-osg-config.cmake b/ports/osg/unofficial-osg-config.cmake index 1b3d88f42d4559..512253b29bc9ad 100644 --- a/ports/osg/unofficial-osg-config.cmake +++ b/ports/osg/unofficial-osg-config.cmake @@ -12,6 +12,9 @@ if("plugins" IN_LIST ${CMAKE_FIND_PACKAGE_NAME}_FIND_COMPONENTS) if(TARGET unofficial::osg::osgdb_curl) find_dependency(CURL) endif() + if(TARGET unofficial::osg::osgdb_exr) + find_dependency(OpenEXR CONFIG) + endif() if(TARGET unofficial::osg::osgdb_gdal OR TARGET unofficial::osg::osgdb_ogr) find_dependency(GDAL) endif() diff --git a/ports/osg/use-openexr-config.patch b/ports/osg/use-openexr-config.patch new file mode 100644 index 00000000000000..903e1b6826fc03 --- /dev/null +++ b/ports/osg/use-openexr-config.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3363305..8516539 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -739,10 +739,13 @@ IF(ANDROID) + ELSE() + # Common to all platforms except android: + FIND_PACKAGE(Freetype) +- FIND_PACKAGE(ilmbase) + FIND_PACKAGE(Inventor) + FIND_PACKAGE(Jasper) +- FIND_PACKAGE(OpenEXR) ++ FIND_PACKAGE(OpenEXR CONFIG) ++ set(OPENEXR_LIBRARY OpenEXR::IlmImf) ++ set(OPENEXR_LIBRARIES_VARS OPENEXR_LIBRARY) ++ set(OPENEXR_INCLUDE_DIR "${OpenEXR_DIR}/../../include") ++ set(ILMBASE_INCLUDE_DIR "${OpenEXR_DIR}/../../include") + FIND_PACKAGE(OpenCascade) + FIND_PACKAGE(COLLADA) + FIND_PACKAGE(FBX) diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 7faa66401b483b..9d002b776311d7 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,9 +1,10 @@ { "name": "osg", "version": "3.6.5", - "port-version": 15, + "port-version": 16, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", - "homepage": "https://github.com/openscenegraph/OpenSceneGraph", + "homepage": "https://www.openscenegraph.com/", + "license": null, "supports": "!uwp", "dependencies": [ { @@ -13,6 +14,7 @@ "opengl-registry", { "name": "openimageio", + "default-features": false, "platform": "osx" }, { @@ -125,7 +127,6 @@ "openexr": { "description": "Build the exr plugin", "dependencies": [ - "ilmbase", "openexr" ] }, @@ -135,8 +136,14 @@ "plugins": { "description": "Build most OSG Plugins", "dependencies": [ - "curl", - "gdal", + { + "name": "curl", + "default-features": false + }, + { + "name": "gdal", + "default-features": false + }, { "name": "giflib", "platform": "windows" @@ -156,7 +163,10 @@ "name": "libxml2", "platform": "windows" }, - "tiff" + { + "name": "tiff", + "default-features": false + } ] }, "rest-http-device": { @@ -182,7 +192,10 @@ "tools": { "description": "Enable to build OSG Applications (e.g. osgviewer)", "dependencies": [ - "curl", + { + "name": "curl", + "default-features": false + }, { "name": "libiconv", "platform": "windows" diff --git a/versions/baseline.json b/versions/baseline.json index d92c0beec6cabf..879c98f5e0c739 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5442,7 +5442,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 15 + "port-version": 16 }, "osg-qt": { "baseline": "Qt5", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 3395ad64744b8d..a15cdd2e771176 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b4ddf02fe84124b58b1ea60dcc9a4f553f32704", + "version": "3.6.5", + "port-version": 16 + }, { "git-tree": "219045e2b75fc651860c70dbf97557d543269842", "version": "3.6.5", From 8d3aa2bbf651d599f8bcca1861607c617c434d28 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Thu, 15 Sep 2022 03:13:20 +0800 Subject: [PATCH 588/791] [sqlpp11] Update to latest commit (#26775) * update sqlpp11 * update baseline * update some formatting * update version Co-authored-by: Monica --- ports/sqlpp11/ddl2cpp_path.patch | 6 +++--- ports/sqlpp11/portfile.cmake | 14 +++++++------- ports/sqlpp11/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sqlpp11.json | 5 +++++ 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ports/sqlpp11/ddl2cpp_path.patch b/ports/sqlpp11/ddl2cpp_path.patch index 348505aa77bfa7..f908b9af4f6494 100644 --- a/ports/sqlpp11/ddl2cpp_path.patch +++ b/ports/sqlpp11/ddl2cpp_path.patch @@ -1,9 +1,9 @@ diff --git a/cmake/configs/Sqlpp11Config.cmake b/cmake/configs/Sqlpp11Config.cmake -index c50a71a..96d0c5b 100644 +index 5c5926f..c25da97 100644 --- a/cmake/configs/Sqlpp11Config.cmake +++ b/cmake/configs/Sqlpp11Config.cmake -@@ -51,7 +51,7 @@ endforeach() - +@@ -55,7 +55,7 @@ endforeach() + # Import "ddl2cpp" script if(NOT TARGET sqlpp11::ddl2cpp) - get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH) diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index 3415fc1f14bd3c..63ca1ef68a5f2e 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rbock/sqlpp11 - REF 2bc89b34ad3cc37b6bca9a44a3529ff2d8fe211f # 0.61 - SHA512 6e2496959749422987aca21f333abb01648702b85e02acc711bbac398ca6a67d8be93a3d89fc1f8bad5446865725ff9bcc053e6229cb34627120b59469426266 + REF 648183fd64070185019f9237481b888173abfaf2 # 2022-09-14 + SHA512 0429c5972ef111a41422ebd3ca259bc7f2cca126b0abd526270e7c8553fbc9d22ee584c526340a7f3c667143a16b961c222687806641b6ddfe9a258bd5e1ccc8 HEAD_REF master PATCHES ddl2cpp_path.patch @@ -18,7 +18,7 @@ vcpkg_check_features( # Use sqlpp11's own build process vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING:BOOL=OFF # Use vcpkg as source for the date library @@ -32,11 +32,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Sqlpp11) # Delete redundant and unnecessary directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/cmake ${CURRENT_PACKAGES_DIR}/include/date) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/include/date") # Move python script from bin directory -file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACKAGES_DIR}/scripts) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/) +file(COPY "${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/scripts") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sqlpp11/vcpkg.json b/ports/sqlpp11/vcpkg.json index c171d61265a057..6d8f07814a7a72 100644 --- a/ports/sqlpp11/vcpkg.json +++ b/ports/sqlpp11/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlpp11", "version": "0.61", + "port-version": 1, "description": "A type safe embedded domain specific language for SQL queries and results in C++.", "homepage": "https://github.com/rbock/sqlpp11", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 879c98f5e0c739..d6b97cd6b94645 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6978,7 +6978,7 @@ }, "sqlpp11": { "baseline": "0.61", - "port-version": 0 + "port-version": 1 }, "sqlpp11-connector-mysql": { "baseline": "0.61", diff --git a/versions/s-/sqlpp11.json b/versions/s-/sqlpp11.json index 5d3558e3fe703f..e86af3eac19d0f 100644 --- a/versions/s-/sqlpp11.json +++ b/versions/s-/sqlpp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7384489fec593161753c46383d26f666a751847", + "version": "0.61", + "port-version": 1 + }, { "git-tree": "0013607524d7c0803705193bbf09b1254fab14ff", "version": "0.61", From 6ff1bfa0595b2af4e2a39b41d5be95ee2c4777aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 14 Sep 2022 20:25:19 +0000 Subject: [PATCH 589/791] [arrayfire] Fix usage (#26782) * [arrayfire] Fix usage * version * Add double quotes * version --- ports/arrayfire/portfile.cmake | 7 ++++++- ports/arrayfire/vcpkg.json | 2 +- versions/a-/arrayfire.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake index ee6fab1d8c331d..85c4e587a4c291 100644 --- a/ports/arrayfire/portfile.cmake +++ b/ports/arrayfire/portfile.cmake @@ -45,7 +45,6 @@ set(AF_DEFAULT_VCPKG_CMAKE_FLAGS -DAF_CPU_THREAD_PATH=${CPU_THREADS_PATH} # for building the arrayfire cpu threads lib -DAF_FORGE_PATH=${FORGE_PATH} # forge headers for building the graphics lib -DAF_BUILD_FORGE=OFF - -DAF_INSTALL_CMAKE_DIR=${CURRENT_PACKAGES_DIR}/share/${PORT} # for CMake configs/targets ) # bin/dll directory for Windows non-static builds for the unified backend dll @@ -74,6 +73,10 @@ vcpkg_cmake_configure( OPTIONS ${AF_DEFAULT_VCPKG_CMAKE_FLAGS} ${AF_BACKEND_FEATURE_OPTIONS} + OPTIONS_DEBUG + -DAF_INSTALL_CMAKE_DIR="${CURRENT_PACKAGES_DIR}/debug/share/${PORT}" # for CMake configs/targets + OPTIONS_RELEASE + -DAF_INSTALL_CMAKE_DIR="${CURRENT_PACKAGES_DIR}/share/${PORT}" # for CMake configs/targets MAYBE_UNUSED_VARIABLES AF_CPU_THREAD_PATH ) @@ -81,6 +84,8 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/examples") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index 886bd8ffae3d55..5e1470f3f31973 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,7 +1,7 @@ { "name": "arrayfire", "version-semver": "3.8.0", - "port-version": 1, + "port-version": 2, "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", "homepage": "https://github.com/arrayfire/arrayfire", "license": "BSD-3-Clause", diff --git a/versions/a-/arrayfire.json b/versions/a-/arrayfire.json index e1b20d72395fd0..c494abce8c71a9 100644 --- a/versions/a-/arrayfire.json +++ b/versions/a-/arrayfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ce1cae30cfcfd85b9858f5f46a59136cce97e59", + "version-semver": "3.8.0", + "port-version": 2 + }, { "git-tree": "137eb0d15f469e75ad3255cf1de871d83b3dff49", "version-semver": "3.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index d6b97cd6b94645..6893fdba8d7acf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -182,7 +182,7 @@ }, "arrayfire": { "baseline": "3.8.0", - "port-version": 1 + "port-version": 2 }, "arrow": { "baseline": "9.0.0", From 71115afccd016d55d0b9dac8c0e407f0a7fc5feb Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 16 Sep 2022 02:44:02 +0800 Subject: [PATCH 590/791] [liburing] update to 2.2 (#26801) * [liburing] update to 2.2 * update version --- ports/liburing/fix-configure.patch | 20 +++++++++++--------- ports/liburing/fix-spec-version.patch | 11 ----------- ports/liburing/portfile.cmake | 5 ++--- ports/liburing/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/liburing.json | 5 +++++ 6 files changed, 20 insertions(+), 25 deletions(-) delete mode 100644 ports/liburing/fix-spec-version.patch diff --git a/ports/liburing/fix-configure.patch b/ports/liburing/fix-configure.patch index 92ebf2826f12fd..52b6c39ba645cf 100644 --- a/ports/liburing/fix-configure.patch +++ b/ports/liburing/fix-configure.patch @@ -1,22 +1,24 @@ diff --git a/configure b/configure -index 3b96cde..56d5cb0 100755 +index 2c2441b..620c443 100644 --- a/configure +++ b/configure -@@ -18,16 +18,18 @@ for opt do +@@ -14,7 +14,7 @@ for opt do ;; - --mandir=*) mandir="$optarg" + --includedir=*) includedir="$optarg" ;; -- --datadir=*) datadir="$optarg" -+ --datarootdir=*) datadir="$optarg" +- --libdir=*) libdir="$optarg" ++ --datarootdir=*) libdir="$optarg" ;; - --cc=*) cc="$optarg" + --libdevdir=*) libdevdir="$optarg" ;; - --cxx=*) cxx="$optarg" +@@ -28,10 +28,12 @@ for opt do + ;; + --nolibc) liburing_nolibc="yes" ;; + --enable-shared) ENABLE_SHARED=1 + ;; + --enable-static) ENABLE_SHARED=0 -+ ;; ++ ;; *) - echo "ERROR: unknown option $opt" - echo "Try '$0 --help' for more information" @@ -25,7 +27,7 @@ index 3b96cde..56d5cb0 100755 ;; esac done -@@ -119,6 +121,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak +@@ -130,6 +132,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak printf "# Configured with:" >> $config_host_mak printf " '%s'" "$0" "$@" >> $config_host_mak echo >> $config_host_mak diff --git a/ports/liburing/fix-spec-version.patch b/ports/liburing/fix-spec-version.patch deleted file mode 100644 index cb495f856c1ecf..00000000000000 --- a/ports/liburing/fix-spec-version.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/liburing.spec b/liburing.spec -index fa4d970..8607074 100644 ---- a/liburing.spec -+++ b/liburing.spec -@@ -1,5 +1,5 @@ - Name: liburing --Version: 2.0 -+Version: 2.1 - Release: 1%{?dist} - Summary: Linux-native io_uring I/O access library - License: (GPLv2 with exceptions and LGPLv2+) or MIT diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 72f6d07eb3c2a6..47de0016d99629 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO axboe/liburing - REF 41a61c97c2e3df4475c93fdf5026d575ce3f1377 #liburing-2.1 - SHA512 adbfee9a775ff0977c192b52f5cc2c52b2b40bf5e7c0c1153d88b7767889c7c8a39863da0bce3ebed0f396a453e879633ecf1c79f4f2c4f89407ff896d8b6222 + REF dda4848a9911120a903bef6284fb88286f4464c9 #liburing-2.2 + SHA512 c2e4969ffb895996bf7465ce86143d4d3401a052624ec19580d34e8adbb2b57801e03541493f61e19a3137984714db645b135b1bc3b41987bccfd926bb486c09 HEAD_REF master PATCHES - fix-spec-version.patch # update version value for pkgconfig(.pc) files fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED ) diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index d2fb6d7f1d25ae..14150dddf9aba5 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "liburing", - "version": "2.1", + "version": "2.2", "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6893fdba8d7acf..475464358c862f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4249,7 +4249,7 @@ "port-version": 3 }, "liburing": { - "baseline": "2.1", + "baseline": "2.2", "port-version": 0 }, "libusb": { diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 50c21042134e29..4d3091b4f8a46c 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d783b3db24821bcd85fcdbb5673b03613653e01", + "version": "2.2", + "port-version": 0 + }, { "git-tree": "2abcbd2b104e5dbd5406cac8f3f9a3ae7fc47647", "version": "2.1", From de20eeed0db5215ec8f01dd91ef87dab8ffc491e Mon Sep 17 00:00:00 2001 From: Dimitrij Mijoski Date: Thu, 15 Sep 2022 20:44:33 +0200 Subject: [PATCH 591/791] [nuspell] Update port to v5.1.1 (#26797) * [nuspell] Update port to v5.1.1 * x-add-version --- ports/nuspell/fix-tools.patch | 30 ------------------------------ ports/nuspell/portfile.cmake | 5 ++--- ports/nuspell/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nuspell.json | 5 +++++ 5 files changed, 10 insertions(+), 37 deletions(-) delete mode 100644 ports/nuspell/fix-tools.patch diff --git a/ports/nuspell/fix-tools.patch b/ports/nuspell/fix-tools.patch deleted file mode 100644 index 18dc5c5281da89..00000000000000 --- a/ports/nuspell/fix-tools.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b54c54..7c6f3a3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,7 +12,10 @@ find_package(ICU 60 REQUIRED COMPONENTS uc data) - get_directory_property(subproject PARENT_DIRECTORY) - - add_subdirectory(src/nuspell) -+option(BUILD_TOOLS "Build the tools." OFF) -+if (BUILD_TOOLS) - add_subdirectory(src/tools) -+endif() - - if (subproject) - # if added as subproject just build Nuspell -diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt -index 3e63610..7597a6d 100644 ---- a/src/tools/CMakeLists.txt -+++ b/src/tools/CMakeLists.txt -@@ -3,6 +3,10 @@ set_target_properties(nuspell-exe PROPERTIES RUNTIME_OUTPUT_NAME nuspell) - target_compile_definitions(nuspell-exe PRIVATE - PROJECT_VERSION=\"${PROJECT_VERSION}\") - target_link_libraries(nuspell-exe Nuspell::nuspell) -+if (WIN32 AND NOT MINGW) -+ find_library(GETOPT_WIN32_LIBRARY getopt) -+ target_link_libraries(nuspell-exe ${GETOPT_WIN32_LIBRARY}) -+endif() - if (BUILD_SHARED_LIBS AND WIN32) - # This should be PRE_LINK (or PRE_BUILD), so Vcpkg's POST_BUILD - # step (see VCPKG_APPLOCAL_DEPS) that copies dll can pick up nuspell.dll diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake index 8f7ec68576128f..ca5cbe1ee45318 100644 --- a/ports/nuspell/portfile.cmake +++ b/ports/nuspell/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nuspell/nuspell - REF v5.1.0 - SHA512 08ce776d224c66ba4bdd8cb22943741f30e8e5ba03396bfef1db598321c9b0f8814dacffcb52287b3b669426c7b08e2c1a40323341a9ff9768a7187002e1d77a + REF v5.1.1 + SHA512 c33a52e3603071d3281b7cdcfa42776cd7ecb998292939538e53e364cfff63227cf094cd88ee6072b8a857f5d85c984c359a16b480dd462dac9cfd602cfd6c2c HEAD_REF master - PATCHES fix-tools.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 9ae7f8eb62e719..15f37dff5300d0 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nuspell", - "version-semver": "5.1.0", - "port-version": 2, + "version-semver": "5.1.1", "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", diff --git a/versions/baseline.json b/versions/baseline.json index 475464358c862f..50c25c93cf12c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5117,8 +5117,8 @@ "port-version": 0 }, "nuspell": { - "baseline": "5.1.0", - "port-version": 2 + "baseline": "5.1.1", + "port-version": 0 }, "nvtt": { "baseline": "2.1.2", diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index bc160010fc40aa..b277222189c5b5 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0daf4a7623ab68c7f706b815dbe29e8f4627668e", + "version-semver": "5.1.1", + "port-version": 0 + }, { "git-tree": "5719acdfd3465a7bb3dfac85ce2821c56d7c652a", "version-semver": "5.1.0", From 8907350a2729ae9effa9f5ae9ecae962102db254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 15 Sep 2022 19:16:25 +0000 Subject: [PATCH 592/791] [saucer] Fix configure (#26783) * [saucer] Fix configure Signed-off-by: JackBoosY * version Signed-off-by: JackBoosY --- ports/saucer/fix-source-generation.patch | 21 +++++++++++++++++++++ ports/saucer/portfile.cmake | 4 +++- ports/saucer/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/saucer.json | 5 +++++ 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 ports/saucer/fix-source-generation.patch diff --git a/ports/saucer/fix-source-generation.patch b/ports/saucer/fix-source-generation.patch new file mode 100644 index 00000000000000..d49566343dce0b --- /dev/null +++ b/ports/saucer/fix-source-generation.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3800146..6200c78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include/saucer") + # -------------------------------------------------------------------------------------------------------- + + string(TOLOWER ${saucer_backend} saucer_backed_lower) +-configure_file("constants.hpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/saucer/constants.hpp") ++configure_file("constants.hpp.in" "${CMAKE_CURRENT_BINARY}/include/saucer/constants.hpp") + + # -------------------------------------------------------------------------------------------------------- + # Configure Library depending on options +@@ -91,6 +91,7 @@ include(FetchContent) + if (saucer_backend STREQUAL "Qt") + target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.cpp" "src/window.qt5.cpp") + target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.impl.hpp" "src/window.qt5.impl.hpp") ++ target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY}/include/saucer/constants.hpp") + + find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED) + target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel) diff --git a/ports/saucer/portfile.cmake b/ports/saucer/portfile.cmake index a4adbd028cff28..0ca352fc3f27ae 100644 --- a/ports/saucer/portfile.cmake +++ b/ports/saucer/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF 6ae482092cca4d4a408e6bdf24714153d9203797 SHA512 1865f6178b2885483f0b43c1641e602f957d4e64e77b802e64a64038b709dbf63fa2dd6037720e7180434e91341f2e1a0eb86424c1ee1556db5971cba3434bb0 HEAD_REF dev - PATCHES "unofficial-webview2.patch" + PATCHES + unofficial-webview2.patch + fix-source-generation.patch ) vcpkg_cmake_configure( diff --git a/ports/saucer/vcpkg.json b/ports/saucer/vcpkg.json index 2477c3c57f41f5..70b43975afcc63 100644 --- a/ports/saucer/vcpkg.json +++ b/ports/saucer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "saucer", "version": "1.0.1", + "port-version": 1, "description": "Next-gen desktop apps with web-frontend in C++", "homepage": "https://saucer.github.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 50c25c93cf12c3..61b9777be87266 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6554,7 +6554,7 @@ }, "saucer": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "sbp": { "baseline": "3.4.10", diff --git a/versions/s-/saucer.json b/versions/s-/saucer.json index 53887495f688e8..66519a7b46f1ff 100644 --- a/versions/s-/saucer.json +++ b/versions/s-/saucer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3738770dd615f4e229cc0bf1e6704d3c0e9e001a", + "version": "1.0.1", + "port-version": 1 + }, { "git-tree": "66e466405fa3632e2b1539329a3ce71a65db5598", "version": "1.0.1", From 258dbad4ccdc6532d1670d985fe59ce7b6fedc99 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 15 Sep 2022 21:30:09 +0200 Subject: [PATCH 593/791] [Qt] update to 6.3.2 (#26762) * Qt update to 6.3.2 * add odbc sql driver * v db --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtapplicationmanager/vcpkg.json | 2 +- ports/qtbase/cmake/qt_port_data.cmake | 73 ++++++++++----------- ports/qtbase/cmake/qt_port_details.cmake | 2 +- ports/qtbase/portfile.cmake | 5 +- ports/qtbase/vcpkg.json | 16 ++++- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdeviceutilities/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtinterfaceframework/vcpkg.json | 2 +- ports/qtlocation/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/vcpkg.json | 3 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtpositioning/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 3 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtsensors/vcpkg.json | 2 +- ports/qtserialbus/vcpkg.json | 2 +- ports/qtserialport/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/vcpkg.json | 2 +- ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/vcpkg.json | 2 +- versions/baseline.json | 82 ++++++++++++------------ versions/q-/qt.json | 5 ++ versions/q-/qt5compat.json | 5 ++ versions/q-/qtactiveqt.json | 5 ++ versions/q-/qtapplicationmanager.json | 5 ++ versions/q-/qtbase.json | 5 ++ versions/q-/qtcharts.json | 5 ++ versions/q-/qtcoap.json | 5 ++ versions/q-/qtconnectivity.json | 5 ++ versions/q-/qtdatavis3d.json | 5 ++ versions/q-/qtdeclarative.json | 5 ++ versions/q-/qtdeviceutilities.json | 5 ++ versions/q-/qtdoc.json | 5 ++ versions/q-/qtimageformats.json | 5 ++ versions/q-/qtinterfaceframework.json | 5 ++ versions/q-/qtlocation.json | 5 ++ versions/q-/qtlottie.json | 5 ++ versions/q-/qtmqtt.json | 5 ++ versions/q-/qtmultimedia.json | 5 ++ versions/q-/qtnetworkauth.json | 5 ++ versions/q-/qtopcua.json | 5 ++ versions/q-/qtpositioning.json | 5 ++ versions/q-/qtquick3d.json | 5 ++ versions/q-/qtquicktimeline.json | 5 ++ versions/q-/qtremoteobjects.json | 5 ++ versions/q-/qtscxml.json | 5 ++ versions/q-/qtsensors.json | 5 ++ versions/q-/qtserialbus.json | 5 ++ versions/q-/qtserialport.json | 5 ++ versions/q-/qtshadertools.json | 5 ++ versions/q-/qtsvg.json | 5 ++ versions/q-/qttools.json | 5 ++ versions/q-/qttranslations.json | 5 ++ versions/q-/qtvirtualkeyboard.json | 5 ++ versions/q-/qtwayland.json | 5 ++ versions/q-/qtwebchannel.json | 5 ++ versions/q-/qtwebengine.json | 5 ++ versions/q-/qtwebsockets.json | 5 ++ versions/q-/qtwebview.json | 5 ++ 80 files changed, 323 insertions(+), 121 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 4244eb0ae97f94..4cb2373d611dc4 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 33e8374d195ec4..66374a8a8cc5a4 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.3.1", + "version": "6.3.2", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index a13f93eeabde47..56ecfc6a17a437 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.3.1", + "version": "6.3.2", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index bb738963f92758..929401f5be6c74 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index 22fc8b31475899..db45474837810f 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,37 +1,38 @@ -set(qtbase_HASH "5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5") -set(qttools_HASH "6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883") -set(qtdeclarative_HASH "547b29dcf26f734b32283677b9e02a43a75f3ab4849e578592031fa37babc09e5b1795e719119ba6b9400ef59b16fd387fb97aa3603454775be4a27e19ff065c") -set(qtsvg_HASH "c040e96d2dc7ef615859dec589e0b0c4e5972c3761dcf9208086b0662bfa1c3d147a10534d62d86fd8c9786a1567f8e9ca196f942a372422fc81cd02f1312c4c") -set(qt5compat_HASH "66196a8d29a2789179904638fcd9ec162d5715e7dc28618b3ef78d07682a05578b6c2e7023144c628b94321a9c1332d39826c13adb1e5db5121406c530c9c35c") -set(qtshadertools_HASH "c9f62139e4407b7bfbec78c231d00fd627be5396056a68c054e6b6ecada8af846198aadcbe2af56bb2c525f2851ecd492195a432e4e084f1db346d2e3722747e") -set(qtquicktimeline_HASH "ad55ed87942ac39c28587e15a5928ed458d5019501a689b7e51d105032d65122ef866a9d39af91c382def54d6e5246a38d16a0906f05fb8d1374e9eecefd2646") -set(qtquick3d_HASH "342a1c558a4eece6e9442e45cc400af58c96fb59614902e0299291ea2c5b1c406d76cd8ec8cf1d8ac0d8b5fc4f2f4637063d1747dcdc54f191a81310df93534e") -set(qttranslations_HASH "1c29842c6fbf669911849649c02415fb911ff187d928604a9bb4473a57aeb463182ed972e0ed0cacba20f8cca8da6733866657edcc22a9a8e9f1cf77ebaba98f") -set(qtwayland_HASH "571654a6abcd865717d4624c65d78e1b911829bba84f609521f349bf896b9475a8ce7759ba6b69e4bc4eef10c31e404c71610816dbee20d1202401efefa2323d") -set(qtdoc_HASH "707f8284b31a9d6bac7a5783e554d641b2092f3571c239207d02e958438d403750216722a9663415e7a2348a8d9afd13f19cfb534d25cdda817c652d1386c011") -set(qtcoap_HASH "4393cdeb0e7a48224b3ea9f63fc4c0594e782fbe2c25a40b3d0cbfd8eb830df740e4489ea5f77947821ef3e6c7744735fc9a2c59a54411b6134e14d71be46cf5") -set(qtopcua_HASH "7dcd6fa710c7c5ef7f41421b12ee4c56ed14ea9da44799ff27ae0c74cda8c41436173d7280afaa34a0284c66540f107ec441ad3bd329a0b98db8814618cd7f45") -set(qtimageformats_HASH "9be2c4dab869c7709775514ee2dbc9d84c8e76b98e8e8a01fcf96355b3309f1830bff57cd9455bc4a33c5f8f0cb948619806dff6f303233c35e5efbdf3cc92f7") -set(qtmqtt_HASH "786e103971ed249b7656261c8844dd84e809246fca65b96b31ba86ee998beefcff9be059fd8c4bc3e2003f3b75b3c3026d7908c96ee4ec5e9ef3629a6280b380") -set(qtnetworkauth_HASH "e7e73c57f9bfebaca7990b5d886682a4fbe5d46c8c952d056514236ae7d6beee4614dc9c957c1fa2526c89c0fc70e7dc8727533d3cc754d367cd7ec749cf2e03") -set(qtactiveqt_HASH "0dfdf0ffe3f0ec1dc31fe8d27d402f07cf44ca85baba1cf6a3db1850347f41bf4ebc9eb85f631787dc6937545e854960c74d39570a7d51ec808b8b6604153c2c") -set(qtdatavis3d_HASH "2d345e42dcb726b8bfa1ca12b0b7feb7f8df6f74f434a8ace58e1d28c3ce9ab4b0877b6918eb9354878ff4a429b56bb5c6cd95a80feeaa38dd67796f5d5171c7") -set(qtdeviceutilities_HASH "9e7b6cc823855f18d97eca8ee1d10f29655cc9492e16deae1ba8d2a9678e716c9bb189ada09e516c1437a0025c9f5aefb899dd44c9063e079bff41a4c0847312") -set(qtlottie_HASH "fbd2513a9c563c8608cf169b7733e5fffa4ec3e42128434175b0737269b1923bdd5f89cad6ccdd4cf7ce857ee7c389b54b91fc1569a264cd0a8f132f7d3ae73b") -set(qtscxml_HASH "b4782c6e9e98dfd8dae0ce75e69db7a3bc2f2764f8f8ee086e05d01e1cd4b824512925d5afc48ed0a6e8d15d43086fefb05b917a28018786726a58ea5bab6a78") -set(qtvirtualkeyboard_HASH "3e5e66b53bd9f0e45069b5423bb1f54cfe5cb36480b1fb5c786a726d7f8fdb69ba122f2b02f34ea6316ea3ae748999884c060c5b8f5ae1dd4fa684252f795234") -set(qtcharts_HASH "c3aa002d9b9d41e55e440127ad84f1413869432ab361c373911a9ef29c25d72fb411f71e950a017f5e97c1d8bef92611fc9558d2619bd73b1e6df2e8963572b0") -set(qtconnectivity_HASH "f35ec394d1be817369959a38528a64dc5a7f060fe37d84363d0b04e14776c796e079787cbe24e7678454a7edf82909d4a3630e614142595dc271fcf10c9a2a0a") -set(qtpositioning_HASH "32cea980147487e5ea6dbd25347b3b37f74fd9d8180d7b463f784eb3877361862e38bfa310e36d83dd9c9eed91b4415812ec9ee7329c96818a32d99a17f76e5f") +set(qtbase_HASH "e164ed6511cf6d5aa39f91cfb624c89b4dd3fc7d3c6c14b60d0c211e5b40ba1ad379ecca653db33dfa944ecfbd9c7044a8d7a968c660e8a76c4897c869584822") +set(qttools_HASH "ca8b11dac82027979ff9b17b8beb50ea316cba6d8f422a291caa63a4f7c345942bf852733fd7243a27bcf46b1ca6a5af30e283377a8c6b73193004e3aa3837f1") +set(qtdeclarative_HASH "4929bd1e5ff16475847ddd75322353afc35c7a06688d32e6186649b38a08d88f435a134fdcfbb4f9fe588f9cd317eb8c0fb6aa0f08416b900064156f3af926af") +set(qtsvg_HASH "2238f1eb3d325b2e17b7e64de5c7f55d1f6129fab7b123ff4c3290307b586d1e894d07a71faaa7f4cb30c1d28e2cc11b11705e03fa5e83c6baebe056a6b3c751") +set(qt5compat_HASH "12407b27871a3972e3400d9832e454ea221fd18f6c5ce19be8084d085c148d70097b5de8fcedf2a53777b38ce9511f215e56dc145a618e472ceb2caf584c689e") +set(qtshadertools_HASH "8394b5467a391fb2b87d22a4b4a2b5b8c0b5d6eb9ea4273aa115fd9b3cab6d955473ed0dc66858390df3d9b6655977baa47b52762cef5c6e95e44330f9040b8a") +set(qtquicktimeline_HASH "fb1807c80bf0af34514aa8db76f167fec75e0e9604c266dba6bf1a560a61ee1395d440fee25457a2a3913708e6fca6b708ccf6a62002b03a0880e5256fba2bed") +set(qtquick3d_HASH "ffe2ff5f64278640c1cc543737cf4fe3d814630fef24602ffd1d166e32dee5d5e929d029abb7573cb28502bd00e1b6217998dc54a3ab4606d053809ff12acf20") +set(qttranslations_HASH "81d0273a99a025b62b1995c2ddbc8cf3b82361ba27ba090c7de1185f6d6a00ead7de0f4f97c34a49bd75b778c0ef8e052a2bf69e67a8513f2bbba575809a720b") +set(qtwayland_HASH "475ba168bacb2d35a5962b27542f43420e3baf42d2026699b272174076ee6a26f8c3663ba8e44508f2011c5b7a2e4b3086390264cdf621b393c79fe89265bd03") +set(qtdoc_HASH "6a6881df8f79ec722ca1c70ff32e586dc1821aa7df969fecd0125cd935fa0d7e88fff0fa65f769c222d72f42da677855710e892b414aa705d92b83b7338f76b4") +set(qtcoap_HASH "0689e1315fe2fa37c26a3f67ae8b30cbe9c9a4ea80c74cfa10cf5b5dbd58b123efdc5487ef7d9cfef56fbf3e3036a2b2b0010471e140f3778cdd4bc04bcc25ba") +set(qtopcua_HASH "4203c1504bf9566452698d30acab474586498dec03546644dea292bd1b266de065592d0651c1953dff7a60d19f87792cbdcf6aa1bd01c3e4c6ce56164a7e178c") +set(qtimageformats_HASH "5964c1f0e5fc4032495641268881f2288f90f361cb5a7e4953e05005ea907033ef634192ef26e1b0343e09c1a0306f83bef88ad4a5dba4665387001290dccc77") +set(qtmqtt_HASH "2d74f0dfde99f2263c8ac61aa787c80afb62c3db0694b37c15d526273bda4c0519b8c06a7f0f66e37eae0df307c4b65d2b0486112dc7e887a40ac32f60e885c4") +set(qtnetworkauth_HASH "dfe52c4ce02d07181293f80ebffe9ff7060f5f63f7c9a6d38c7e13aa131ab5ef4d51e07a16303458f85b04bd6b1bfe3878614d05d1936877c1ce1f6b34da2fe0") +set(qtactiveqt_HASH "ec8590ada67df9e2db280713b1a1b6832f610882f9a2eaffe924efaddade184f380ff6caeeda6ee807fc74635bd4f4f57a7530bb1a9dd08aae57b049d6b1332b") +set(qtdatavis3d_HASH "58a68c27f08cceb735309c018398b8ea6b6805e2ad78604fd445ea44749809f7f41209257d59ea211446328ceb216470b6c4159ea7434d19f4b635da80606ffa") +set(qtdeviceutilities_HASH "392b6a08cbcbe6494c6497e3028d3b62467156b293b4db50cd1e3fc1b57e699cf43052fd8937e27ba61736ef5693b55077c8ba40b69fc1eb733db2364f772bf1") +set(qtlottie_HASH "973ecf403cb1944e24176f4b021b17e0eb7d06a188b92d71e3ae41cd59a668f57e7fd135607b428a9822af0daa7f18bf84b4f8436d0e1c4587797d3735ae2088") +set(qtscxml_HASH "64f8cf91ac14364ed52ff032071b21f5f905693e6e66451751981bbd50e209246c6e3ce29c26e1dbb6559146e7ba867896f0a92f8936c4a124882bee42cd7f45") +set(qtvirtualkeyboard_HASH "be2974a22637c757b500246aff76037fea47b00c5a1fabf0811c2b752868cfd16c9e23457043457cde4354343e583b67984cdf27349e1de031721a0ddbb9642a") +set(qtcharts_HASH "7e04a4cbce66ddb1055d8e399bbb06b6a7ab5b8a0f80de315f20c4c0f2971911128ec386752818c7a07cd6dfe326e62e4c2e6a0e92e2bc97498e49babed2af50") +set(qtconnectivity_HASH "fae73921e8f8573e98d189f22cc07368300cfb509b3f3f49ffa8f35c52f0a986102c8d5705a112dab51c6d4c209d893f2ec641de74f861f1cd5b3390d66d0c09") +set(qtpositioning_HASH "0b65ca2157bf38f5a5b716c921f13cafadb4b98ba30d34893ea587b82dff9fbead2dd03af6ef6d1c75fd57dce85f8bae2b2b0b79f66ff2abb6b660f45a039df7") +set(qtmultimedia_HASH "d6b31aad99a71096cac0655da99245553efdeabb67f6625893d23a31ce7c8b7e15219558933174a6577913ef903092b3230f211dd36b29ecfac782d7f358df27") +set(qtremoteobjects_HASH "59b32ca733de3d10aa98f5d0304ce30acb6911434ef24e43de357e66310707180c596cf5a2af3c746c69ff9f4de98cccb46a94d1e5f0ed65e990e11addcdcac5") +set(qtsensors_HASH "f6cb6b523bba0fb928a1fe12b149c6a5aeeeae55bfcf95baf33d4aff68e197e01ced8de6da5c7dc313c4f75ce1bd201587c4cb0fefd9eaed1c47805c56b8e41b") +set(qtserialbus_HASH "4507944f39f3060742d26bec153929e933abd38803eeac95f317ba94aa14e1a555b5d3b4158591ec113b51f56451ba8cb133be0301ffec9df09408e245b7ac59") +set(qtserialport_HASH "d71ca3b004133eb86fbfc4e8e22daa1d6317b4dab8a7b8bf252509a226477b28647c20ad01368fb7b5b4d2fc1007606a287a3d38ca904e722efda7dfb7cec2ab") +set(qtwebchannel_HASH "83de9a61d25bcf8346ff46417173ecffe15cff9802db524def1afbce4367f3d414b10e8042d45db36555945544dfe1c1d081e4ec33756250afca7ad58975c9d9") +set(qtwebengine_HASH "deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a") +set(qtwebsockets_HASH "b57621b00d0919c57ced9eabd553a624585b16f9b061366af53abdd00c5ca6b203ed01323728d8de61b2dee7c905a20be3c31baf73780afe1cce4d5f0308483d") +set(qtwebview_HASH "39cb4bf67818e4d462fbdd180a802052b3637578a8b99a943359749f15b721f2e0b0354d90ceaaff99a57eba1c57c1ee271e4fd0a553d42c8093c665b9192688") +set(qtinterfaceframework_REF a83bc81486891170750a3048e6b58d15903e6f9c) +set(qtapplicationmanager_HASH "79a8e7588ec168d6cbccd921bc46b48a25512591b65e1602dd7cf461a7692472498301eea299808a08b7ed7f5efaa69f9a0b9ab86f9ea8f18cb4421c562c3f20") + set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629") -set(qtmultimedia_HASH "c557a8577a28df1997a07643c125033d6ab0e1d64a2e67b659f51d11d29c5634e7ea1264ad31705889e138521b65b74761ac68399dd94637ced8c5d6d07e03c3") -set(qtremoteobjects_HASH "276f7744a2ee017e408957ab03546cb79f9ea92102b5c1fa28a206136ac14600612ca122c38f45b596ef5b9677563b8ba6ad2e3d778711f35b6d03aff6232eed") -set(qtsensors_HASH "1e095e23e16a7360f5f2dc333ecf6dee448d0b96c93f820e94afcc2f4e9472cd24145f286f8669f9499def45d84281b9bfe2886a1e4da304cbf16e34f3491b6b") -set(qtserialbus_HASH "614c83ae7b5289305d6bb5317e6e102874b76aab2d3de84211584fd0f5a02ff16724d73990b62f73ea79cecf3573b0d98bb5780612c511686940799d70496391") -set(qtserialport_HASH "c774353fe019f9745ab8b6ffbb61f15a08a74368b3b8e7f6e16ab60c43ad9003690c013381515e4895288c3f5c22b956506795a153670e3b0c92c200a5283a9e") -set(qtwebchannel_HASH "d253e087a9e97173a6a97eac46d8dfa740d3c77182dfd57514c14e68e50f6745cd90e9367cbb5f5d0a7c43fcbfc046af0bd9124fb2517d741bb5ab1a5af5bf62") -set(qtwebengine_HASH "e00601a7ec6400551f7707d15cf326340ae8d6a5bb8cda55df4619148414f4b3ca3daabfd7263dd5a2ff2ca8ba64f9e91c9db3f1a50bea4903148c57b6dc81dd") -set(qtwebsockets_HASH "25ab603753fdc1c65585b6aa91d3777f48e0763cff97978478586a0f04d0536b5c4d5853f9218d2a0c3b3d01b1bd9ca7e2f0e90020737c1fc70bdd4a3cd5a30c") -set(qtwebview_HASH "73529993e2ca308c841d731c87180bbdb25df93ccf3e472349c5f141f5212678ebe090898f1ee396c4cf07f9eab46e1c3cc7a5371ef5c0dc8fc0c0b9709b2997") -set(qtinterfaceframework_REF 577d0c7f7a2ab952c6eab2cf5798d18e668cbb64) -set(qtapplicationmanager_HASH "7a74e8275bcb84eb946a04a0efc7bd6173b2c6556392da082c896304ab13df751a4be3d4aaf682026359c240a9f4ea252b90d9089df1509eb256ce8fa79b4bf3") diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 6f684aaca5c5a1..c9036cab5817e8 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -7,7 +7,7 @@ ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake ## 7. Set QT_UPDATE_VERSION back to 0 -set(QT_VERSION 6.3.1) +set(QT_VERSION 6.3.2) set(QT_UPDATE_VERSION 0) if(PORT MATCHES "(qtquickcontrols2)") diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index fefa73ae770676..0c923dab304c57 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -200,19 +200,20 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS FEATURES "sql-sqlite" FEATURE_system_sqlite + "sql-odbc" FEATURE_sql_odbc #"sql-psql" CMAKE_REQUIRE_FIND_PACKAGE_PostgreSQL #"sql-sqlite" CMAKE_REQUIRE_FIND_PACKAGE_SQLite3 INVERTED_FEATURES "sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL "sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3 + "sql-odbc" CMAKE_DISABLE_FIND_PACKAGE_ODBC # "sql-db2" FEATURE_sql-db2 # "sql-ibase" FEATURE_sql-ibase # "sql-mysql" FEATURE_sql-mysql # "sql-oci" FEATURE_sql-oci - # "sql-odbc" FEATURE_sql-odbc ) -set(DB_LIST DB2 MySQL Oracle ODBC) +set(DB_LIST DB2 MySQL Oracle) foreach(_db IN LISTS DB_LIST) list(APPEND FEATURE_SQLDRIVERS_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_${_db}:BOOL=ON) endforeach() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 44bae6f5bbe583..388b3fb949927e 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.3.1", - "port-version": 2, + "version": "6.3.2", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, @@ -267,6 +266,19 @@ } ] }, + "sql-odbc": { + "description": "Enable SQL Driver odbc", + "supports": "windows", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "sql" + ] + } + ] + }, "sql-psql": { "description": "Enable SQL Driver psql", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 92a4b8b745c936..3e700962bfc355 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.3.1", + "version": "6.3.2", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index ee5683a3b8a3e3..4985db892b2278 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 5bbf9d5b6bd4a2..dcb9ddb1b49988 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 51c77a15766dbf..283e597c05f21e 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 8aba191ac9296e..94126999e8ea24 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 763ce87d319cbe..81793c82e08af6 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.3.1", + "version": "6.3.2", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 09617c848a4709..9b571c6e97ed8e 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 2763236d655cdd..7da325a2340378 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.3.1", + "version": "6.3.2", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 9bdb4de2ae2ecd..c3c11ca8b6aeab 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 845debcbe746b8..840d188366a19b 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.3.0", + "version": "6.3.2", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index aa2e4621834a31..c297a2c6bedd99 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.3.1", + "version": "6.3.2", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 9cca4611145baa..48177144e0210d 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 6a3256e71a8749..74584b33e413c8 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtmultimedia", - "version": "6.3.1", - "port-version": 1, + "version": "6.3.2", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 55ecdc191194fe..657286be124f2f 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 2e457f44117b47..5fcb033770af2c 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index b849bf0aed148b..185544c21c27d8 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 54a01f5cbfc3bc..330341f4297bb0 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtquick3d", - "version": "6.3.1", - "port-version": 1, + "version": "6.3.2", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index fc713be016cc2b..042940e4f28388 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.3.1", + "version": "6.3.2", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index d1bfa951b4a588..8e610414aa50cd 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 1ef5fd59844dfc..ad42ddbaeffde0 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.3.1", + "version": "6.3.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 83800ebc1de905..14359d2ea03207 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index 2a453b51a7518f..ceceb6578bd096 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.3.1", + "version": "6.3.2", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index a699ebbe6e19d0..957c59b1a14c6c 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 94ca111a973147..fe7cfc7a1d2aeb 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.3.1", + "version": "6.3.2", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 3f5090785738bd..8c3cb4e520513d 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 97476b70f508c2..f19f23a42cff77 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 5703f4e1cfb46c..4699899d0f12d2 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index abc35fc1a52a73..f898bf172530b5 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.3.1", + "version": "6.3.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 746cc7ccea848d..f9ae6ee2eb8fa5 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.3.1", + "version": "6.3.2", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index fcb172f1d85caf..e7cc923d56d834 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 47cf3c88a37197..7b7a621e046319 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index bcca1178983735..33c774c354b72a 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index a4ddce994273bb..92468d439259a0 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.3.1", + "version": "6.3.2", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 61b9777be87266..032ab660016de7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5881,7 +5881,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qt-advanced-docking-system": { @@ -6061,7 +6061,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qt6betablock": { @@ -6069,51 +6069,51 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtbase": { - "baseline": "6.3.1", - "port-version": 2 + "baseline": "6.3.2", + "port-version": 0 }, "qtcharts": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtcoap": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtdoc": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtimageformats": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtkeychain": { @@ -6125,103 +6125,103 @@ "port-version": 1 }, "qtlocation": { - "baseline": "6.3.0", + "baseline": "6.3.2", "port-version": 0 }, "qtlottie": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtmqtt": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.3.1", - "port-version": 1 + "baseline": "6.3.2", + "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtopcua": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtpositioning": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtquick3d": { - "baseline": "6.3.1", - "port-version": 1 + "baseline": "6.3.2", + "port-version": 0 }, "qtquickcontrols2": { "baseline": "deprecated", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtscxml": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtsensors": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtserialbus": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtserialport": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtshadertools": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtsvg": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qttools": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qttranslations": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtwayland": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtwebengine": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "qtwebview": { - "baseline": "6.3.1", + "baseline": "6.3.2", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 9bdbff55bd8de8..ba8db8735c2d07 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17bba488ae744a514ee214f30d0bdb1bd6da6831", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "0a008830e0a624fce731b50046e8f3b89c46c340", "version": "6.3.1", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 61f970551a5b77..053fcb7b7a6785 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "489933bcd5868bf6310ed40d5044c9bba7ab6010", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "7272e6150222d29108fa00089066f55ceab215ea", "version": "6.3.1", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 9c241aaf1a32d7..a15d6b1d528b2b 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "465d2e5e0439ba13fb1f7e86d76be47aa146ab28", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "9c415044d8f956b7f08dd627bbe1afb172ea83bb", "version": "6.3.1", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 9020d0e313794e..666fac0cb4adb1 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6be65136ec1e0356c284a37a5908f6bcf78215d9", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "154acc25a743ab1e454fc9c2a801f6eb2d28c8e1", "version": "6.3.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index c75a137235b0d3..ee7226a28adae8 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b34c02c8bbcd997c6f65d11a4d01012f0441de1", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "3fa8531e9f444076cc6e73b979bcaaa3e665a7a5", "version": "6.3.1", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 63442d02d4ca4e..4d9b5a584c4632 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "748f1d3bee95e095d18eb8cf86840bcdab5b1f0e", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "a15b7d019195f7598c982e0e04c3af1854c9f2e1", "version": "6.3.1", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index f311cbdeba3552..139fe601264cdf 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4d1e5ebb1598edbb9861dce84997b10e66fc769", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "ffcdc27a6814e5a08af5c618b230c2c144a49c7e", "version": "6.3.1", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 94afd1e02a0499..d25cde68d5261a 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df953810cdfbfa1516ad5f7a03d0577f97de03e6", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "84a17dffda30f3239e065b5776ff972098613dd7", "version": "6.3.1", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 579f9d24547149..4b4540a3df81c7 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88f09be59dad78b84bd41c01520f9fcfb5052b46", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "e7aa59175c94525ec18c988c866356882c730cb5", "version": "6.3.1", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 3516007e411048..9c758064461162 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f10c6273faf539ccacefdd271f80f71d37426ff", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "f07ed79d7c1a7c616539e8243126143cf202b706", "version": "6.3.1", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index b1b5ee79842ae3..a8e9c7943c13ee 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1651713cf1f37a37a03d0d9a49c589dc0328363", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "02a1198b628b04d7969fbf1f8214428da635555e", "version": "6.3.1", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index ecbb5a2420d115..1f16ae37432645 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bb265a825524a2184d6f0d9ee81bc258a5dd7f4", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "78caa376b251d8d5cdd40c5128a2a657308c6d10", "version": "6.3.1", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 79d359c227f7b4..addeace8fd4fff 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b124b9d71de95557c5024f6ba1d3328b553ce35f", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "fc60f798c304673e062010dcf4b1c3b27bc5d46b", "version": "6.3.1", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index b27d331c1b9a98..6899db930a1173 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06bd4310e48e978c281804ba2bce2fc37d1b4fa1", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "5ddae3f893d3147528593a2b05ad2012416a6a26", "version": "6.3.1", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 5e90ec0efe5550..6e7450a0649f31 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66543e50c8d248760af29f9d0389b317718cf77d", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "a05ac67b49b7e904ecfbe1f717de1d958f534732", "version": "6.3.0", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index f30efce713b363..bd4d4e83d0b820 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4cec2002c75d7f5ccee8a209145070ec41d4683", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "b817b1b9d2907f2eff4b3720adaf5e57d3ba58d8", "version": "6.3.1", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 1623b03c593a24..2839a41b6dd125 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32ec622f0241df9bb4fd5aaf31525fb3a1046167", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "dac98dff234119fbebcd0ad9fa5aba66f331fa67", "version": "6.3.1", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 72a8c10174c83a..fe7866268e53a8 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f538a967236f91129b70c8cf335746242e0cacbd", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "e820875b5bc53163ca6af245c6874ce366dac52a", "version": "6.3.1", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index a42bf72c96799f..83e604cc5d60ba 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfe2f0d819c3e2f405710056f692d2a72675a26a", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "73fb3aef5bcda38a39d0e75b6a64193beea261ce", "version": "6.3.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 52d1316fce90cc..968ef567911b91 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83f22dc97ea1097dc2aab93b0b468de4cd5927a4", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "fb153569181c4723a0c2c2811e1d9e74e13c75e1", "version": "6.3.1", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 28835c0908b032..1f1ea42da94db7 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "917a949915180a1c09998f917a44a3026f721889", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "05f02aa08ead77446d353e181062fd78b2253b7b", "version": "6.3.1", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index e6c1804bafd855..0abd95cff0e509 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "250c2b1d8bb5d0dbecc4ecceb6269f2c50a6b0f5", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "cd80e49b7976333f599d55bd5b186b2605f17700", "version": "6.3.1", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 76f1959c5495a4..2369b8a91c454f 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33432efb529b2a9452488d400e63bd15785a1382", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "d92d8af81e01f106e680d66ad1d1a698f40c01d9", "version": "6.3.1", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 1649e142288204..2cd716b00ed195 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d720b92e53f722ebf9f0624f5c4ba8a8ba465cf", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "f9ab5c76eacdd4f7352ff1be88c221335057c91a", "version": "6.3.1", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index e04e91e106290a..534a68351e09fe 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f694bf4523736b0a8871468d2f890c0170eadf0d", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "dad48d019ccaba8f0a7579d903cd99c901c74fc5", "version": "6.3.1", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 877a6d0bc85887..a946bb70573249 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2005a1cbf056aab0a5919d2c0b184ff25a289fe4", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "10b934af8bbfa5f960391ab2bd121194c9aee494", "version": "6.3.1", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index ea824a8892e41d..025c3693402070 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d08e9a633ec502000dcd1c0a31b31b5fd85cdab7", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "ac0f2168badd930acb29ef160c7bc408cf0e062c", "version": "6.3.1", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 0b28da0acd7ba0..85f4c036ba1032 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7442cfd0d14aa6ef8e7614aa28a340c509848d1", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "7974343d211dd12cb91e9cca217e8f9b04783182", "version": "6.3.1", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 9a2d17e5e5f019..a4192fdede469d 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7358894ceda32f4d35603e4d525e1fbd805fbc60", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "f1ee6d4dc6fe612733391a78b4149393ab82c78b", "version": "6.3.1", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 375240f15619dd..b48d099370c9c1 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a331df9dc56e835f16c8266d9b6eabb94ac2c86", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "cc44ba493ec11d3b32c272c115add826353cb707", "version": "6.3.1", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 5cecc2951a9e86..af2642d3b69680 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ca68dc3285690ce0de5a23ce4d9d664310d1626", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "f7fb1deea8bfdc96c67528333b47b1ffc9c4ad60", "version": "6.3.1", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 8d09d6956cc6a4..1a45c803714540 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34380b3429538f411c5742822674328365697ef3", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "4a11055fa2395cf5885d2f064ae5bead129cd815", "version": "6.3.1", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index bee56b92a832bc..906c6f8ac9e7f6 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fbd6f4e78576ea2a3bf3389d36a400ebf8fff1f", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "dd49b655ecb0526706a5aaa81ffdaa05ef74c031", "version": "6.3.1", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index cf9b00bae73b14..76ee45f852d1e4 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8618a325913a4e94ea4d9ae25aae993211a049a3", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "bbcba20baf4e7189691d19cea523b0c23b837749", "version": "6.3.1", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 940fcfc67b6521..24dac10b566bf6 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "530a2818778c7e6a7a89aa960f725d024983f85a", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "9f8c92c126be424363d4de120e17dae54ada0b6b", "version": "6.3.1", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index bc8f1936f433b3..38cd9fde56d346 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec3282a08fee4cdadb156aa5389d33d39d507ebc", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "a44c1faf17e5e071b28369731c24b766656a8a8e", "version": "6.3.1", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index a04496c299bfb6..5b600397421d36 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5294e25b8339515231c57b5e4bf7b429a6d21e1", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "da354bd4fff935834b6b2b68e7956f9087b5f64d", "version": "6.3.1", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index cc217d648a615e..7af7dc26e6d99c 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e93248b1057ff1e417b25871fe37775a3714f25", + "version": "6.3.2", + "port-version": 0 + }, { "git-tree": "66528f9f10385e04a300e217aa15aa8fd8a82677", "version": "6.3.1", From 46798970f06b38f255953864e3a5a5e2045b7e66 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Thu, 15 Sep 2022 22:31:18 +0300 Subject: [PATCH 594/791] [sail] Update to 0.9.0-rc1 (#26781) * [sail] Update to 0.9.0-rc1 * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Added quotes * [sail] vcpkg x-add-version --all --overwrite-version --- ports/sail/portfile.cmake | 8 ++++---- ports/sail/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 8d7c5868947c07..57ae5197624723 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-pre21 - SHA512 51c23792d18b28520d04d7a097a6d46521d12107919ff76a7ff270a518beb862e4a1df89f3effb945ff908c39336bd60c5f118d6db80baf50005c05f55d2d96f + REF v0.9.0-rc1 + SHA512 c9b04bdf92600c0b1d38e00b31ec28f841b76fa41c50524199665de3e97a74b2633b8e9dc4bce1820521245b9d3bf04788eb1b5de9e3516e421927205d09ac47 HEAD_REF master ) @@ -21,8 +21,8 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove duplicate files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") # Move cmake configs vcpkg_cmake_config_fixup(PACKAGE_NAME sail CONFIG_PATH lib/cmake/sail DO_NOT_DELETE_PARENT_CONFIG_PATH) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index fade1e92431195..ec9d7ba0c6fbe0 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0-pre21", + "version-semver": "0.9.0-rc1", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 032ab660016de7..821c6ffbe43925 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6537,7 +6537,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre21", + "baseline": "0.9.0-rc1", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index 7ee6592bacb6e8..1ed673596d7843 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a3beda67ffe57e68f882d59f7f5c33bf726f2c8", + "version-semver": "0.9.0-rc1", + "port-version": 0 + }, { "git-tree": "5604acc45bd6e7fc2123a52f3742ffa674a0c2f7", "version-semver": "0.9.0-pre21", From e19fc496c7affc318ea4b6316cb0b237df7bd648 Mon Sep 17 00:00:00 2001 From: Nursultan Zarlyk Date: Thu, 15 Sep 2022 21:33:44 +0200 Subject: [PATCH 595/791] [Dlib] Enable arm64-windows (#26778) * Add arm64-windows support * Update port version * Update dlib version * Add dlib:arm64-windows in ci.baseline Co-authored-by: Nursultan Zarlyk --- ports/dlib/portfile.cmake | 5 +++++ ports/dlib/vcpkg.json | 2 +- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/d-/dlib.json | 5 +++++ 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 2b8d56d31e1d94..fa093539f161ab 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -20,10 +20,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "cuda" DLIB_USE_CUDA ) +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(COMMON_OPTIONS -DUSE_SSE2_INSTRUCTIONS=OFF) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + ${COMMON_OPTIONS} -DDLIB_PNG_SUPPORT=ON -DCMAKE_REQUIRE_FIND_PACKAGE_PNG=ON -DDLIB_JPEG_SUPPORT=ON diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json index bcfa9c0c9413f8..752f77a6b67bac 100644 --- a/ports/dlib/vcpkg.json +++ b/ports/dlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dlib", "version": "19.24", - "port-version": 1, + "port-version": 2, "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", "homepage": "https://github.com/davisking/dlib", "license": "BSL-1.0", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9863c38cdf35ce..c4070c83ca9f18 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -200,7 +200,6 @@ discord-rpc:x64-uwp=fail # requires g++11 discordcoreapi:x64-linux=fail dlib:arm-uwp=fail -dlib:arm64-windows=fail dlib:x64-uwp=fail dmlc:arm-uwp=fail dmlc:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 821c6ffbe43925..70aba4e1466f47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1970,7 +1970,7 @@ }, "dlib": { "baseline": "19.24", - "port-version": 1 + "port-version": 2 }, "dmlc": { "baseline": "2019-08-12", diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index 78f7d41e1ebbd6..3ab172ef7be184 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eaa35254408c210c84c3bfebb8e8651bab075e0", + "version": "19.24", + "port-version": 2 + }, { "git-tree": "975dbde01f120a124488aae7930005b4b0409e58", "version": "19.24", From 793fd2bff185c0d2140a9fdcac62ad3a03b63248 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 15 Sep 2022 21:44:27 +0200 Subject: [PATCH 596/791] [libspatialite] Fix host dependency (#26741) * Fix host dependency * Update versions Co-authored-by: JackBoosY --- ports/libspatialite/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/l-/libspatialite.json | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 27c8a1b49e3d7c..94a60977860d44 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libspatialite", "version": "5.0.1", - "port-version": 7, + "port-version": 8, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", "license": null, @@ -17,7 +17,10 @@ "rtree" ] }, - "vcpkg-pkgconfig-get-modules", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + }, "zlib" ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 70aba4e1466f47..5d71f3dbe8f583 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4150,7 +4150,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 7 + "port-version": 8 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 2a93500efa87c8..f236c9c9ee114d 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f13da82a42aca5aa182c22cf8d582cc9019e91fc", + "version": "5.0.1", + "port-version": 8 + }, { "git-tree": "e92008bb08f680c156f894b77774f76b5ff89f21", "version": "5.0.1", From 3bc4cc846bc34b2470c902414730ffc3a0d21dc1 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Thu, 15 Sep 2022 22:01:04 +0200 Subject: [PATCH 597/791] [openfbx] Add port (#26678) * [openfbx] Add port * Set cxx standard to 11 to fix osx build * version * [openfbx] add unofficial namespace * [openfbx] fixes for unofficial-openfbx * [openfbx] more renaming * [openfbx] fix after unofficial renaming * [openfbx] Make it static only as it doesn't export any symbols Co-authored-by: JackBoosY --- ports/openfbx/CMakeLists.txt | 48 +++++++++++++++++++ ports/openfbx/portfile.cmake | 25 ++++++++++ .../openfbx/unofficial-openfbxConfig.cmake.in | 8 ++++ ports/openfbx/vcpkg.json | 18 +++++++ versions/baseline.json | 4 ++ versions/o-/openfbx.json | 9 ++++ 6 files changed, 112 insertions(+) create mode 100644 ports/openfbx/CMakeLists.txt create mode 100644 ports/openfbx/portfile.cmake create mode 100644 ports/openfbx/unofficial-openfbxConfig.cmake.in create mode 100644 ports/openfbx/vcpkg.json create mode 100644 versions/o-/openfbx.json diff --git a/ports/openfbx/CMakeLists.txt b/ports/openfbx/CMakeLists.txt new file mode 100644 index 00000000000000..820b4442c2b799 --- /dev/null +++ b/ports/openfbx/CMakeLists.txt @@ -0,0 +1,48 @@ +cmake_minimum_required(VERSION 3.11) + +project(OpenFBX LANGUAGES CXX) + +set(CMAKE_CXX_STANDARD 11) + +include(GNUInstallDirs) + +find_package(miniz REQUIRED) + +add_library(openfbx src/ofbx.cpp) +target_link_libraries(openfbx PRIVATE miniz::miniz) + +target_include_directories(openfbx + PUBLIC + $ + $) + +target_compile_definitions(openfbx PRIVATE _LARGEFILE64_SOURCE) + +install(TARGETS openfbx EXPORT unofficial-openfbxTargets + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include + INCLUDES DESTINATION include) + +include(CMakePackageConfigHelpers) +configure_package_config_file( + unofficial-openfbxConfig.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/unofficial-openfbxConfig.cmake" + INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-openfbx" +) + +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-openfbxConfig.cmake" + DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-openfbx" +) + +install(FILES ${CMAKE_SOURCE_DIR}/src/ofbx.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +) + +install( + EXPORT unofficial-openfbxTargets + NAMESPACE unoffical::openfbx:: + DESTINATION ${CMAKE_INSTALL_DATADIR}/unofficial-openfbx +) diff --git a/ports/openfbx/portfile.cmake b/ports/openfbx/portfile.cmake new file mode 100644 index 00000000000000..4e1e77b30c457d --- /dev/null +++ b/ports/openfbx/portfile.cmake @@ -0,0 +1,25 @@ +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nem0/OpenFBX + REF 6a788af3b19dd6921a64eb7e133a3fa131dfbbd5 + SHA512 c441e15ef0916e412af464c9f318a471cdbdc55225fe4282ff640243cd11dfcac6ff233ae8e60db63d1eaed1511d33ffa8d7ed37743c4580f8bde0724d7b6c47 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-openfbxConfig.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-openfbx) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openfbx/unofficial-openfbxConfig.cmake.in b/ports/openfbx/unofficial-openfbxConfig.cmake.in new file mode 100644 index 00000000000000..421787837f23e3 --- /dev/null +++ b/ports/openfbx/unofficial-openfbxConfig.cmake.in @@ -0,0 +1,8 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(miniz) + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-openfbxTargets.cmake") + +check_required_components(miniz) diff --git a/ports/openfbx/vcpkg.json b/ports/openfbx/vcpkg.json new file mode 100644 index 00000000000000..6c59df51871843 --- /dev/null +++ b/ports/openfbx/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "openfbx", + "version-date": "2022-07-18", + "description": "Lightweight open source FBX importer", + "homepage": "https://github.com/nem0/OpenFBX", + "license": "MIT", + "dependencies": [ + "miniz", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5d71f3dbe8f583..cc4df3513fb164 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5312,6 +5312,10 @@ "baseline": "2.5.8", "port-version": 1 }, + "openfbx": { + "baseline": "2022-07-18", + "port-version": 0 + }, "opengl": { "baseline": "2022-03-14", "port-version": 1 diff --git a/versions/o-/openfbx.json b/versions/o-/openfbx.json new file mode 100644 index 00000000000000..f7d6d395529574 --- /dev/null +++ b/versions/o-/openfbx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2ef566bee77c87c4efa26b8c9905e1fb26117f95", + "version-date": "2022-07-18", + "port-version": 0 + } + ] +} From a1737683a6f8ec5d8673890581c2a8c55838d411 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 15 Sep 2022 23:19:41 +0200 Subject: [PATCH 598/791] [issue template] Emphasise that console output isn't enough (#26569) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [issue template] Emphasise that console output isn't enough * comments before failure logs * Be even more specific * Remove s * Address CR * ⁉ * use new label Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- .../report-package-build-failure.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/.github/ISSUE_TEMPLATE/report-package-build-failure.md index 765f870c1d833b..5f0199cab1dc78 100644 --- a/.github/ISSUE_TEMPLATE/report-package-build-failure.md +++ b/.github/ISSUE_TEMPLATE/report-package-build-failure.md @@ -2,22 +2,32 @@ name: Report package build failure about: Let us know about build failures in ports. title: "[] build failure" -labels: port bug +labels: category:port-bug assignees: '' --- + + + **Host Environment** + - OS: [e.g. Windows/Linux etc...] - Compiler: revision **To Reproduce** + Steps to reproduce the behavior: + `./vcpkg install xxxx` **Failure logs** --Cut and paste the appropriate build messages from the console output. --Please attach any additional failure logs mentioned in the console output. + +- Cut and paste the appropriate build messages from the console output. +- Attach ***every failure log file*** mentioned in the console output. + + **Additional context** + Add any other context about the problem here, such as what you have already tried to resolve the issue. From 637698b9cf1f89b2b0a7c2856c709fb583ccb7b4 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 17 Sep 2022 02:43:06 +0800 Subject: [PATCH 599/791] Add opus support (#26785) --- ports/gstreamer/portfile.cmake | 7 +++++++ ports/gstreamer/vcpkg.json | 8 +++++++- versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 9e7a57aa0420db..0262270872693e 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -143,6 +143,12 @@ else() set(PLUGIN_BASE_X11 disabled) endif() +if ("opus" IN_LIST FEATURES) + set(PLUGIN_BASE_OPUS enabled) +else() + set(PLUGIN_BASE_OPUS disabled) +endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(LIBRARY_LINKAGE "shared") else() @@ -203,6 +209,7 @@ vcpkg_configure_meson( -Dgst-plugins-base:pango=disabled -Dgst-plugins-base:gl-graphene=${GL_GRAPHENE} -Dgst-plugins-base:x11=${PLUGIN_BASE_X11} + -Dgst-plugins-base:opus=${PLUGIN_BASE_OPUS} ${PLUGIN_BASE_WIN} # gst-plugins-good -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 27928755a8a2ad..b2ac7fb19f9014 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 7, + "port-version": 8, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", @@ -62,6 +62,12 @@ "graphene" ] }, + "opus": { + "description": "Opus de/encoding via libopus", + "dependencies": [ + "opus" + ] + }, "plugins-bad": { "description": "'Bad' GStreamer plugins and helper libraries", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cc4df3513fb164..13696f460a7910 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2762,7 +2762,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 7 + "port-version": 8 }, "gtest": { "baseline": "1.12.1", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index 41d9611d7896cd..fd6824af511d5c 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34e4471f1313a9d9ce220e461dde37a331c5bf47", + "version": "1.19.2", + "port-version": 8 + }, { "git-tree": "88e3063c417fe72ab1532ad99494b71c8037d8b5", "version": "1.19.2", From ff4bb46b1d8d651e01b44caac8b59706b5a480aa Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Sat, 17 Sep 2022 07:06:00 +1000 Subject: [PATCH 600/791] [cgltf] Update to 1.13. (#26805) * [cgltf] Update to 1.13. * [cgltf] Add license field. * Update version. --- ports/cgltf/portfile.cmake | 4 ++-- ports/cgltf/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/c-/cgltf.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake index 181e95d98bd93f..edd9d223643cc9 100644 --- a/ports/cgltf/portfile.cmake +++ b/ports/cgltf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/cgltf - REF v1.11 - SHA512 b3350d34670dac6756ea010bd030c4709f3a6c86d43b5099d10b505437422951e5db7f8e521ec9590a7aada535146614936ff990533d07084b1e50c216572943 + REF v1.13 + SHA512 b46d1f9db11b75a60eb0272e89834444cd5652fa1fa35c80ce8a78437ef1b3d9f871419cc39da2d0e021d594ffc3e3832362ec759df0a7857aa74e4639698435 HEAD_REF master ) diff --git a/ports/cgltf/vcpkg.json b/ports/cgltf/vcpkg.json index e787feea1ed13c..c61d0e0d76ed8f 100644 --- a/ports/cgltf/vcpkg.json +++ b/ports/cgltf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cgltf", - "version": "1.11", + "version": "1.13", "description": "Single-file glTF 2.0 loader and writer written in C99", - "homepage": "https://github.com/jkuhlmann/cgltf" + "homepage": "https://github.com/jkuhlmann/cgltf", + "license": "MIT" } diff --git a/versions/baseline.json b/versions/baseline.json index 13696f460a7910..2cab54843d3a1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1357,7 +1357,7 @@ "port-version": 0 }, "cgltf": { - "baseline": "1.11", + "baseline": "1.13", "port-version": 0 }, "cgns": { diff --git a/versions/c-/cgltf.json b/versions/c-/cgltf.json index 2e9f77ff64b52d..35f699a5e04b04 100644 --- a/versions/c-/cgltf.json +++ b/versions/c-/cgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2baab070728dce2d5193a80e1deb7c41caa041f1", + "version": "1.13", + "port-version": 0 + }, { "git-tree": "2b793ed9e4345b733ec3897b1fbed4e152b5fc4a", "version": "1.11", From 01b29f6d8212bc845da64773b18665d682f5ab66 Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 17 Sep 2022 05:06:30 +0800 Subject: [PATCH 601/791] Add bonding support (#26809) --- ports/libsrt/portfile.cmake | 3 ++- ports/libsrt/vcpkg.json | 5 ++++- versions/baseline.json | 2 +- versions/l-/libsrt.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index d7ea5a9e563b8f..d06f669d29e49b 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tool ENABLE_APPS + bonding ENABLE_BONDING ) vcpkg_cmake_configure( @@ -30,7 +31,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index e7c80c480105e9..d96d44844c65b1 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libsrt", "version": "1.5.0", - "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", "license": "MPL-2.0", @@ -18,6 +18,9 @@ } ], "features": { + "bonding": { + "description": "Enables the Connection Bonding feature" + }, "tool": { "description": "Builds libsrt executable" } diff --git a/versions/baseline.json b/versions/baseline.json index 2cab54843d3a1f..696224932a68ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4162,7 +4162,7 @@ }, "libsrt": { "baseline": "1.5.0", - "port-version": 1 + "port-version": 2 }, "libsrtp": { "baseline": "2.4.2", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index e2f20035824515..5dea9713067108 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00e56b5f80be0e6a959bf121d906edb2255c7764", + "version": "1.5.0", + "port-version": 2 + }, { "git-tree": "67081a32f9ebb0639c8cdf50daf0da4db33dfd37", "version": "1.5.0", From 24d96bcb84bbdd37f9fb8746f04affc6869059ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 19 Sep 2022 20:00:25 +0200 Subject: [PATCH 602/791] [implot] Update to 0.14 (#26852) * [implot] Update to 0.14 * [implot] Update version files --- ports/implot/portfile.cmake | 4 ++-- ports/implot/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/implot.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/implot/portfile.cmake b/ports/implot/portfile.cmake index 37d13429d4a746..f505a8024049da 100644 --- a/ports/implot/portfile.cmake +++ b/ports/implot/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO epezent/implot - REF v0.13 - SHA512 ed653a14f1174b1689c7b8e5761455644e41e75a3cdf5a76d96adf8e286893418660809c1c158fa405c1c48a82752ae9c3b8e1eb14bd0015081604cdb44d95f4 + REF v0.14 + SHA512 d33c83762ada55d4e188e975faf0c12d42cb3eb6b63904e6bce5b18d4184a2cdfc14e0b92286717ab86a1361dad7161e24402724f4eda2c0bce5658787d2dbe3 HEAD_REF master ) diff --git a/ports/implot/vcpkg.json b/ports/implot/vcpkg.json index 73df80238f86f7..4444ceef1869a9 100644 --- a/ports/implot/vcpkg.json +++ b/ports/implot/vcpkg.json @@ -1,6 +1,6 @@ { "name": "implot", - "version": "0.13", + "version": "0.14", "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 696224932a68ad..523f5a5e9f68cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3041,7 +3041,7 @@ "port-version": 0 }, "implot": { - "baseline": "0.13", + "baseline": "0.14", "port-version": 0 }, "indicators": { diff --git a/versions/i-/implot.json b/versions/i-/implot.json index 06745561704fcb..fb26db8024fe12 100644 --- a/versions/i-/implot.json +++ b/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba255028c68d4a1e37f4dc1a360b892f067f9c45", + "version": "0.14", + "port-version": 0 + }, { "git-tree": "6166fdfe50da875e98426577b0fd64e8c26c924c", "version": "0.13", From 11461d415a7f66dd9d9c9059f1d1821dd4a5b5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 19 Sep 2022 18:06:40 +0000 Subject: [PATCH 603/791] [vcpkg baseline][saucer] Re-fix configure error (#26820) * [sacuer] Re-fix configure error * version --- ports/saucer/fix-source-generation.patch | 6 +++--- ports/saucer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/saucer.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/saucer/fix-source-generation.patch b/ports/saucer/fix-source-generation.patch index d49566343dce0b..be1dcde909bbd2 100644 --- a/ports/saucer/fix-source-generation.patch +++ b/ports/saucer/fix-source-generation.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3800146..6200c78 100644 +index 3800146..61a9e60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE "include/saucer") @@ -7,7 +7,7 @@ index 3800146..6200c78 100644 string(TOLOWER ${saucer_backend} saucer_backed_lower) -configure_file("constants.hpp.in" "${CMAKE_CURRENT_SOURCE_DIR}/include/saucer/constants.hpp") -+configure_file("constants.hpp.in" "${CMAKE_CURRENT_BINARY}/include/saucer/constants.hpp") ++configure_file("constants.hpp.in" "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp") # -------------------------------------------------------------------------------------------------------- # Configure Library depending on options @@ -15,7 +15,7 @@ index 3800146..6200c78 100644 if (saucer_backend STREQUAL "Qt") target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.cpp" "src/window.qt5.cpp") target_sources(${PROJECT_NAME} PRIVATE "src/webview.qt5.impl.hpp" "src/window.qt5.impl.hpp") -+ target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_BINARY}/include/saucer/constants.hpp") ++ target_sources(${PROJECT_NAME} PRIVATE "${CMAKE_BINARY_DIR}/include/saucer/constants.hpp") find_package(Qt5 COMPONENTS Widgets WebEngineWidgets WebChannel REQUIRED) target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets Qt5::WebEngineWidgets Qt5::WebChannel) diff --git a/ports/saucer/vcpkg.json b/ports/saucer/vcpkg.json index 70b43975afcc63..a70da6bfa29ed2 100644 --- a/ports/saucer/vcpkg.json +++ b/ports/saucer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "saucer", "version": "1.0.1", - "port-version": 1, + "port-version": 2, "description": "Next-gen desktop apps with web-frontend in C++", "homepage": "https://saucer.github.io/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 523f5a5e9f68cc..00f72a3ae21190 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6558,7 +6558,7 @@ }, "saucer": { "baseline": "1.0.1", - "port-version": 1 + "port-version": 2 }, "sbp": { "baseline": "3.4.10", diff --git a/versions/s-/saucer.json b/versions/s-/saucer.json index 66519a7b46f1ff..4957071ec4e247 100644 --- a/versions/s-/saucer.json +++ b/versions/s-/saucer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce7e88eac61c5e370dbf6d5dc7ad56dbdded879d", + "version": "1.0.1", + "port-version": 2 + }, { "git-tree": "3738770dd615f4e229cc0bf1e6704d3c0e9e001a", "version": "1.0.1", From cf48528dfffa14f762e6ad169c5cd6209fe5f22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Ga=C3=9Fmann?= Date: Mon, 19 Sep 2022 20:35:37 +0200 Subject: [PATCH 604/791] [llfio,outcome,ned14-internal-quickcpplib] Fix minor nits (#26859) * [quickcpplib] Properly delimit path option * [outcome] Prevent buildsystem from enabling concepts pre cxx20 * [llfio] Update port to 2022-09-18 - Disable OpenSSL support until someone properly integrates it. * [llfio] Disable buildsystem compiler introspection The buildsystem tries to enable concepts and coroutines via non standard compiler flags on earlier C++ versions which is exactly the opposite of what our polyfill features warrant. * Add versions to database --- ports/llfio/portfile.cmake | 7 +++++-- ports/llfio/vcpkg.json | 2 +- ports/ned14-internal-quickcpplib/portfile.cmake | 2 +- ports/ned14-internal-quickcpplib/vcpkg.json | 1 + ports/outcome/portfile.cmake | 1 + ports/outcome/vcpkg.json | 1 + versions/baseline.json | 6 +++--- versions/l-/llfio.json | 5 +++++ versions/n-/ned14-internal-quickcpplib.json | 5 +++++ versions/o-/outcome.json | 5 +++++ 10 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index cf02917a7c4afe..3a64f69768af5e 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF ae7f9c5a92879285ad5100c89efc47ce1cb0031b - SHA512 aa8563e4e78e4355ae1041bd8d2984e33e8c8b7634a6eac029e4716dff564a9616ba1826504709f428f789103e8f4ab90447208e66583536ad692400e51eec60 + REF 6c8e3e10a2919b4da754d0f3db54b3c616e1dd56 + SHA512 9265d722a6d9e4a9a0605fc071c5053bd71188f6d5500cfa4e64ef9ee33be364d3a1289d011863b64a4f3bdfc3a54fa9bfc6ee69ff1a93995584605c58e79f62 HEAD_REF develop PATCHES ) @@ -60,8 +60,11 @@ vcpkg_cmake_configure( -DPROJECT_IS_DEPENDENCY=On -Dquickcpplib_DIR=${CURRENT_INSTALLED_DIR}/share/quickcpplib ${LLFIO_FEATURE_OPTIONS} + -DLLFIO_FORCE_OPENSSL_OFF=ON -DLLFIO_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DCXX_CONCEPTS_FLAGS= + -DCXX_COROUTINES_FLAGS= ${extra_config} ) diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 6b8a3d03eb4de3..d4e457786e0b89 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "llfio", - "version-date": "2022-09-08", + "version-date": "2022-09-18", "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index c002bd691e6afb..284afcc32abac7 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -69,7 +69,7 @@ vcpkg_cmake_configure( -DPROJECT_IS_DEPENDENCY=On -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - -DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib + "-DCMAKE_INSTALL_DATADIR=${CURRENT_PACKAGES_DIR}/share/ned14-internal-quickcpplib" ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_Doxygen diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index f59ccf008096aa..1ae3b4e2b4fb18 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ned14-internal-quickcpplib", "version-date": "2022-09-08", + "port-version": 1, "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index a33baaf52352b1..d6943416d11995 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -45,6 +45,7 @@ vcpkg_cmake_configure( -Dstatus-code_DIR=${CURRENT_INSTALLED_DIR}/share/status-code -DOUTCOME_ENABLE_DEPENDENCY_SMOKE_TEST=ON # Leave this always on to test everything compiles -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON + -DCXX_CONCEPTS_FLAGS= ) if("run-tests" IN_LIST FEATURES) diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 4c34cefe95b381..5ae09aacd740de 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,6 +1,7 @@ { "name": "outcome", "version": "2.2.4", + "port-version": 1, "maintainers": [ "Niall Douglas ", "Henrik Gaßmann " diff --git a/versions/baseline.json b/versions/baseline.json index 00f72a3ae21190..e44558aa5e8032 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4417,7 +4417,7 @@ "port-version": 0 }, "llfio": { - "baseline": "2022-09-08", + "baseline": "2022-09-18", "port-version": 0 }, "llgl": { @@ -4994,7 +4994,7 @@ }, "ned14-internal-quickcpplib": { "baseline": "2022-09-08", - "port-version": 0 + "port-version": 1 }, "neon2sse": { "baseline": "2021-09-16", @@ -5466,7 +5466,7 @@ }, "outcome": { "baseline": "2.2.4", - "port-version": 0 + "port-version": 1 }, "p-ranav-csv": { "baseline": "2019-07-11", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index 257225bdc16717..44ecb4107c242f 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75a5c6e3170c65d747e5103b292f5da55ec2aa0a", + "version-date": "2022-09-18", + "port-version": 0 + }, { "git-tree": "7974159a11b2a1a1f5aed7b6c500eae3fa54481f", "version-date": "2022-09-08", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index 8bc26ec4256681..fcf8c63a708208 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9c41d87d7d3dc77a9d7dfaddef8571574721f0d", + "version-date": "2022-09-08", + "port-version": 1 + }, { "git-tree": "89d5a8630a97d2e3a7cae1a56253de75014a0738", "version-date": "2022-09-08", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 1bc47fa4d3eac5..ed92afed941c3c 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "504177d3c3f3d1a063db2ce6d12292141e874d37", + "version": "2.2.4", + "port-version": 1 + }, { "git-tree": "9e3ec2f8aff33b12210dc924ff285b3cf23abb2a", "version": "2.2.4", From 744a9213480dac5df73afce494fb8b9c37dc9a03 Mon Sep 17 00:00:00 2001 From: Sylvain Doremus Date: Mon, 19 Sep 2022 19:39:08 +0100 Subject: [PATCH 605/791] [assimp] Update to version 5.2.5 (#26856) --- ports/assimp/4542.patch | 81 ---------------------------------- ports/assimp/build_fixes.patch | 75 +++++++++++-------------------- ports/assimp/portfile.cmake | 5 +-- ports/assimp/vcpkg.json | 2 +- versions/a-/assimp.json | 5 +++ versions/baseline.json | 2 +- 6 files changed, 35 insertions(+), 135 deletions(-) delete mode 100644 ports/assimp/4542.patch diff --git a/ports/assimp/4542.patch b/ports/assimp/4542.patch deleted file mode 100644 index 62ee6e3f71ff31..00000000000000 --- a/ports/assimp/4542.patch +++ /dev/null @@ -1,81 +0,0 @@ -From affa85a36bbd329c8792b553f64188c1d3a58188 Mon Sep 17 00:00:00 2001 -From: hgdagon -Date: Wed, 25 May 2022 07:59:01 -0700 -Subject: [PATCH 1/2] Fix GNUC check on Windows - ---- - code/Common/DefaultIOStream.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp -index 17fc44f9a2..bbc3b2080f 100644 ---- a/code/Common/DefaultIOStream.cpp -+++ b/code/Common/DefaultIOStream.cpp -@@ -63,7 +63,7 @@ inline int select_fseek(FILE *file, int64_t offset, int origin) { - - - --#if defined _WIN64 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) -+#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 - template <> - inline size_t select_ftell<8>(FILE *file) { - return (size_t)::_ftelli64(file); -@@ -74,7 +74,7 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) { - return ::_fseeki64(file, offset, origin); - } - --#endif // #if defined _WIN32 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) -+#endif // #if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 - - } // namespace - -@@ -149,7 +149,7 @@ size_t DefaultIOStream::FileSize() const { - // - // See here for details: - // https://www.securecoding.cert.org/confluence/display/seccode/FIO19-C.+Do+not+use+fseek()+and+ftell()+to+compute+the+size+of+a+regular+file --#if defined _WIN64 && (!defined __GNUC__ || __MSVCRT_VERSION__ >= 0x0601) -+#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 - struct __stat64 fileStat; - //using fileno + fstat avoids having to handle the filename - int err = _fstat64(_fileno(mFile), &fileStat); - -From efbcdccac99a66d513731a2f5af65211c734cfe7 Mon Sep 17 00:00:00 2001 -From: hgdagon -Date: Wed, 25 May 2022 09:18:42 -0700 -Subject: [PATCH 2/2] Fix GNUC check on Windows (2nd attempt) - ---- - code/Common/DefaultIOStream.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/code/Common/DefaultIOStream.cpp b/code/Common/DefaultIOStream.cpp -index bbc3b2080f..d5d5846897 100644 ---- a/code/Common/DefaultIOStream.cpp -+++ b/code/Common/DefaultIOStream.cpp -@@ -63,7 +63,7 @@ inline int select_fseek(FILE *file, int64_t offset, int origin) { - - - --#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 -+#if defined _WIN32 && (!defined __GNUC__ || !defined __CLANG__ && __MSVCRT_VERSION__ >= 0x0601) - template <> - inline size_t select_ftell<8>(FILE *file) { - return (size_t)::_ftelli64(file); -@@ -74,7 +74,7 @@ inline int select_fseek<8>(FILE *file, int64_t offset, int origin) { - return ::_fseeki64(file, offset, origin); - } - --#endif // #if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 -+#endif - - } // namespace - -@@ -149,7 +149,7 @@ size_t DefaultIOStream::FileSize() const { - // - // See here for details: - // https://www.securecoding.cert.org/confluence/display/seccode/FIO19-C.+Do+not+use+fseek()+and+ftell()+to+compute+the+size+of+a+regular+file --#if defined _WIN32 && !defined __GNUC__ && __MSVCRT_VERSION__ >= 0x0601 -+#if defined _WIN32 && (!defined __GNUC__ || !defined __CLANG__ && __MSVCRT_VERSION__ >= 0x0601) - struct __stat64 fileStat; - //using fileno + fstat avoids having to handle the filename - int err = _fstat64(_fileno(mFile), &fileStat); diff --git a/ports/assimp/build_fixes.patch b/ports/assimp/build_fixes.patch index 66a7d46f0aefd3..93d007cd8730c5 100644 --- a/ports/assimp/build_fixes.patch +++ b/ports/assimp/build_fixes.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2aa6642..e74f93c 100644 +index 458a328..b8c2fc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) ENDIF() --PROJECT(Assimp VERSION 5.2.0) -+PROJECT(Assimp VERSION 5.2.4) +-PROJECT(Assimp VERSION 5.2.4) ++PROJECT(Assimp VERSION 5.2.5) # All supported options ############################################### @@ -16,10 +16,10 @@ index 2aa6642..e74f93c 100644 # enable multi-core compilation with MSVC IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl - ADD_COMPILE_OPTIONS(/bigobj /W4 /WX ) -+ ADD_COMPILE_OPTIONS(/bigobj) ++ ADD_COMPILE_OPTIONS(/bigobj ) ELSE() # msvc - ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX) -+ ADD_COMPILE_OPTIONS(/MP /bigobj) ++ ADD_COMPILE_OPTIONS(/MP /bigobj ) ENDIF() # disable "elements of array '' will be default initialized" warning on MSVC2013 IF(MSVC12) @@ -29,13 +29,13 @@ index 2aa6642..e74f93c 100644 - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") - SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") -+ #SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") -+ #SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") -+ #SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") ++ # SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od") ++ # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") ++ # SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF") ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) IF(NOT ASSIMP_HUNTER_ENABLED) - SET(CMAKE_CXX_STANDARD 11) -@@ -414,7 +414,7 @@ ENDIF() + SET(CMAKE_CXX_STANDARD 17) +@@ -418,7 +418,7 @@ ENDIF() set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated") @@ -44,7 +44,7 @@ index 2aa6642..e74f93c 100644 set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}") set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-hunter-config.cmake.in") set(NAMESPACE "${PROJECT_NAME}::") -@@ -422,7 +422,7 @@ IF(ASSIMP_HUNTER_ENABLED) +@@ -426,7 +426,7 @@ IF(ASSIMP_HUNTER_ENABLED) set(VERSION_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}ConfigVersion.cmake") set(PROJECT_CONFIG "${GENERATED_DIR}/${PROJECT_NAME}Config.cmake") ELSE() @@ -53,7 +53,7 @@ index 2aa6642..e74f93c 100644 set(CMAKE_CONFIG_TEMPLATE_FILE "cmake-modules/assimp-plain-config.cmake.in") string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWERCASE) set(NAMESPACE "${PROJECT_NAME_LOWERCASE}::") -@@ -464,14 +464,14 @@ ENDIF() +@@ -468,14 +468,14 @@ ENDIF() # Search for external dependencies, and build them from source if not found # Search for zlib @@ -61,7 +61,7 @@ index 2aa6642..e74f93c 100644 - hunter_add_package(ZLIB) - find_package(ZLIB CONFIG REQUIRED) +IF(1) -+ #hunter_add_package(ZLIB) ++ # hunter_add_package(ZLIB) + find_package(ZLIB REQUIRED) add_definitions(-DASSIMP_BUILD_NO_OWN_ZLIB) @@ -73,7 +73,7 @@ index 2aa6642..e74f93c 100644 ELSE() # If the zlib is already found outside, add an export in case assimpTargets can't find it. IF( ZLIB_FOUND ) -@@ -512,12 +512,12 @@ ELSE() +@@ -516,12 +516,12 @@ ELSE() ENDIF() IF( NOT IOS ) @@ -468,19 +468,19 @@ index 5339454..45e07c0 100644 ENDIF () -diff --git a/code/Common/Assimp.cpp b/code/Common/Assimp.cpp -index 71e312c..fa7fc36 100644 ---- a/code/Common/Assimp.cpp -+++ b/code/Common/Assimp.cpp -@@ -1290,7 +1290,7 @@ ASSIMP_API void aiQuaternionInterpolate( - # endif +diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h +index 1265d25..18f4564 100644 +--- a/code/Common/StbCommon.h ++++ b/code/Common/StbCommon.h +@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #pragma GCC diagnostic ignored "-Wunused-function" + #endif - # define STB_IMAGE_IMPLEMENTATION --# include "stb/stb_image.h" -+# include +-#include "stb/stb_image.h" ++#include - # if _MSC_VER - # pragma warning(pop) + #if _MSC_VER + #pragma warning(pop) diff --git a/code/Common/BaseImporter.cpp b/code/Common/BaseImporter.cpp index 383300e..03fdd9a 100644 --- a/code/Common/BaseImporter.cpp @@ -495,7 +495,7 @@ index 383300e..03fdd9a 100644 // ------------------------------------------------------------------------------------------------ diff --git a/code/Common/ZipArchiveIOSystem.cpp b/code/Common/ZipArchiveIOSystem.cpp -index e0c9883..78b522a 100644 +index 3d5c72e..770cb9d 100644 --- a/code/Common/ZipArchiveIOSystem.cpp +++ b/code/Common/ZipArchiveIOSystem.cpp @@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -507,26 +507,3 @@ index e0c9883..78b522a 100644 #endif namespace Assimp { -@@ -196,7 +196,9 @@ zlib_filefunc_def IOSystem2Unzip::get(IOSystem *pIOHandler) { - zlib_filefunc_def mapping; - - mapping.zopen_file = (open_file_func)open; -+#ifdef ZOPENDISK64 - mapping.zopendisk_file = (opendisk_file_func)opendisk; -+#endif - mapping.zread_file = (read_file_func)read; - mapping.zwrite_file = (write_file_func)write; - mapping.ztell_file = (tell_file_func)tell; -diff --git a/code/Pbrt/PbrtExporter.cpp b/code/Pbrt/PbrtExporter.cpp -index 9590c49..e23b9b1 100644 ---- a/code/Pbrt/PbrtExporter.cpp -+++ b/code/Pbrt/PbrtExporter.cpp -@@ -83,7 +83,7 @@ Other: - #include - #include - --#include "stb/stb_image.h" -+#include - - using namespace Assimp; - diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index c3083bac4a5559..babb0153ece867 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO assimp/assimp - REF v5.2.4 - SHA512 ee988b1806b46c78f97bb5b25237a3f56a7028ed37898fb9b243e379e29e8bfd29e4dffc616566941ed9bdcf502bd30568904ad2ef2ef7d0f63b40daefdc66bf + REF v5.2.5 + SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb HEAD_REF master PATCHES build_fixes.patch - 4542.patch # https://github.com/assimp/assimp/pull/4542 ) file(REMOVE "${SOURCE_PATH}/cmake-modules/FindZLIB.cmake") diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json index 0bffddb843334d..95a8179be3db88 100644 --- a/ports/assimp/vcpkg.json +++ b/ports/assimp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "assimp", - "version": "5.2.4", + "version": "5.2.5", "description": "The Open Asset import library", "homepage": "https://github.com/assimp/assimp", "license": "BSD-3-Clause", diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index 012a0e0c253f5c..a150b0743acfd1 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdd963b2ef327bf5e8533689aff4707226e22851", + "version": "5.2.5", + "port-version": 0 + }, { "git-tree": "28eaf490bb2eaaf52c344b8e8dc16d4619cb863e", "version": "5.2.4", diff --git a/versions/baseline.json b/versions/baseline.json index e44558aa5e8032..baf903f59dd36b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -209,7 +209,7 @@ "port-version": 1 }, "assimp": { - "baseline": "5.2.4", + "baseline": "5.2.5", "port-version": 0 }, "asynch": { From b67ce11650cedd681b9706b39fdd6db264f1bcea Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 19 Sep 2022 20:40:16 +0200 Subject: [PATCH 606/791] liburing: Disable tests and examples (#26837) --- ports/liburing/disable-tests-and-examples.patch | 13 +++++++++++++ ports/liburing/portfile.cmake | 1 + ports/liburing/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/liburing.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/liburing/disable-tests-and-examples.patch diff --git a/ports/liburing/disable-tests-and-examples.patch b/ports/liburing/disable-tests-and-examples.patch new file mode 100644 index 00000000000000..7faef951af755e --- /dev/null +++ b/ports/liburing/disable-tests-and-examples.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 686be4f..28d0a7f 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,8 +8,6 @@ default: all + + all: + @$(MAKE) -C src +- @$(MAKE) -C test +- @$(MAKE) -C examples + + .PHONY: all install default clean test + .PHONY: FORCE cscope diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake index 47de0016d99629..3d36e55c453093 100644 --- a/ports/liburing/portfile.cmake +++ b/ports/liburing/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED + disable-tests-and-examples.patch ) # note: check ${SOURCE_PATH}/liburing.spec before updating configure options diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json index 14150dddf9aba5..e0f882ac353f15 100644 --- a/ports/liburing/vcpkg.json +++ b/ports/liburing/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liburing", "version": "2.2", + "port-version": 1, "description": "Linux-native io_uring I/O access library", "homepage": "https://github.com/axboe/liburing", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index baf903f59dd36b..d6e6357e02b1dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4250,7 +4250,7 @@ }, "liburing": { "baseline": "2.2", - "port-version": 0 + "port-version": 1 }, "libusb": { "baseline": "1.0.26", diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json index 4d3091b4f8a46c..175bdc541242ca 100644 --- a/versions/l-/liburing.json +++ b/versions/l-/liburing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e41ee56c7ceb8925a59b8d427a63990f581c0328", + "version": "2.2", + "port-version": 1 + }, { "git-tree": "8d783b3db24821bcd85fcdbb5673b03613653e01", "version": "2.2", From b7574b17ed082f813ae578099f8136800cdb5e8d Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 19 Sep 2022 11:44:31 -0700 Subject: [PATCH 607/791] [Azure Storage] Update to Sept hotfix Release (#26819) * [azure-storage-blobs-cpp] Update to 12.6.1 ## 12.6.1 (2022-09-16) ### Other changes - No public changes in this release. * update version database Co-authored-by: Jinming Hu --- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 2 +- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 5f8d7e26ff3ea7..0b374f79e5c924 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/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.6.0 - SHA512 cd8164410472587df2ca112abdb89d9e3baa730f1f3166979f669322b1f79a6111bd673061f58de44a6b1231dce55651baa72a869f42302ccb1360fabaaade04 + REF azure-storage-blobs_12.6.1 + SHA512 160ec230c300f568f8abbaa08ac6f95cd29a8abbaf67474ea1de70c20db974efed3bd600284c3151457ccc762c58452839c4520d6c1c74c548300a414d405801 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 6d375116dbe492..ae37d635b5b60a 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.6.0", + "version-semver": "12.6.1", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 6c37064d8b6433..ba2990934f293f 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06433ca908b304e85f642fc3b062db522567bd7c", + "version-semver": "12.6.1", + "port-version": 0 + }, { "git-tree": "c715b7df779d48070ba729fd20ffcad27267a7bc", "version-semver": "12.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index d6e6357e02b1dd..a6af8decf38f88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -373,7 +373,7 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.6.0", + "baseline": "12.6.1", "port-version": 0 }, "azure-storage-common-cpp": { From bded093da1285b9145d23653e4bdb7f76e9ceae9 Mon Sep 17 00:00:00 2001 From: Li Wu Date: Tue, 20 Sep 2022 02:45:39 +0800 Subject: [PATCH 608/791] upgrade roaring to 0.7.1 (#26802) Co-authored-by: Li Wu --- ports/roaring/portfile.cmake | 11 +++++------ ports/roaring/vcpkg.json | 17 ++++++++++++++--- versions/baseline.json | 4 ++-- versions/r-/roaring.json | 5 +++++ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake index 820e6f5db4e5da..e058a246be3dbb 100644 --- a/ports/roaring/portfile.cmake +++ b/ports/roaring/portfile.cmake @@ -5,27 +5,26 @@ endif () vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RoaringBitmap/CRoaring - REF ac3eaf56af8691374b63e53e842feff0322169f0 - SHA512 db10331559df1503bcd25f7f5cab1fdf6b29984634dbfd54289cd7750032a1dd25cd0b57b490cac3d0d3fd5bc785730617536a7162c6e59f66fadb77f972b1c4 + REF v0.7.1 + SHA512 1d49da4e5b5ed0726feaf3608488e24f13c31358d1a72c7d0086fb6210313f73164745e0d1b616e8930073bbe259f7e1ac09fc97473b659694248f627c762f02 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ROARING_BUILD_STATIC) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DROARING_BUILD_STATIC=${ROARING_BUILD_STATIC} -DENABLE_ROARING_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/roaring/vcpkg.json b/ports/roaring/vcpkg.json index 598893916ee047..dfbe9bed30c346 100644 --- a/ports/roaring/vcpkg.json +++ b/ports/roaring/vcpkg.json @@ -1,6 +1,17 @@ { "name": "roaring", - "version-string": "2019-03-05", - "port-version": 3, - "description": "A better compressed bitset in C (and C++)" + "version": "0.7.1", + "description": "A better compressed bitset in C (and C++)", + "homepage": "https://github.com/RoaringBitmap/CRoaring", + "license": "Apache-2.0 OR MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a6af8decf38f88..708b40ef94ede5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6441,8 +6441,8 @@ "port-version": 0 }, "roaring": { - "baseline": "2019-03-05", - "port-version": 3 + "baseline": "0.7.1", + "port-version": 0 }, "robin-hood-hashing": { "baseline": "3.11.5", diff --git a/versions/r-/roaring.json b/versions/r-/roaring.json index 4ec4c761658d62..469d922ab27bd8 100644 --- a/versions/r-/roaring.json +++ b/versions/r-/roaring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53f447b8e40bdaef2d1e693942505f95357e7279", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "bd4d38440852b0d89e5bb4f1248f4090dcca5b8e", "version-string": "2019-03-05", From 056a7303b07b0f29fb9666d04dbd2cdf3a6c8324 Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Mon, 19 Sep 2022 21:01:46 +0200 Subject: [PATCH 609/791] [alpaka] Add new port, version 0.9.0 (#26812) Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/alpaka/portfile.cmake | 21 +++++++++++++++++++++ ports/alpaka/usage | 4 ++++ ports/alpaka/vcpkg.json | 25 +++++++++++++++++++++++++ versions/a-/alpaka.json | 9 +++++++++ versions/baseline.json | 4 ++++ 5 files changed, 63 insertions(+) create mode 100644 ports/alpaka/portfile.cmake create mode 100644 ports/alpaka/usage create mode 100644 ports/alpaka/vcpkg.json create mode 100644 versions/a-/alpaka.json diff --git a/ports/alpaka/portfile.cmake b/ports/alpaka/portfile.cmake new file mode 100644 index 00000000000000..e513ba4843dd8d --- /dev/null +++ b/ports/alpaka/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alpaka-group/alpaka + REF 0.9.0 + SHA512 c079c0101a1e1c0d244c074e19fcefa6c15751fbb6be072c6f245e515dece8700a40fd101b2b0ba5f9760f4545bf23e1917ea9804accbe16a45039f8b0ed8a01 + HEAD_REF develop +) +set(VCPKG_BUILD_TYPE release) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/alpaka") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/alpaka/usage b/ports/alpaka/usage new file mode 100644 index 00000000000000..dff3ff38094f9a --- /dev/null +++ b/ports/alpaka/usage @@ -0,0 +1,4 @@ +alpaka provides CMake targets: + + find_package(alpaka CONFIG REQUIRED) + target_link_libraries(main PRIVATE alpaka::alpaka) diff --git a/ports/alpaka/vcpkg.json b/ports/alpaka/vcpkg.json new file mode 100644 index 00000000000000..3747247bf63f5e --- /dev/null +++ b/ports/alpaka/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "alpaka", + "version": "0.9.0", + "description": "The alpaka library is a header-only abstraction library for accelerator development", + "homepage": "https://github.com/alpaka-group/alpaka", + "license": "MPL-2.0", + "dependencies": [ + { + "name": "boost-core", + "version>=": "1.74" + }, + { + "name": "boost-predef", + "version>=": "1.74" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/alpaka.json b/versions/a-/alpaka.json new file mode 100644 index 00000000000000..c78787d928a99b --- /dev/null +++ b/versions/a-/alpaka.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fa2a5d53283561fed784514fd0063badc589eb39", + "version": "0.9.0", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 708b40ef94ede5..af11ec0ab43bc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -72,6 +72,10 @@ "baseline": "0.2.0", "port-version": 0 }, + "alpaka": { + "baseline": "0.9.0", + "port-version": 0 + }, "alsa": { "baseline": "1.2.6.1", "port-version": 0 From 1f3914c7698237cc8d4e0146df5c9f5ceaa9f821 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 19 Sep 2022 21:08:27 +0200 Subject: [PATCH 610/791] [xwindow] part 4/N (#26576) * [font-util] add port * [libfontenc] add port * [libfs] add port * format manifest * remove -string * v db * Update ports/font-util/build.patch * v db * use magic macro instead of magic numbers.... * v db --- ports/font-util/build.patch | 33 +++++++++++++++++ ports/font-util/portfile.cmake | 56 +++++++++++++++++++++++++++++ ports/font-util/vcpkg.json | 10 ++++++ ports/libfontenc/build.patch | 38 ++++++++++++++++++++ ports/libfontenc/configure.ac.patch | 13 +++++++ ports/libfontenc/portfile.cmake | 32 +++++++++++++++++ ports/libfontenc/vcpkg.json | 13 +++++++ ports/libfs/portfile.cmake | 30 ++++++++++++++++ ports/libfs/vcpkg.json | 14 ++++++++ versions/baseline.json | 12 +++++++ versions/f-/font-util.json | 9 +++++ versions/l-/libfontenc.json | 9 +++++ versions/l-/libfs.json | 9 +++++ 13 files changed, 278 insertions(+) create mode 100644 ports/font-util/build.patch create mode 100644 ports/font-util/portfile.cmake create mode 100644 ports/font-util/vcpkg.json create mode 100644 ports/libfontenc/build.patch create mode 100644 ports/libfontenc/configure.ac.patch create mode 100644 ports/libfontenc/portfile.cmake create mode 100644 ports/libfontenc/vcpkg.json create mode 100644 ports/libfs/portfile.cmake create mode 100644 ports/libfs/vcpkg.json create mode 100644 versions/f-/font-util.json create mode 100644 versions/l-/libfontenc.json create mode 100644 versions/l-/libfs.json diff --git a/ports/font-util/build.patch b/ports/font-util/build.patch new file mode 100644 index 00000000000000..72fa5fa6567eee --- /dev/null +++ b/ports/font-util/build.patch @@ -0,0 +1,33 @@ +diff --git a/bdftruncate.c b/bdftruncate.c +index 2b317c0b0..3ab84978f 100644 +--- a/bdftruncate.c ++++ b/bdftruncate.c +@@ -40,7 +40,13 @@ + #include + #include + #include +- ++#if defined(_MSC_VER) ++# if defined(_M_X64) || defined(_M_ARM64) ++# define SSIZE_MAX LLONG_MAX ++# else ++# define SSIZE_MAX LONG_MAX ++# endif ++#endif + #if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \ + || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) + # define ATTR_NORETURN __attribute((noreturn)) +diff --git a/ucs2any.c b/ucs2any.c +index 1f575d14f..75b662b3d 100644 +--- a/ucs2any.c ++++ b/ucs2any.c +@@ -49,7 +49,9 @@ + #include + #include + #include ++#ifdef HAVE_UNISTD_H + #include ++#endif + + /* global variable for argv[0] */ + static const char *my_name = NULL; diff --git a/ports/font-util/portfile.cmake b/ports/font-util/portfile.cmake new file mode 100644 index 00000000000000..026c224c770722 --- /dev/null +++ b/ports/font-util/portfile.cmake @@ -0,0 +1,56 @@ +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO font/util + REF d45011b8324fecebb4fc79e57491d341dd96e325 #1.3.2 + SHA512 d783cbb5b8b0975891a247f98b78c2afadfd33e1d26ee8bcf7ab7ccc11615b0150d07345c719182b0929afc3c54dc3288a01a789b5374e18aff883ac23d15b04 + HEAD_REF master + PATCHES build.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND VCPKG_C_FLAGS " /DNEED_BASENAME") + list(APPEND VCPKG_CXX_FLAGS " /DNEED_BASENAME") +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/xorg/") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/aclocal/" "${CURRENT_PACKAGES_DIR}/share/xorg/aclocal") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/fonts/" "${CURRENT_PACKAGES_DIR}/share/xorg/fonts") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/debug") + +set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/fontutil.pc") +file(READ "${_file}" _contents) +string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/share/xorg" _contents "${_contents}") +string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontutil.pc") +file(READ "${_file}" _contents) +string(REPLACE "datarootdir=\${prefix}/share/${PORT}" "datarootdir=\${prefix}/../share/xorg" _contents "${_contents}") +string(REPLACE "exec_prefix=\${prefix}" "exec_prefix=\${prefix}/../tools/${PORT}" _contents "${_contents}") +file(WRITE "${_file}" "${_contents}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +endif() \ No newline at end of file diff --git a/ports/font-util/vcpkg.json b/ports/font-util/vcpkg.json new file mode 100644 index 00000000000000..d04e3eb55546bc --- /dev/null +++ b/ports/font-util/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "font-util", + "version": "1.3.2", + "description": "X.Org font package creation/installation utilities", + "homepage": "https://gitlab.freedesktop.org/xorg/font/util", + "license": null, + "dependencies": [ + "xorg-macros" + ] +} diff --git a/ports/libfontenc/build.patch b/ports/libfontenc/build.patch new file mode 100644 index 00000000000000..c5e1b75011f396 --- /dev/null +++ b/ports/libfontenc/build.patch @@ -0,0 +1,38 @@ +diff --git a/src/encparse.c b/src/encparse.c +index 548110ede..61952b9ce 100644 +--- a/src/encparse.c ++++ b/src/encparse.c +@@ -28,12 +28,16 @@ THE SOFTWARE. + to be pure ASCII. Bloody ``Code Set Independence''. */ + + #include ++#ifndef _MSC_VER + #include ++#else ++#define strcasecmp _stricmp ++#endif + #include + + #include + +-#include "zlib.h" ++#include + typedef gzFile FontFilePtr; + + #define FontFileGetc(f) gzgetc(f) +diff --git a/src/fontenc.c b/src/fontenc.c +index c4ccd5eb0..e87d1089d 100644 +--- a/src/fontenc.c ++++ b/src/fontenc.c +@@ -23,7 +23,11 @@ THE SOFTWARE. + /* Backend-independent encoding code */ + + #include ++#ifndef _MSC_VER + #include ++#else ++#define strcasecmp _stricmp ++#endif + #include + + #define FALSE 0 diff --git a/ports/libfontenc/configure.ac.patch b/ports/libfontenc/configure.ac.patch new file mode 100644 index 00000000000000..2a9fa85a86eb52 --- /dev/null +++ b/ports/libfontenc/configure.ac.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index cadc653a0..aa645af81 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,7 +47,7 @@ XORG_FONTSUBDIR([ENCODINGSDIR], [encodingsdir], [encodings]) + # zlib + AC_CHECK_HEADER([zlib.h], [], + AC_MSG_FAILURE([zlib.h is required to compile libfontenc])) +-AC_CHECK_LIB(z, gzclose, [], ++AC_SEARCH_LIBS(gzclose, [z zlib zlibd], [], + AC_MSG_FAILURE([zlib is required to compile libfontenc])) + + # Obtain compiler/linker options for depedencies diff --git a/ports/libfontenc/portfile.cmake b/ports/libfontenc/portfile.cmake new file mode 100644 index 00000000000000..9b29d4893d7619 --- /dev/null +++ b/ports/libfontenc/portfile.cmake @@ -0,0 +1,32 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libfontenc + REF 2baea13978759d1a011fc6d739465893b554d30a #1.1.4 + SHA512 5ebef8b516a2377b004894b53d56ad960bc5179d9f9a36e18bc2228ea04e8f87e9baffd4883c21783dd1f4c57d7f521cdfa42c1e9facae60c6fc2c9f5472230e + HEAD_REF master + PATCHES configure.ac.patch + build.patch +) +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}/") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) +endif() diff --git a/ports/libfontenc/vcpkg.json b/ports/libfontenc/vcpkg.json new file mode 100644 index 00000000000000..c34079afeaed59 --- /dev/null +++ b/ports/libfontenc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libfontenc", + "version": "1.1.4", + "description": "X font encoding library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libfontenc", + "license": null, + "dependencies": [ + "font-util", + "xorg-macros", + "xproto", + "zlib" + ] +} diff --git a/ports/libfs/portfile.cmake b/ports/libfs/portfile.cmake new file mode 100644 index 00000000000000..75b3c6db41baa4 --- /dev/null +++ b/ports/libfs/portfile.cmake @@ -0,0 +1,30 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libfs + REF 02de7390e58f00a3701f656a2b205dc6c8dafb58 # 1.0.8 + SHA512 7395434c20cebc45213122c12dc272773d100ade606d6fb2cacf94e2d102c9869124a89dbd0ddf2fa9128e8b238cf2f52b89d356b296e8d95ff352be48a4bc54 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libfs/vcpkg.json b/ports/libfs/vcpkg.json new file mode 100644 index 00000000000000..8cbaa03cc30fa9 --- /dev/null +++ b/ports/libfs/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libfs", + "version": "1.0.8", + "description": "X Font Service client library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libfs", + "license": null, + "supports": "!windows", + "dependencies": [ + "bzip2", + "xorg-macros", + "xproto", + "xtrans" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index af11ec0ab43bc4..00faf28f67c155 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2372,6 +2372,10 @@ "baseline": "1.1.0", "port-version": 0 }, + "font-util": { + "baseline": "1.3.2", + "port-version": 0 + }, "fontconfig": { "baseline": "2.14.0", "port-version": 4 @@ -3672,6 +3676,10 @@ "baseline": "1.3.4", "port-version": 1 }, + "libfontenc": { + "baseline": "1.1.4", + "port-version": 0 + }, "libfort": { "baseline": "0.4.2", "port-version": 1 @@ -3680,6 +3688,10 @@ "baseline": "0.2.0", "port-version": 9 }, + "libfs": { + "baseline": "1.0.8", + "port-version": 0 + }, "libftdi": { "baseline": "0.20", "port-version": 3 diff --git a/versions/f-/font-util.json b/versions/f-/font-util.json new file mode 100644 index 00000000000000..645967e70854ee --- /dev/null +++ b/versions/f-/font-util.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "752c6b7df7c1181d4c27b64da1c20c03137ed3c6", + "version": "1.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libfontenc.json b/versions/l-/libfontenc.json new file mode 100644 index 00000000000000..a1bd50d67bf146 --- /dev/null +++ b/versions/l-/libfontenc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4201b994bdcfcf20458025d0fcfffe1f97d444dc", + "version": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libfs.json b/versions/l-/libfs.json new file mode 100644 index 00000000000000..38c37181676406 --- /dev/null +++ b/versions/l-/libfs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "48390af67d3ade78652e3b646864aa96b7cde8c0", + "version": "1.0.8", + "port-version": 0 + } + ] +} From 63bbbfab928683763b1b98922d13a2709d6822d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horv=C3=A1t?= Date: Mon, 19 Sep 2022 21:20:02 +0200 Subject: [PATCH 611/791] [igraph] update to 0.10 (#26432) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [igraph] update to 0.10 * [igraph] x-add-version * [igraph] disable on arm64 windows due to lack of support for _umul128() * [igraph] x-add-version * [igraph] fix typo * [igraph] x-add-version * [igraph] update to 0.10.1 * [igraph] x-add-version * Update versions/i-/igraph.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [igraph] remove special treatment of uwp from portfile * [igraph] indicate that failure is expected for x64-uwp * [igraph] x-add-version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/igraph/portfile.cmake | 7 +++---- ports/igraph/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 1 + versions/baseline.json | 2 +- versions/i-/igraph.json | 5 +++++ 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 53341feaca2246..7125372ec05f3c 100644 --- a/ports/igraph/portfile.cmake +++ b/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.10/igraph-0.9.10.tar.gz" - FILENAME "igraph-0.9.10.tar.gz" - SHA512 e5306b4e546ce5e7854cb87d6e2c0b4250976ccdfdd3c81e8834a92432f6e3771215ceb7da74ce460c7bdbc191c3bbadd775de7b0d80e7daef3802741be81fb3 + URLS "https://github.com/igraph/igraph/releases/download/0.10.1/igraph-0.10.1.tar.gz" + FILENAME "igraph-0.10.1.tar.gz" + SHA512 5761543be8c44b9d43bbad5e4bc595be2cb518a4a74b0c7c5ace49d4868bb567e44ee882554dc3cfb7b2835881c1c70689f241cd5937039d353e2a7d521a364a ) vcpkg_extract_source_archive_ex( @@ -40,7 +40,6 @@ vcpkg_cmake_configure( -DIGRAPH_ENABLE_LTO=AUTO # ARPACK not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_ARPACK=ON - -DIGRAPH_USE_INTERNAL_CXSPARSE=OFF # GLPK is not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_GLPK=ON # Currently, external GMP provides no performance or functionality benefits. diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 26b1e46dc4a787..dbc1b7e89679e4 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,13 +1,12 @@ { "name": "igraph", - "version": "0.9.10", + "version": "0.10.1", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", "dependencies": [ "blas", "lapack", - "suitesparse", { "name": "vcpkg-cmake", "host": true diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c4070c83ca9f18..c4f36f301477d5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -364,6 +364,7 @@ ignition-msgs5:arm64-windows=fail ignition-msgs5:arm-uwp=fail ignition-msgs5:x64-uwp=fail ignition-msgs5:x64-osx=skip +igraph:x64-uwp=fail # Conflicts with libjpeg-turbo, mozjpeg ijg-libjpeg:arm64-windows = skip ijg-libjpeg:arm-uwp = skip diff --git a/versions/baseline.json b/versions/baseline.json index 00faf28f67c155..699dcdb191e71f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3013,7 +3013,7 @@ "port-version": 4 }, "igraph": { - "baseline": "0.9.10", + "baseline": "0.10.1", "port-version": 0 }, "iir1": { diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index 4489b103fde159..f92ff60173b4b0 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2edea91149fdcafafff97f6b08988f440c4ef54", + "version": "0.10.1", + "port-version": 0 + }, { "git-tree": "9be9a85091b6cb99b14f88bfcbc205e175ead0f6", "version": "0.9.10", From 2b35366a5d0d31eb05ec49b49148b8c3f0877fb3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 19 Sep 2022 21:30:40 +0200 Subject: [PATCH 612/791] [hpx] add some features, fix some bugs (#25059) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refine hpx port * v db * add tcmalloc on unix * refine comment * v db * remove hardcoded mpi dep * v db * portfile cleanup * v db * add pkgconf as a dep * v db * [snappy] remove debug suffix and add pc file * hpx pass through _HOST_TRIPLET for pkgconf * v db * fix snappy in ffmpeg * v db * fix name clash of output names * v db * remove tcmalloc * v db * remove bin dir; seems empty on !windows * v db * b v * v db * baseline stuff * fix jemalloc missing msvc_compat headers * v db * install usage for hpx * v db * Update versions/f-/ffmpeg.json * revert v db * bump ffmpeg * v db * remove jemalloc since I can force it thorugh the triplet any way. * v db Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/ffmpeg/0004-fix-debug-build.patch | 2 +- ports/ffmpeg/vcpkg.json | 2 +- ports/hpx/fix-debug.patch | 21 +++++++ ports/hpx/fix-export.patch | 24 ++++++++ ports/hpx/fix_output_name_clash.patch | 13 +++++ ports/hpx/format.patch | 12 ++++ ports/hpx/portfile.cmake | 74 +++++++++++++------------ ports/hpx/usage | 4 ++ ports/hpx/vcpkg.json | 45 ++++++++++++++- ports/jemalloc/portfile.cmake | 2 + ports/jemalloc/vcpkg.json | 1 + ports/snappy/portfile.cmake | 16 +++++- ports/snappy/snappy.pc.in | 10 ++++ ports/snappy/vcpkg.json | 3 +- versions/baseline.json | 8 +-- versions/f-/ffmpeg.json | 5 ++ versions/h-/hpx.json | 5 ++ versions/j-/jemalloc.json | 5 ++ versions/s-/snappy.json | 5 ++ 19 files changed, 213 insertions(+), 44 deletions(-) create mode 100644 ports/hpx/fix-debug.patch create mode 100644 ports/hpx/fix-export.patch create mode 100644 ports/hpx/fix_output_name_clash.patch create mode 100644 ports/hpx/format.patch create mode 100644 ports/hpx/usage create mode 100644 ports/snappy/snappy.pc.in diff --git a/ports/ffmpeg/0004-fix-debug-build.patch b/ports/ffmpeg/0004-fix-debug-build.patch index 513dc966bab960..6f921960ac6df8 100644 --- a/ports/ffmpeg/0004-fix-debug-build.patch +++ b/ports/ffmpeg/0004-fix-debug-build.patch @@ -31,7 +31,7 @@ index bd2de34..fba948a 100755 require libsmbclient libsmbclient.h smbc_init -lsmbclient; } -enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ +if enabled debug_configure; then -+ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappyd -lstdc++ ++ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ +else + enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++ +fi diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 183285411c4863..a464fa5b047005 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 17, + "port-version": 18, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/ports/hpx/fix-debug.patch b/ports/hpx/fix-debug.patch new file mode 100644 index 00000000000000..a77b518be2aa65 --- /dev/null +++ b/ports/hpx/fix-debug.patch @@ -0,0 +1,21 @@ +diff --git a/cmake/HPX_CompilerFlagsTargets.cmake b/cmake/HPX_CompilerFlagsTargets.cmake +index 5bf4649..0912503 100644 +--- a/cmake/HPX_CompilerFlagsTargets.cmake ++++ b/cmake/HPX_CompilerFlagsTargets.cmake +@@ -15,14 +15,8 @@ target_compile_features(hpx_public_flags INTERFACE cxx_std_${HPX_CXX_STANDARD}) + + # Set other flags that should always be set + +-# HPX_DEBUG must be set without a generator expression as it determines ABI +-# compatibility. Projects in Release mode using HPX in Debug mode must have +-# HPX_DEBUG set, and projects in Debug mode using HPX in Release mode must not +-# have HPX_DEBUG set. HPX_DEBUG must also not be set by projects using HPX. +-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") +- target_compile_definitions(hpx_private_flags INTERFACE HPX_DEBUG) +- target_compile_definitions(hpx_public_flags INTERFACE HPX_DEBUG) +-endif() ++target_compile_definitions(hpx_private_flags INTERFACE $<$:HPX_DEBUG>) ++target_compile_definitions(hpx_public_flags INTERFACE $<$:HPX_DEBUG>) + + target_compile_definitions( + hpx_private_flags diff --git a/ports/hpx/fix-export.patch b/ports/hpx/fix-export.patch new file mode 100644 index 00000000000000..c9c2bbf4cbd333 --- /dev/null +++ b/ports/hpx/fix-export.patch @@ -0,0 +1,24 @@ +diff --git a/cmake/HPX_GeneratePackageUtils.cmake b/cmake/HPX_GeneratePackageUtils.cmake +index 3ec8002..b098465 100644 +--- a/cmake/HPX_AddModule.cmake ++++ b/cmake/HPX_AddModule.cmake +@@ -437,7 +437,7 @@ function(add_hpx_module libname modulename) + elseif(MSVC) + set(_module_target hpx_${modulename}) + target_link_libraries( +- hpx_${libname} PRIVATE -WHOLEARCHIVE:$ ++ hpx_${libname} PRIVATE -WHOLEARCHIVE:$> + ) + endif() + target_link_libraries(hpx_${libname} PRIVATE ${_module_target}) +--- a/cmake/HPX_GeneratePackageUtils.cmake ++++ b/cmake/HPX_GeneratePackageUtils.cmake +@@ -101,7 +101,7 @@ function( + ) + set(_libraries + ${_libraries} +- $>$> ++ $>>$> + ) + endif() + elseif("${dep_target}" MATCHES "^-l") diff --git a/ports/hpx/fix_output_name_clash.patch b/ports/hpx/fix_output_name_clash.patch new file mode 100644 index 00000000000000..a031b1fa6806a8 --- /dev/null +++ b/ports/hpx/fix_output_name_clash.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake +index 129a87ced..b45feb3f5 100644 +--- a/cmake/HPX_AddComponent.cmake ++++ b/cmake/HPX_AddComponent.cmake +@@ -303,7 +303,7 @@ function(add_hpx_component name) + hpx_setup_target( + ${name}_component + TYPE COMPONENT +- NAME ${name} ++ NAME ${name}_component + FOLDER ${${name}_FOLDER} + COMPILE_FLAGS ${${name}_COMPILE_FLAGS} + LINK_FLAGS ${${name}_LINK_FLAGS} diff --git a/ports/hpx/format.patch b/ports/hpx/format.patch new file mode 100644 index 00000000000000..f3a5003cef73fc --- /dev/null +++ b/ports/hpx/format.patch @@ -0,0 +1,12 @@ +diff --git a/components/iostreams/include/hpx/components/iostreams/ostream.hpp b/components/iostreams/include/hpx/components/iostreams/ostream.hpp +index 423f4728d00..dda4b059796 100644 +--- a/components/iostreams/include/hpx/components/iostreams/ostream.hpp ++++ b/components/iostreams/include/hpx/components/iostreams/ostream.hpp +@@ -398,6 +398,6 @@ namespace hpx { namespace util { + hpx::iostreams::ostream& os, std::string const& format_str, + Args const&... args) + { +- return os << format(format_str, args...); ++ return os << hpx::util::format(format_str, args...); + } + }} // namespace hpx::util diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 37b18138672976..00d351d31f0f15 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -1,4 +1,7 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HPX_WITH_STATIC_LINKING) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -8,16 +11,28 @@ vcpkg_from_github( HEAD_REF stable PATCHES fix-dependency-hwloc.patch + format.patch + fix-export.patch + fix-debug.patch + fix_output_name_clash.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "zlib" HPX_WITH_COMPRESSION_ZLIB + "snappy" HPX_WITH_COMPRESSION_SNAPPY + "bzip2" HPX_WITH_COMPRESSION_BZIP2 + "cuda" HPX_WITH_CUDA + "mpi" HPX_WITH_PARCELPORT_MPI + "mpi" HPX_WITH_PARCELPORT_MPI_MULTITHREADED ) -set(HPX_WITH_MALLOC system) -if(VCPKG_TARGET_IS_LINUX) - # This is done at the request of the hpx maintainers; see - # https://github.com/microsoft/vcpkg/pull/21673#issuecomment-979904882 - # It must match when gperftools is treated as a dependency of this port. - set(HPX_WITH_MALLOC tcmalloc) +if(NOT VCPKG_TARGET_ARCHITECTURE MATCHES "(x64|x86)") + list(APPEND FEATURE_OPTIONS "-DHPX_WITH_GENERIC_CONTEXT_COROUTINES=ON") endif() +file(REMOVE "${SOURCE_PATH}/cmake/FindBZip2.cmake") # Outdated vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -28,9 +43,15 @@ vcpkg_cmake_configure( -DHPX_WITH_TOOLS=OFF -DHPX_WITH_RUNTIME=OFF -DHPX_USE_CMAKE_CXX_STANDARD=ON - "-DHPX_WITH_MALLOC=${HPX_WITH_MALLOC}" + ${FEATURE_OPTIONS} + -DHPX_WITH_PKGCONFIG=OFF + -DHPX_WITH_STATIC_LINKING=${HPX_WITH_STATIC_LINKING} + -DHPX_WITH_PARCELPORT_TCP=ON + -DHPX_WITH_THREAD_TARGET_ADDRESS=ON + -DHPX_WITH_CHECK_MODULE_DEPENDENCIES=ON + -DHPX_WITH_THREAD_IDLE_RATES=ON + -DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET} ) - vcpkg_cmake_install() # post build cleanup @@ -64,30 +85,6 @@ file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE ${DLLS}) -endif() - -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/hpx") - file(REMOVE ${DLLS}) -endif() - -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE ${DLLS}) -endif() - -file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll") -if(DLLS) - file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/hpx") - file(REMOVE ${DLLS}) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") @@ -96,4 +93,13 @@ vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") -vcpkg_copy_pdbs() +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx") + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) diff --git a/ports/hpx/usage b/ports/hpx/usage new file mode 100644 index 00000000000000..cf471d0596c7d9 --- /dev/null +++ b/ports/hpx/usage @@ -0,0 +1,4 @@ +The port hpx provides CMake targets: + + find_package(HPX REQUIRED) + target_link_libraries(main PRIVATE HPX::hpx) diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index 3c49969c1cdbff..ba47e04b643a5d 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hpx", "version": "1.8.0", + "port-version": 1, "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." @@ -28,6 +29,10 @@ "platform": "linux" }, "hwloc", + { + "name": "pkgconf", + "host": true + }, { "name": "vcpkg-cmake", "host": true @@ -36,5 +41,43 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "bzip2", + "mpi", + "snappy", + "zlib" + ], + "features": { + "bzip2": { + "description": "Build with bzip2 compression", + "dependencies": [ + "bzip2" + ] + }, + "cuda": { + "description": "Build with CUDA support", + "dependencies": [ + "cuda" + ] + }, + "mpi": { + "description": "Build with MPI parcelport", + "dependencies": [ + "mpi" + ] + }, + "snappy": { + "description": "Build with snappy compression", + "dependencies": [ + "snappy" + ] + }, + "zlib": { + "description": "Build with zlib compression", + "dependencies": [ + "zlib" + ] + } + } } diff --git a/ports/jemalloc/portfile.cmake b/ports/jemalloc/portfile.cmake index 81c01ab9e4c7e0..36f0834e1dc3aa 100644 --- a/ports/jemalloc/portfile.cmake +++ b/ports/jemalloc/portfile.cmake @@ -22,6 +22,8 @@ vcpkg_configure_make( vcpkg_install_make() if(VCPKG_TARGET_IS_WINDOWS) + file(COPY "${SOURCE_PATH}/include/msvc_compat/strings.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/jemalloc/msvc_compat") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/jemalloc/jemalloc.h" "" "\"msvc_compat/strings.h\"") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib/jemalloc.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") diff --git a/ports/jemalloc/vcpkg.json b/ports/jemalloc/vcpkg.json index dccb6d1734e6e4..007e05b931c989 100644 --- a/ports/jemalloc/vcpkg.json +++ b/ports/jemalloc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jemalloc", "version": "5.3.0", + "port-version": 1, "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support", "homepage": "https://jemalloc.net/", "license": "BSD-2-Clause" diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake index 6660b86efd4627..df95a08db898ec 100644 --- a/ports/snappy/portfile.cmake +++ b/ports/snappy/portfile.cmake @@ -1,7 +1,10 @@ +file(READ "${CURRENT_PORT_DIR}/vcpkg.json" manifest) +string(JSON version GET "${manifest}" version) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/snappy - REF 1.1.9 + REF ${version} SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 HEAD_REF master PATCHES @@ -13,12 +16,21 @@ vcpkg_cmake_configure( OPTIONS -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF - -DCMAKE_DEBUG_POSTFIX=d ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Snappy) vcpkg_copy_pdbs() +string(JSON version GET "${manifest}" version) +string(JSON description GET "${manifest}" description) +set(name "${PORT}") + +configure_file("${CURRENT_PORT_DIR}/${PORT}.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY) +if(NOT VCPKG_BUILD_TYPE) + configure_file("${CURRENT_PORT_DIR}/${PORT}.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) +endif() + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/snappy/snappy.pc.in b/ports/snappy/snappy.pc.in new file mode 100644 index 00000000000000..055f14bdee3608 --- /dev/null +++ b/ports/snappy/snappy.pc.in @@ -0,0 +1,10 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: @name@ +Description: @description@ +Version: @version@ +Libs: -L${libdir} -l@libname@ +Cflags: -I${includedir} \ No newline at end of file diff --git a/ports/snappy/vcpkg.json b/ports/snappy/vcpkg.json index ecc8a2aea534e6..05178f3eb97c38 100644 --- a/ports/snappy/vcpkg.json +++ b/ports/snappy/vcpkg.json @@ -1,9 +1,10 @@ { "name": "snappy", "version": "1.1.9", - "port-version": 2, + "port-version": 3, "description": "A fast compressor/decompressor.", "homepage": "https://github.com/google/snappy", + "license": null, "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 699dcdb191e71f..969da39bbb387a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2282,7 +2282,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 17 + "port-version": 18 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -2898,7 +2898,7 @@ }, "hpx": { "baseline": "1.8.0", - "port-version": 0 + "port-version": 1 }, "http-parser": { "baseline": "2.9.4", @@ -3146,7 +3146,7 @@ }, "jemalloc": { "baseline": "5.3.0", - "port-version": 0 + "port-version": 1 }, "jinja2cpplight": { "baseline": "2018-05-08", @@ -6818,7 +6818,7 @@ }, "snappy": { "baseline": "1.1.9", - "port-version": 2 + "port-version": 3 }, "sndfile": { "baseline": "0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0e438c990b1f18..24b4de633c4c3f 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65fe58cd3c36c19b6ad4b104b9ff57c506009e9a", + "version": "4.4.1", + "port-version": 18 + }, { "git-tree": "197609d70edc506c0257721d873b1eb3b93ba4b8", "version": "4.4.1", diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 3d312e3cf8aed9..1bdd4bc4647c3d 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aaf58e8627662fd841d011ea7e71d23507573772", + "version": "1.8.0", + "port-version": 1 + }, { "git-tree": "2bd151915f73223a06d9470f38f56d253392a484", "version": "1.8.0", diff --git a/versions/j-/jemalloc.json b/versions/j-/jemalloc.json index 028888496829fa..447406220f96f0 100644 --- a/versions/j-/jemalloc.json +++ b/versions/j-/jemalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96ec9736a357ac7af9b108bcc8e9d237cfb18a43", + "version": "5.3.0", + "port-version": 1 + }, { "git-tree": "6baf5d3d5e323c49a4f91a2e67f778421af4a4c5", "version": "5.3.0", diff --git a/versions/s-/snappy.json b/versions/s-/snappy.json index 0ee914f721abba..cd35443c668dde 100644 --- a/versions/s-/snappy.json +++ b/versions/s-/snappy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00bd59377f162448da6b19382a7ca392b1761f22", + "version": "1.1.9", + "port-version": 3 + }, { "git-tree": "7122115f0f35f7f90f7a7adc1d15a4b6f7af5315", "version": "1.1.9", From 290865e4a1dd679547223773bb8bdc73bb3e7b1e Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 19 Sep 2022 21:38:10 +0200 Subject: [PATCH 613/791] Bump spix version to 0.4 (#26555) * Bump spix version to 0.4 * Add new port spix-qt6 * Add feature qt5 and qt6 to spix * Back to qt5 --- ports/spix/portfile.cmake | 8 ++++---- ports/spix/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spix.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/spix/portfile.cmake b/ports/spix/portfile.cmake index 91512aa78b4e52..3a14dd08518e75 100644 --- a/ports/spix/portfile.cmake +++ b/ports/spix/portfile.cmake @@ -1,18 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO faaxm/spix - REF v0.3 - SHA512 be5695e1e061583645a711c91f218c2038ed66896932d9f32129242d20d0a451a032d53aee2fdb917f1423de96ebcba97887421636a13260a7e7c228a13666c0 + REF v0.4 + SHA512 4686199f851b4f06abf963ea79d3d2094d7bd956f009b3fe244dfbcfa7e0756d9971cb882c9963d479b44194806f3d0eaef68ac90b3468bf4ba9139948a9cd7b + HEAD_REF master ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSPIX_BUILD_EXAMPLES=OFF -DSPIX_BUILD_TESTS=OFF + -DSPIX_QT_MAJOR=5 ) vcpkg_cmake_install() diff --git a/ports/spix/vcpkg.json b/ports/spix/vcpkg.json index e2e1e5c48de4c9..7184dfe7416b4c 100644 --- a/ports/spix/vcpkg.json +++ b/ports/spix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "spix", - "version": "0.3", + "version": "0.4", "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.", "homepage": "https://github.com/faaxm/spix", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 969da39bbb387a..1f7c75677c50db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6965,7 +6965,7 @@ "port-version": 0 }, "spix": { - "baseline": "0.3", + "baseline": "0.4", "port-version": 0 }, "sprout": { diff --git a/versions/s-/spix.json b/versions/s-/spix.json index a3ab08a1332bf9..926c75f685373c 100644 --- a/versions/s-/spix.json +++ b/versions/s-/spix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d26875159ee21430be1cff1f64ebe8dacdcbf7b", + "version": "0.4", + "port-version": 0 + }, { "git-tree": "703bc0f66a7cb23368f4230a35451356b92e5c75", "version": "0.3", From 2464990fbb45df8488bb52525f17f07424b86873 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 19 Sep 2022 21:41:57 +0200 Subject: [PATCH 614/791] [openal-soft] fix mingw x86 build (#26816) --- ports/openal-soft/0001-fix-mingw-x86-build.patch | 13 +++++++++++++ ports/openal-soft/portfile.cmake | 4 ++++ ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/openal-soft/0001-fix-mingw-x86-build.patch diff --git a/ports/openal-soft/0001-fix-mingw-x86-build.patch b/ports/openal-soft/0001-fix-mingw-x86-build.patch new file mode 100644 index 00000000000000..a63002a4e2663a --- /dev/null +++ b/ports/openal-soft/0001-fix-mingw-x86-build.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1984ac9..0d1690a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -472,7 +472,7 @@ if(CMAKE_SIZEOF_VOID_P MATCHES "4" AND HAVE_SSE2) + # assumes the stack is suitably aligned. Older Linux code or other + # OSs don't guarantee this on 32-bit, so externally-callable + # functions need to ensure an aligned stack. +- set(EXPORT_DECL "${EXPORT_DECL} __attribute__((force_align_arg_pointer))") ++ set(EXPORT_DECL "${EXPORT_DECL}__attribute__((force_align_arg_pointer))") + endif() + endif() + endif() diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index fa6fb6e3f34ad6..43218d0fdd3535 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF dc83d99c95a42c960150ddeee06c124134b52208 # openal-soft-1.22.2 SHA512 3fbbdfbb2609ef8187d20ce74b2fb8082037288f3fd80df71d360705d8efdadfe8f62811af1cd824cb6572c8c3479b370f8ae3819b8b8bb0b20c34f7a73cc530 HEAD_REF master + PATCHES + 0001-fix-mingw-x86-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -75,6 +77,8 @@ vcpkg_cmake_configure( ALSOFT_CONFIG ALSOFT_CPUEXT_NEON ALSOFT_HRTF_DEFS + ALSOFT_BACKEND_WINMM + ALSOFT_BACKEND_DSOUND CMAKE_DISABLE_FIND_PACKAGE_WindowsSDK ) diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index b6a1a169a71e27..43aac0e8d093a2 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.22.2", - "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", "license": "GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 1f7c75677c50db..37380ee4c5553d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5266,7 +5266,7 @@ }, "openal-soft": { "baseline": "1.22.2", - "port-version": 3 + "port-version": 4 }, "openblas": { "baseline": "0.3.21", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index fcc1028c6056e8..41556162e7d822 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f028dc8de3d983f0844c0b586c1b6ddfad5d899", + "version-semver": "1.22.2", + "port-version": 4 + }, { "git-tree": "a0e8008cd2061bcaeaf0ed725438edae4386aac1", "version-semver": "1.22.2", From ebcdc25e4364226ce3fe9ef083a21ed060ab4aa7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 19 Sep 2022 13:38:42 -0700 Subject: [PATCH 615/791] Add espidf smoke test. (#26798) --- .../internal/vcpkg_tool_release_process.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/maintainers/internal/vcpkg_tool_release_process.md b/docs/maintainers/internal/vcpkg_tool_release_process.md index fed09f577ee11c..01e4f37920274f 100644 --- a/docs/maintainers/internal/vcpkg_tool_release_process.md +++ b/docs/maintainers/internal/vcpkg_tool_release_process.md @@ -27,16 +27,27 @@ such as https://github.com/microsoft/vcpkg/pull/23757 the "auto generate release notes" button. Manually remove any entries created by the automated localization tools which will start with `* LEGO: Pull request from juno/`. 9. Publish that draft release as "pre-release". -10. Smoke test the 'one liner' installer: (Where 2022-06-15 is replaced with the right release name) +10. Clean up a machine for the following tests: + * Delete `VCPKG_DOWNLOADS/artifacts` (which forces artifacts to be reacquired) + * Delete `LOCALAPPDATA/vcpkg` (which forces registries to be reacquired) +11. Smoke test the 'one liner' installer: (Where 2022-06-15 is replaced with the right release name) * Powershell: `iex (iwr https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1)` * Batch: `curl -L -o vcpkg-init.cmd https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init.ps1 && .\vcpkg-init.cmd` * Bash: `. <(curl https://github.com/microsoft/vcpkg-tool/releases/download/2022-06-15/vcpkg-init -L)` -11. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1` +12. Test that embedded scenarios work for vcpkg-artifacts: + Ensure that none of the following report errors: + 1. git clone https://github.com/some-example/blink/ + 2. cd blink + 3. vcpkg activate + 4. idf.py set-target ESP32 + 5. cd build + 6. ninja +13. In the vcpkg repo, draft a PR which updates `bootstrap-vcpkg.sh` and `boostrap-vcpkg.ps1` with the new release date, and update SHAs as appropriate in the .sh script. (For example, see https://github.com/microsoft/vcpkg/pull/23757) -12. Merge the tool update PR. -13. Change the github release in vcpkg-tool from "prerelease" to "release". (This automatically +15. Merge the tool update PR. +16. Change the github release in vcpkg-tool from "prerelease" to "release". (This automatically updates the aka.ms links) From 4340582bc30f3e539bd4f52e26418f7d62145956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 19 Sep 2022 23:00:14 +0200 Subject: [PATCH 616/791] [vcpkg_acquire_msys] add 'which' package to default set on Windows (#26618) * [vcpkg_acquire_msys] add 'which' package * [vcpkg_configure_make] add 'which' to default msys packages on Windows Co-authored-by: JackBoosY --- scripts/cmake/vcpkg_acquire_msys.cmake | 4 ++++ scripts/cmake/vcpkg_configure_make.cmake | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index b27d552665729b..98effb4f9ef326 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -346,6 +346,10 @@ function(vcpkg_acquire_msys out_msys_root) URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.2.0-8-x86_64.pkg.tar.zst" SHA512 fdd86f4ffa6e274d6fef1676a4987971b1f2e1ec556eee947adcb4240dc562180afc4914c2bdecba284012967d3d3cf4d1a392f798a3b32a3668d6678a86e8d3 ) + z_vcpkg_acquire_msys_declare_package( + URL "https://repo.msys2.org/msys/x86_64/which-2.21-4-x86_64.pkg.tar.zst" + SHA512 5323fd6635093adf67c24889f469e1ca8ac969188c7f087244a43b3afa0bf8f14579bd87d9d7beb16a7cd61a5ca1108515a46b331868b4817b35cebcb4eba1d1 + ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-numpy-1.20.3-1-any.pkg.tar.zst" diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 5ff0ab1ae3d650..c5d64a082934ad 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -208,7 +208,7 @@ function(vcpkg_configure_make) # Pre-processing windows configure requirements if (VCPKG_TARGET_IS_WINDOWS) if(CMAKE_HOST_WIN32) - list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4) + list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4 which) vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) endif() if (arg_DETERMINE_BUILD_TRIPLET OR NOT arg_BUILD_TRIPLET) From 4e07dd99b8d1fd82e13898223e1d5387fd6d4236 Mon Sep 17 00:00:00 2001 From: Anders Wind Date: Tue, 20 Sep 2022 20:09:35 +0200 Subject: [PATCH 617/791] [stronk] Add new port (#26740) * [stronk] Initial port * Review fixes * Fixed added builtin-baseline which is not neccesary for registry * fix include wrong directroy * update version * delete patch * update version * Add quotes * update version * Use vcpkg_from_github Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/stronk/portfile.cmake | 21 +++++++++++++++++++ ports/stronk/vcpkg.json | 41 +++++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/stronk.json | 9 ++++++++ 4 files changed, 75 insertions(+) create mode 100644 ports/stronk/portfile.cmake create mode 100644 ports/stronk/vcpkg.json create mode 100644 versions/s-/stronk.json diff --git a/ports/stronk/portfile.cmake b/ports/stronk/portfile.cmake new file mode 100644 index 00000000000000..6bc759eb47e0f5 --- /dev/null +++ b/ports/stronk/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO twig-energy/stronk + REF f298bca3102b48ada516b0b42f2d5e6899cbbc44 + HEAD_REF main + SHA512 889c7a58082ab506f0c3b8b11e2f7d70f0b9a9ed67322310b43f070b79b71c3c115d1942319e7b461da80a0708c750503705d437d8228c54d7fa8f6e4626ad43 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/stronk/vcpkg.json b/ports/stronk/vcpkg.json new file mode 100644 index 00000000000000..b8f102b6dffe63 --- /dev/null +++ b/ports/stronk/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "stronk", + "version-semver": "0.2.0", + "description": "An easy to customize, strong type library with built in support for unit-like behavior", + "homepage": "https://github.com/twig-energy/stronk", + "license": "MIT", + "dependencies": [ + { + "name": "boost-type-index", + "version>=": "1.78.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "abseil": { + "description": "Dependencies for abseil extension", + "dependencies": [ + { + "name": "abseil", + "version>=": "20211102.1" + } + ] + }, + "fmt": { + "description": "Dependencies for fmt extension", + "dependencies": [ + { + "name": "fmt", + "version>=": "9.0.0" + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 37380ee4c5553d..cf06b605b822f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7068,6 +7068,10 @@ "baseline": "1.6.0", "port-version": 0 }, + "stronk": { + "baseline": "0.2.0", + "port-version": 0 + }, "strtk": { "baseline": "2020-09-14", "port-version": 1 diff --git a/versions/s-/stronk.json b/versions/s-/stronk.json new file mode 100644 index 00000000000000..c2b72f7a70d597 --- /dev/null +++ b/versions/s-/stronk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e4a44d9b4174532927a658b7762122b06ad2f663", + "version-semver": "0.2.0", + "port-version": 0 + } + ] +} From 63879cfda12eb03b84c3bcbd4105fa314bbb9795 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 20 Sep 2022 20:37:29 +0200 Subject: [PATCH 618/791] [lerc] Update to 4.0.0 (#26882) * Update to 4.0.0 * Update versions --- ports/lerc/create_package.patch | 5 ++++- ports/lerc/portfile.cmake | 9 +++++++-- ports/lerc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lerc.json | 5 +++++ 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/lerc/create_package.patch b/ports/lerc/create_package.patch index 166c3f43bc030b..559c44439c975a 100644 --- a/ports/lerc/create_package.patch +++ b/ports/lerc/create_package.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index e90fcdd..17c79e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -26,9 +26,16 @@ add_library(LercLib ${SOURCES}) +@@ -26,12 +26,19 @@ add_library(LercLib ${SOURCES}) endif() install( @@ -19,3 +19,6 @@ index e90fcdd..17c79e8 100644 + NAMESPACE unofficial::Lerc:: + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-lerc" +) + + # Configure and install pkgconfig file + configure_file(Lerc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Lerc.pc @ONLY) diff --git a/ports/lerc/portfile.cmake b/ports/lerc/portfile.cmake index 2b92c7022d40d4..fed6e9a085ac31 100644 --- a/ports/lerc/portfile.cmake +++ b/ports/lerc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Esri/lerc - REF v3.0 - SHA512 8e04d890c4d46528641b354ec3f47f2b0563e1740927ac894925a30f7de2b235cb3517ce7e477886bd3eb50ebd6c6e78f22d73d5500877e552d9e684e626293b + REF v4.0.0 + SHA512 36fe453b6e732f6bed554d1c1c5cd4668aec63593d6de11f12b659c7b9cbc059ac9aaacc6cea483b3257d522f1b07e13c299914d08b1f8aeb0bb2cde42ba47cf HEAD_REF master PATCHES "create_package.patch" @@ -13,6 +13,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-lerc) +vcpkg_fixup_pkgconfig() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Lerc_c_api.h" "defined(LERC_STATIC)" "1") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/lerc/vcpkg.json b/ports/lerc/vcpkg.json index 22939ae2f99f00..f04fd98442a765 100644 --- a/ports/lerc/vcpkg.json +++ b/ports/lerc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "lerc", - "version": "3.0", + "version": "4.0", "description": "An open-source image or raster format which supports rapid encoding and decoding for any pixel type", "homepage": "https://github.com/Esri/lerc", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index cf06b605b822f2..4987bf43db6248 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3481,7 +3481,7 @@ "port-version": 0 }, "lerc": { - "baseline": "3.0", + "baseline": "4.0", "port-version": 0 }, "lest": { diff --git a/versions/l-/lerc.json b/versions/l-/lerc.json index a65b52371a1514..4887f12befbaab 100644 --- a/versions/l-/lerc.json +++ b/versions/l-/lerc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fce90d3d96f4afb8ffcf1b2e7484ee75aa78ed2", + "version": "4.0", + "port-version": 0 + }, { "git-tree": "3037b9fd610059bc84e89607a3e58aa13641cdd8", "version": "3.0", From 207fbcb55cef3544f3314ef783d169419f251b3f Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 20 Sep 2022 20:37:48 +0200 Subject: [PATCH 619/791] [taskflow] Update to 3.4.0 (#26879) --- ports/taskflow/portfile.cmake | 4 ++-- ports/taskflow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/taskflow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/taskflow/portfile.cmake b/ports/taskflow/portfile.cmake index 87c60ac15ed7db..675132df1defb0 100644 --- a/ports/taskflow/portfile.cmake +++ b/ports/taskflow/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF bfad4b9a0cc5acad5fc99fb6ff6b904b79f27f93 #v3.3.0 - SHA512 489807c84438a727832e9d530c9b2948240bebee48f210ce4a8c69917cbb71306df378440621b1bf091e4aa62c86681d71afd38a3343c8ea872a4eefcabc496e + REF v3.4.0 + SHA512 e0e3589feec65677c4de6583a70c14f90826f2177636010955c597a3232f7842431c697eae711318f4a64fae52ac3e33e2d0739ef36bb7c57698110b6fa4740d HEAD_REF master ) diff --git a/ports/taskflow/vcpkg.json b/ports/taskflow/vcpkg.json index 9d2cbca95e6e31..40cae6918ae714 100644 --- a/ports/taskflow/vcpkg.json +++ b/ports/taskflow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "taskflow", - "version": "3.3.0", + "version": "3.4.0", "description": "Fast Parallel Tasking Programming Library using Modern C++", "homepage": "https://github.com/taskflow/taskflow", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 4987bf43db6248..c9f8b926c9afcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7129,7 +7129,7 @@ "port-version": 1 }, "taskflow": { - "baseline": "3.3.0", + "baseline": "3.4.0", "port-version": 0 }, "tbb": { diff --git a/versions/t-/taskflow.json b/versions/t-/taskflow.json index 7bfe3dd2b9b98f..4391da70922d43 100644 --- a/versions/t-/taskflow.json +++ b/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b736d1ff659f4dd121b9af15b27ca659770ec9f4", + "version": "3.4.0", + "port-version": 0 + }, { "git-tree": "68130a893501e5e9bbe48c41ad00ef5de0a0a060", "version": "3.3.0", From 82b7b4fbf53bd134e67b123a00cb15535cfaa6a5 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 20 Sep 2022 16:50:23 -0700 Subject: [PATCH 620/791] Update vcpkg-tool to 2022-09-20 (#26881) https://github.com/microsoft/vcpkg-tool/releases/tag/2022-09-20 https://dev.azure.com/vcpkg/public/_build/results?buildId=78321&view=results --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 7351ee02107248..03f4ec2a9cda17 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-09-01' +$versionDate = '2022-09-20' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7f4af052a62207..c8bc5927f49724 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-09-01" +vcpkgToolReleaseTag="2022-09-20" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="4e085a0d1a4722fbb728a835a907341947dcf4efe94789e191f20abb567cac0eafb30bde5c044175d655c30cc0439727951bdda8758cf3dab3cf91e3c08a4726" + vcpkgToolReleaseSha="d09cf1fb57d3a5a8965723e0de4fc29d05d3d48c06a2b21a027750c955d7f54a881265ae53805d0b0e674db6d4c0b303a915a070daacd72d87a111132daea5df" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="fb02a9f3e5a53d5bb62d77c8851742981528d03985fec37d7c3dcfc200a93ee3be3b99294625c5bd764b205b85ef93f9ce0167b7e3767acc098b139b334cfb9f" + vcpkgToolReleaseSha="f454db52986d6ac57117c61696d3d8f581db154d38a2aac1e7d2c234e3ed8486e017f2db4638e6d26fc5d6e545e76edc20d2a7e3a0fe12ca507bae86a250cca5" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="be49480d951fc625b26e11d552f86a0635f3b63989814d9cd46c5d5eea4b62e31cfea19d7faf647105e0ca2af66dc6a82a3977c61334f4fe88334ac92b960c52" + vcpkgToolReleaseSha="9f360cfd7189cc5c09f7445782075e524ba9e0e2f9205d5e7bfb0c531ade180678ee729e764955ca06056acb5d2b5892c92681e9fb8b7f77b8437924a2c9909d" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="6546ecaa26191c005737a3c2c254dbad945b99334cc80ab81247e970214bc546a6ae002d5cb68eeffe8df009b6f6ce8459a0e658b12f4614aafaf852863ad298" + vcpkgToolReleaseSha="0c7e90821889b3a5a1bec8542445c92226fa0201232dbde042ef1ba3bf6cb6f9eb0f0d99d509b064eb6023f97ab9491a11ab38cd39a4db6caa3183b7bcc4fe36" fi # Do the download or build. From 28d624954238c7816ee96a1fbf4b05caccb7357f Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 22 Sep 2022 03:28:17 +0800 Subject: [PATCH 621/791] [robin-map] Fix error when use find_package(robin-map CONFIG REQUIRED) (#26633) * [tsl-robin-map] Rename robin-map to tsl-robin-map * format-manifest * Let robin-map be an empty port * x-add-version * Add empty line * Add PACKAGE_NAME tsl-robin-map * Add missing port --- ports/robin-map/portfile.cmake | 2 +- ports/robin-map/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/robin-map.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/robin-map/portfile.cmake b/ports/robin-map/portfile.cmake index ca5aa4b7330eb6..ed436d29b1ad10 100644 --- a/ports/robin-map/portfile.cmake +++ b/ports/robin-map/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/tsl-robin-map) +vcpkg_cmake_config_fixup(PACKAGE_NAME tsl-robin-map CONFIG_PATH share/cmake/tsl-robin-map) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/robin-map/vcpkg.json b/ports/robin-map/vcpkg.json index 82f20f11cc2561..6e6b2c5851cd34 100644 --- a/ports/robin-map/vcpkg.json +++ b/ports/robin-map/vcpkg.json @@ -1,6 +1,7 @@ { "name": "robin-map", "version-semver": "1.0.1", + "port-version": 1, "description": "A C++ implementation of a fast hash map and hash set using robin hood hashing", "homepage": "https://github.com/Tessil/robin-map", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c9f8b926c9afcd..a6d2e6b8e812cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6466,7 +6466,7 @@ }, "robin-map": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "rocksdb": { "baseline": "6.27.3", diff --git a/versions/r-/robin-map.json b/versions/r-/robin-map.json index fbbb42be007f0d..0d92e03493cc60 100644 --- a/versions/r-/robin-map.json +++ b/versions/r-/robin-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9028bfe2eb66beaa1a44bf4816223fed81d6657", + "version-semver": "1.0.1", + "port-version": 1 + }, { "git-tree": "3d169ebe25cc931f31bc343d6b21e734070902ed", "version-semver": "1.0.1", From d52632d9a0c4a5b57de285b1e03722a067dd80eb Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 22 Sep 2022 03:30:21 +0800 Subject: [PATCH 622/791] [vcpkg baseline][otl] update error hash (#26899) * [otl] update hash * version * update version --- ports/otl/portfile.cmake | 2 +- ports/otl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/otl.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/otl/portfile.cmake b/ports/otl/portfile.cmake index 6809aa18217c9d..a9f04b06b0b818 100644 --- a/ports/otl/portfile.cmake +++ b/ports/otl/portfile.cmake @@ -3,7 +3,7 @@ set(OTL_VERSION 40463) vcpkg_download_distfile(ARCHIVE URLS "http://otl.sourceforge.net/otlv4_${OTL_VERSION}.zip" FILENAME "otlv4_${OTL_VERSION}-9485a0fe15a7-1.zip" - SHA512 46a50234009ca8e8dba3b0b781f4b496759f4c5697f045d816c7e4eddda61da63d03acf29b4d1f71ee035aba4c6daa72c9a546085a6d7b3c192353b854526392 + SHA512 9485a0fe15a737d55b0746a7e289b1a20e9435ed5c69bda7010705f8cde0a456163d83221d0103236a723837596613b578edc6d3d0007ce80a6cc76b4ed83888 ) vcpkg_extract_source_archive_ex( diff --git a/ports/otl/vcpkg.json b/ports/otl/vcpkg.json index 0c0a12814f18a6..d20d845c5cee1d 100644 --- a/ports/otl/vcpkg.json +++ b/ports/otl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "otl", "version": "4.0.463", - "port-version": 1, + "port-version": 2, "description": "Oracle, Odbc and DB2-CLI Template Library", "homepage": "http://otl.sourceforge.net/", "license": "ISC" diff --git a/versions/baseline.json b/versions/baseline.json index a6d2e6b8e812cf..910e9d14af9d75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5478,7 +5478,7 @@ }, "otl": { "baseline": "4.0.463", - "port-version": 1 + "port-version": 2 }, "outcome": { "baseline": "2.2.4", diff --git a/versions/o-/otl.json b/versions/o-/otl.json index 48fe11f9828ec0..1da9bd31412411 100644 --- a/versions/o-/otl.json +++ b/versions/o-/otl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf3d50a329ecf8149400c6db244ae5793ea1a097", + "version": "4.0.463", + "port-version": 2 + }, { "git-tree": "02a8c353e8a348eb320fdfaf7dfd7d4a40d3d2e1", "version": "4.0.463", From 89f90c708059c4ced5a35ee98e91f2dc4e2d87d9 Mon Sep 17 00:00:00 2001 From: Pranav Date: Thu, 22 Sep 2022 13:41:16 -0500 Subject: [PATCH 623/791] [argparse] Update to v2.8 (#26898) * Updated argparse to v2.8 * Updated version baseline and JSON for argparse --- ports/argparse/portfile.cmake | 4 ++-- ports/argparse/vcpkg.json | 2 +- versions/a-/argparse.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/argparse/portfile.cmake b/ports/argparse/portfile.cmake index 82142c63eea73a..e8558e7e4b0dfd 100644 --- a/ports/argparse/portfile.cmake +++ b/ports/argparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/argparse - REF b0cb28ab177cdbd19d439c02cdc217bdfc508ba9 # v2.2 - SHA512 247f27aa45994ee4629b947e3fe1b1df8fae4e773992c740a7c3d544e45ce83a68ecdcfdedf38c461ccb81cf93d88dfee21dc4f7d027677a3c7d930170446971 + REF 4f10f378c526c8570288daa92e269a26c6ea07ad # v2.8 + SHA512 29dd57431cea73d88d6dfca58c76c2f14bfa9c661ed2b5dbfa517f8ed2504371ec68939a35dd01e26a50a45d8688169993e971dd98eca5e889ebb5bb6363592a HEAD_REF master ) diff --git a/ports/argparse/vcpkg.json b/ports/argparse/vcpkg.json index ca94bbc8b9ae68..94365194d1d11d 100644 --- a/ports/argparse/vcpkg.json +++ b/ports/argparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "argparse", - "version": "2.2", + "version": "2.8", "description": "Argument parser for modern C++", "homepage": "https://github.com/p-ranav/argparse", "license": "MIT", diff --git a/versions/a-/argparse.json b/versions/a-/argparse.json index accdedbe5cd01e..4f2083cf4ae0d3 100644 --- a/versions/a-/argparse.json +++ b/versions/a-/argparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3bf81ce931b3f8abadb45bd70389073d703af8a", + "version": "2.8", + "port-version": 0 + }, { "git-tree": "928e03159c73294a2e6623d330ea1567190d753f", "version": "2.2", diff --git a/versions/baseline.json b/versions/baseline.json index 910e9d14af9d75..1d7916386452e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -157,7 +157,7 @@ "port-version": 0 }, "argparse": { - "baseline": "2.2", + "baseline": "2.8", "port-version": 0 }, "args": { From 889af66a1dd1329d43a78ff81eed4d583b9746cd Mon Sep 17 00:00:00 2001 From: Joel Falcou Date: Thu, 22 Sep 2022 20:41:43 +0200 Subject: [PATCH 624/791] Updated EVE version (#26892) --- ports/eve/portfile.cmake | 4 ++-- ports/eve/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/e-/eve.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/eve/portfile.cmake b/ports/eve/portfile.cmake index ffa8b990ef1a8b..4f6f203d0b48b0 100644 --- a/ports/eve/portfile.cmake +++ b/ports/eve/portfile.cmake @@ -3,8 +3,8 @@ message(WARNING "EVE requires a C++ 20 compliant compiler. GCC-11 and clang-12 a vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jfalcou/eve - REF v2022.03.0 - SHA512 9ca2cb69a179bf05046696ba83a1cea4e558a0a883ca1d664effc2564e07123f631fc3885256d0dede09c8ec10b23a3feca0ec19ed9c73000cf698384ab4663d + REF v2022.09.0 + SHA512 ab5be8c897955e08e1aa192ac9dd90e310b2786a2f295b0d5a5d309fa8e621b66673668b9dbe2f683a5e2596d291b0521d80a8bb80f493ecb12e86ab5d830c7b HEAD_REF main ) diff --git a/ports/eve/vcpkg.json b/ports/eve/vcpkg.json index 9c1348f7d80ffa..f5bbf6499ae666 100644 --- a/ports/eve/vcpkg.json +++ b/ports/eve/vcpkg.json @@ -1,10 +1,10 @@ { "name": "eve", - "version-date": "2022-03-15", + "version-date": "2022-09-20", "description": "EVE - the Expressive Vector Engine", "homepage": "https://github.com/jfalcou/eve", "documentation": "https://jfalcou.github.io/eve/", - "license": "MIT", + "license": "BSL-1.0", "supports": "!windows", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 1d7916386452e8..29453cc9fb5b14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2165,7 +2165,7 @@ "port-version": 1 }, "eve": { - "baseline": "2022-03-15", + "baseline": "2022-09-20", "port-version": 0 }, "eventpp": { diff --git a/versions/e-/eve.json b/versions/e-/eve.json index a1c8e52f0f1645..e26519b3e3b166 100644 --- a/versions/e-/eve.json +++ b/versions/e-/eve.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b6a47336d9cf0e99ea0dffc7c0c41bb04dfff5a", + "version-date": "2022-09-20", + "port-version": 0 + }, { "git-tree": "017b4485d7d6330770a47783a7e8f9fe7216c454", "version-date": "2022-03-15", From e97f053a90da3eecc513eda1a6a9c98eea511bf8 Mon Sep 17 00:00:00 2001 From: Guillaume Racicot Date: Thu, 22 Sep 2022 15:42:38 -0300 Subject: [PATCH 625/791] [kangaru ] Update to version 4.3.1 (#26839) * Bumped kangaru version * Added versions * Bumped kangaru version * run x-add-version * Change name of the feature to globaltypeid * Run x-add-version * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Fixed feature for hash based type id * Run x-add-version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kangaru/portfile.cmake | 10 ++++++++-- ports/kangaru/vcpkg.json | 9 +++++++-- versions/baseline.json | 2 +- versions/k-/kangaru.json | 5 +++++ 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake index 92ab7aadee31b0..a97d1dcba089ea 100644 --- a/ports/kangaru/portfile.cmake +++ b/ports/kangaru/portfile.cmake @@ -1,17 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gracicot/kangaru - REF v4.3.0 - SHA512 7763d25eed203a033e0420abc0194531082223183ed9ec28d98f871e0dc619d28ec9053ff69b5bf54bac07bd99551f2dfaad9f29d51e8ebdd72d4929f9a8fb93 + REF v4.3.1 + SHA512 5c1c6081b266089ad4ef310f4782505db5c514adce87091dd8164a6da71fc7ef72c0992c32e9ec3c991aa7a2ca43f1d96f2f524c7198bf899876af214fea28f3 HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hashtypeid KANGARU_HASH_TYPE_ID +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DKANGARU_EXPORT=OFF -DKANGARU_TEST=OFF -DKANGARU_REVERSE_DESTRUCTION=ON + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/kangaru/vcpkg.json b/ports/kangaru/vcpkg.json index 29b53eafc6a999..b0b2d4d02c4ced 100644 --- a/ports/kangaru/vcpkg.json +++ b/ports/kangaru/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kangaru", - "version": "4.3.0", + "version": "4.3.1", "description": "A dependency injection container for C++11, C++14 and later", "homepage": "https://github.com/gracicot/kangaru", "license": "MIT", @@ -13,5 +13,10 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "hashtypeid": { + "description": "Enable hash based type id" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 29453cc9fb5b14..bcf5cd563ad15f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3205,7 +3205,7 @@ "port-version": 4 }, "kangaru": { - "baseline": "4.3.0", + "baseline": "4.3.1", "port-version": 0 }, "kcp": { diff --git a/versions/k-/kangaru.json b/versions/k-/kangaru.json index 81bf486ea0e7d0..8e22f10707e89e 100644 --- a/versions/k-/kangaru.json +++ b/versions/k-/kangaru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "194f665c94fecadc626ab9431003eec963a6820d", + "version": "4.3.1", + "port-version": 0 + }, { "git-tree": "b6015882a3de991781c67d93b4c470aafcdd3e2b", "version": "4.3.0", From 1d5b2d15ffc07444af900d381d266d1f0571874d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 22 Sep 2022 23:23:53 +0200 Subject: [PATCH 626/791] [new port] Add rubberband (#24549) * add port for `rubberband` [rubberband](https://www.breakfastquay.com/rubberband/) is a small library for stretching sounds. This is the minimal portfile to make vcpkg happy, but probably still needs some improvement, i.e. not picking up system libraries. * [rubberband] Update to 2.0.2 * [rubberband] remove lv2 feature, because the install location is out of the vcpkg install tree * [rubberband] Remove vcpkg_cmake_get_vars dependency * [rubberband] Disable static builds on windows because of broken libsndfile dependency Co-authored-by: Daniel Reuter --- ports/rubberband/portfile.cmake | 48 +++++++++++++++++++++++++++++++++ ports/rubberband/vcpkg.json | 30 +++++++++++++++++++++ versions/baseline.json | 4 +++ versions/r-/rubberband.json | 9 +++++++ 4 files changed, 91 insertions(+) create mode 100644 ports/rubberband/portfile.cmake create mode 100644 ports/rubberband/vcpkg.json create mode 100644 versions/r-/rubberband.json diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake new file mode 100644 index 00000000000000..370bcae9511729 --- /dev/null +++ b/ports/rubberband/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO breakfastquay/rubberband + REF v2.0.2 + SHA512 56e33f3a6f5755242e46f9cb224e372bea7a367756f08d3322c8951a40b3907f1a2957775de6f2584a093e6adf82ca91015119650d5a624afe39086a47843ddc + HEAD_REF default +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dfft=fftw # 'auto', 'builtin', 'kissfft', 'fftw', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.') + -Dresampler=libsamplerate # 'auto', 'builtin', 'libsamplerate', 'speex', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.' + -Dipp_path= # 'Path to Intel IPP libraries, if selected for any of the other options.' + -Dextra_include_dirs= # 'Additional local header directories to search for dependencies.' + -Dextra_lib_dirs= # 'Additional local library directories to search for dependencies.' + ) + +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/rubberband-program${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + # Rubberband uses a different executable name when compiled with msvc + # Just looking for that file is faster than detecting msvc builds + set(RUBBERBAND_PROGRAM_NAME rubberband-program) +else() + set(RUBBERBAND_PROGRAM_NAME rubberband) +endif() + +# Features cli and lv2 are build whenever suficient dependencies are installed, +# Remove them when not enabled. +if("cli" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES "${RUBBERBAND_PROGRAM_NAME}" AUTO_CLEAN) +else() + vcpkg_clean_executables_in_bin(FILE_NAMES "${RUBBERBAND_PROGRAM_NAME}") +endif() + +# lv2 feature is not supported yet because vcpkg can't isntall to +# %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2" +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2") + +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json new file mode 100644 index 00000000000000..8c9bf8609bf33c --- /dev/null +++ b/ports/rubberband/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "rubberband", + "version": "2.0.2", + "description": "A high quality software library for audio time-stretching and pitch-shifting.", + "homepage": "https://www.breakfastquay.com/rubberband/", + "license": "GPL-2.0-or-later", + "supports": "!uwp & !(windows & static)", + "dependencies": [ + "fftw3", + "libsamplerate", + { + "name": "vcpkg-tool-meson", + "host": true + } + ], + "features": { + "cli": { + "description": "Build the command-line utility", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index bcf5cd563ad15f..cb9f1c443a4054 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6524,6 +6524,10 @@ "baseline": "0.9.6", "port-version": 4 }, + "rubberband": { + "baseline": "2.0.2", + "port-version": 0 + }, "rxcpp": { "baseline": "4.1.1", "port-version": 0 diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json new file mode 100644 index 00000000000000..378a1dfe38c283 --- /dev/null +++ b/versions/r-/rubberband.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "75aeab834246d0e2ba7de5f07901e5d7131397f7", + "version": "2.0.2", + "port-version": 0 + } + ] +} From ba1f91fd7e65825387047c39633e93cfd23c0f6d Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 22 Sep 2022 23:28:20 +0200 Subject: [PATCH 627/791] [scripts|cmake] use ENV{VisualStudioVersion} to switch cmake generator (#26339) * add VCPKG_CMAKE_VS_GENERATOR for overriding/providing a generator if ninja cannot be used * Wording CR. Co-authored-by: Javier Matos Denizac * use VisualStudioVersion to switch the generator. * v db * CR changes * v db Co-authored-by: Javier Matos Denizac --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 8 +++++ scripts/cmake/vcpkg_configure_cmake.cmake | 30 ++++++++++++------- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 ++++ 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 6ffadbbcee966b..f6f66b21a4ac9f 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-07-18", + "version-date": "2022-08-18", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 723fd2ecf81311..8cb2b78ec75ba1 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -76,6 +76,14 @@ function(vcpkg_cmake_configure) if(arg_WINDOWS_USE_MSBUILD AND VCPKG_HOST_IS_WINDOWS AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) z_vcpkg_get_visual_studio_generator(OUT_GENERATOR generator OUT_ARCH arch) vcpkg_list(APPEND architecture_options "-A${arch}") + if(DEFINED VCPKG_PLATFORM_TOOLSET) + vcpkg_list(APPEND arg_OPTIONS "-T${VCPKG_PLATFORM_TOOLSET}") + endif() + if(NOT generator) + message(FATAL_ERROR "Unable to determine appropriate Visual Studio generator for triplet ${TARGET_TRIPLET}: + ENV{VisualStudioVersion} : $ENV{VisualStudioVersion} + VCPKG_TARGET_ARCHITECTURE: ${VCPKG_TARGET_ARCHITECTURE}") + endif() elseif(DEFINED arg_GENERATOR) set(generator "${arg_GENERATOR}") elseif(ninja_host) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index be0215f9398688..7c642d25cba4e1 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -27,16 +27,22 @@ function(z_vcpkg_get_visual_studio_generator) if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 12 2013") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") - set(generator "Visual Studio 14 2015") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") - set(generator "Visual Studio 15 2017") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") - set(generator "Visual Studio 16 2019") - elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") - set(generator "Visual Studio 17 2022") + + if(DEFINED ENV{VisualStudioVersion}) + if("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "12.99" AND + "$ENV{VisualStudioVersion}" VERSION_GREATER_EQUAL "12.0" AND + NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 12 2013") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "14.99" AND + NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 14 2015") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "15.99") + set(generator "Visual Studio 15 2017") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "16.99") + set(generator "Visual Studio 16 2019") + elseif("$ENV{VisualStudioVersion}" VERSION_LESS_EQUAL "17.99") + set(generator "Visual Studio 17 2022") + endif() endif() if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") @@ -149,9 +155,13 @@ function(vcpkg_configure_cmake) if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") message(FATAL_ERROR "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: + ENV{VisualStudioVersion} : $ENV{VisualStudioVersion} platform toolset: ${VCPKG_PLATFORM_TOOLSET} architecture : ${VCPKG_TARGET_ARCHITECTURE}") endif() + if(DEFINED VCPKG_PLATFORM_TOOLSET) + vcpkg_list(APPEND arg_OPTIONS "-T${VCPKG_PLATFORM_TOOLSET}") + endif() endif() # If we use Ninja, make sure it's on PATH diff --git a/versions/baseline.json b/versions/baseline.json index cb9f1c443a4054..5dcbe8e6077cb4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7589,7 +7589,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-07-18", + "baseline": "2022-08-18", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index a329f1d02a5aa2..93f0c66974a2f1 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84c200e8e625d4d99b1649525fcdf81a73197078", + "version-date": "2022-08-18", + "port-version": 0 + }, { "git-tree": "a7b618b7782f3c841d7fd2d84a6ba3619815362a", "version-date": "2022-07-18", From 9c2ee2a7c557d59d637e8be323b4885c793e6861 Mon Sep 17 00:00:00 2001 From: Valerie Avva Lim <54871851+vaavva@users.noreply.github.com> Date: Thu, 22 Sep 2022 14:32:34 -0700 Subject: [PATCH 628/791] [azure-iot-sdk-c] LTS Release 07-2022_Ref02 (#26361) * update versions * add patches * fix ninja error * update port versions * fix linux build issues * bot comment fixes * update version * add openssl override for c-utility * format vcpkg.json file * Update version database * update licenses * Update version database * remove depracated portfile functions * Update version database * fix vcpkg_cmake_config_fixup arguments * Update version database * point to after openssl 3 support * revert overrides * add new openssl patch * fix patches to work on linux * update to actual release code * update versions * remove leftovers from trying to fix linux * Revert "remove leftovers from trying to fix linux" This reverts commit b4589195f122a0abf935d376dced59e674bb6e6d. * Revert "update versions" This reverts commit 6a0fbb531835026817427f7cb1e9fec2a1599602. * remove leftovers from trying to fix linux * update versions * remove unpublished versions * Update ports/azure-c-shared-utility/vcpkg.json remove port version Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/azure-uamqp-c/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/azure-uamqp-c/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/azure-umqtt-c/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * pr comments * update versions * clean up versions * remove version updates from un-updated packages * overwrite versions * Update vcpkg.json * Update vcpkg.json * Update azure-macro-utils-c.json * Update umock-c.json Co-authored-by: Valerie Avva Lim Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang <494550702@qq.com> --- ports/azure-c-shared-utility/openssl.patch | 13 ------------ ports/azure-c-shared-utility/portfile.cmake | 5 ++--- ports/azure-c-shared-utility/vcpkg.json | 3 +-- .../fix-iothubclient-includes.patch | 7 ++++--- ports/azure-iot-sdk-c/portfile.cmake | 5 +++-- ports/azure-iot-sdk-c/vcpkg.json | 3 +-- ports/azure-uamqp-c/portfile.cmake | 17 ++++++++-------- ports/azure-uamqp-c/vcpkg.json | 13 +++++++++--- ports/azure-uhttp-c/portfile.cmake | 4 ++-- ports/azure-uhttp-c/vcpkg.json | 3 +-- ports/azure-umqtt-c/portfile.cmake | 8 ++++---- ports/azure-umqtt-c/vcpkg.json | 3 +-- versions/a-/azure-c-shared-utility.json | 5 +++++ versions/a-/azure-iot-sdk-c.json | 5 +++++ versions/a-/azure-uamqp-c.json | 5 +++++ versions/a-/azure-uhttp-c.json | 5 +++++ versions/a-/azure-umqtt-c.json | 5 +++++ versions/baseline.json | 20 +++++++++---------- 18 files changed, 72 insertions(+), 57 deletions(-) delete mode 100644 ports/azure-c-shared-utility/openssl.patch diff --git a/ports/azure-c-shared-utility/openssl.patch b/ports/azure-c-shared-utility/openssl.patch deleted file mode 100644 index bdf46dd1d981e7..00000000000000 --- a/ports/azure-c-shared-utility/openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/adapters/x509_openssl.c b/adapters/x509_openssl.c -index 5a9e5ac2..bb946c2d 100644 ---- a/adapters/x509_openssl.c -+++ b/adapters/x509_openssl.c -@@ -75,7 +75,7 @@ static int load_certificate_chain(SSL_CTX* ssl_ctx, const char* certificate) - // certificates. - - /* Codes_SRS_X509_OPENSSL_07_006: [ If successful x509_openssl_add_ecc_credentials shall to import each certificate in the cert chain. ] */ --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && (OPENSSL_VERSION_NUMBER < 0x20000000L) -+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) - SSL_CTX_clear_extra_chain_certs(ssl_ctx); - #else - if (ssl_ctx->extra_certs != NULL) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 5b9a85d1a9606e..40791ee3faa335 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -17,11 +17,10 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 1a27846886a74702d409a8f0e2d77a38163cefc7 - SHA512 c30cba73692691fe1310b6180e3aeaf4d86b6276981c680cac31d605634e5dedbce3f823142dfebba4ae2f76ccead965a527d95df0e52af638a30ddec9818fbd + REF 9e4322c9d88095ed276bf7e4b31b87b82b1c4d86 + SHA512 0ede2a30ed787028a48602111be7cebc65593a84a8b3dc94ed34917f44355a180d8b8acf2b6404e47428fe8f761c11485199e9bd2e9aa6628548c585357f63e8 HEAD_REF master PATCHES - openssl.patch fix-install-location.patch fix-utilityFunctions-conditions.patch disable-error.patch diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index f5f3c1abd2998b..a7b3cf63a35fad 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-c-shared-utility", - "version-date": "2022-01-21", - "port-version": 3, + "version-date": "2022-09-15", "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "license": "MIT", diff --git a/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch b/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch index 9ccf48e5c90cde..1a5173629d8e4b 100644 --- a/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch +++ b/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch @@ -1,13 +1,14 @@ diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt -index 07ab3b7..9769a08 100644 +index 5a8f5573c..07ab3b7cb 100644 --- a/iothub_client/CMakeLists.txt +++ b/iothub_client/CMakeLists.txt -@@ -441,7 +441,7 @@ add_library(iothub_client - target_include_directories(iothub_client +@@ -442,8 +442,6 @@ target_include_directories(iothub_client PUBLIC $ - $ + $ +- $ +- $ ) applyXcodeBuildFlagsIfNeeded(iothub_client) target_link_libraries(iothub_client ${iothub_client_libs}) diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 8edad368853e4e..7a7bf38a6d56ca 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF 5805fb669ffe2adff021d68c62725d0bd783ac49 - SHA512 8f1aa1020f3bb8b3e801f3977d11be50fd07d961c89ac921f795ef8a99312f12e1ddb2268ce3d2fb84b6a42bb5806cde410e6b51c7c4539a9a11a9ae512dbcd1 + REF 3fd808bee3c88f8578dcc30c0a6d1d396c172070 + SHA512 2ee26791aca7732d21fe91cbb51be35d1589161d1d7b54542ac1a1277f1a95eb7e1d5ced7be117ce326dd118169e20ffc6bcd0ea9fd8ac9442bd466bc048f1ea HEAD_REF master PATCHES fix-install-location.patch @@ -42,6 +42,7 @@ vcpkg_cmake_configure( -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON -Dwarnings_as_errors=OFF + -Dhsm_type_sastoken=OFF MAYBE_UNUSED_VARIABLES build_as_dynamic warnings_as_errors diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index eb8d7405f982c8..68171bb5830c45 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-iot-sdk-c", - "version-date": "2022-01-21", - "port-version": 2, + "version-date": "2022-09-15", "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", "license": "MIT", diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 8e296ff0ac8efe..3098bd34636ed5 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -12,17 +12,16 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF 85aae56beb717dddaf5512845de537d2926afb02 - SHA512 3d9e7788c784169e6d1d9abd233e00a4c1e6525d67cbc25f8ba42292b6d66d0179a742833a0c00a3a0df6498bf88dc8b12a40c183e7141f7290cbb4eceb67dbe + REF 117c8378b80fdafec639dafb6693b7c044281abc + SHA512 6726cfb3ecb42d42957b5df94d0b173b566fdd6961814e2b10882e32ae26387a36b05d77c59efbb008b7ed37e276c35128ab4e4adf0739cbf37f5f234626481a HEAD_REF master ) endif() file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON @@ -31,12 +30,12 @@ vcpkg_configure_cmake( build_as_dynamic ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/uamqp) +vcpkg_cmake_config_fixup(PACKAGE_NAME uamqp CONFIG_PATH "cmake") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json index 40c1177fd8b817..54c351911d20c2 100644 --- a/ports/azure-uamqp-c/vcpkg.json +++ b/ports/azure-uamqp-c/vcpkg.json @@ -1,14 +1,21 @@ { "name": "azure-uamqp-c", - "version-date": "2022-01-21", - "port-version": 1, + "version-date": "2022-09-15", "description": "AMQP library for C", "homepage": "https://github.com/Azure/azure-uamqp-c", "license": "MIT", "dependencies": [ "azure-c-shared-utility", "azure-macro-utils-c", - "umock-c" + "umock-c", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "public-preview": { diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 0478c7174375f6..d8e3a633bbac68 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -14,8 +14,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF 1cc70f4d21ad69768cafb9551b1b512118fba995 - SHA512 6604e82b347a1a4eb5072ab762fde7bd5ae9b32848a78da9103e0eb528b9ccd420a12dbc237dc0b5fe6db271d5cdcd24eedf1cde8ac058102fdd24c5a5a33f26 + REF 2b86b92628e55c9597aef8b96b0a73048ef072b3 + SHA512 bc4cadaf4f64ffff4d8839fe8f604b77d6a912ab28b6100df93f4c7fbc96fa68a4e09b4670d27d078aac32a2d7792c408aa78a580328c02759c7a1c04d82d721 HEAD_REF master ) endif() diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json index ff97c54e3c98b2..3b0aed5d6b070f 100644 --- a/ports/azure-uhttp-c/vcpkg.json +++ b/ports/azure-uhttp-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-uhttp-c", - "version-date": "2022-01-21", - "port-version": 1, + "version-date": "2022-09-15", "description": "Azure HTTP Library written in C", "homepage": "https://github.com/Azure/azure-uhttp-c", "license": "MIT", diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index e9e65434ff5693..acd5fe413970c4 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -14,16 +14,16 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 09558f380a314ea89b28f406cc810f47718cea49 - SHA512 7fc1b3d4ed6bd7401b764e27755270dd97caeb09f3bdede90e2e8c554acd13b5c24f9c7343e642bcb62d2937b8169d900fa46a1b97a8c439733c8cdcac19d548 + REF 566127ad605172735b9ac5cc6797261f3dd6c45c + SHA512 19e997e1dd7ecfbf5e8f11f44daa89cee7aa793f95aaed4bdaf792f5443173e0ca434d69f68a6633ee7cdc504d03a42f4b4e8aeec549c7ffdbd5e03db8cce6b5 HEAD_REF master ) endif() -file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/c-utility/configs/) +file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/c-utility/configs/") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dskip_samples=ON -Duse_installed_dependencies=ON diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json index ec223bd03ba980..e5c1787633c0a8 100644 --- a/ports/azure-umqtt-c/vcpkg.json +++ b/ports/azure-umqtt-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-umqtt-c", - "version-date": "2022-01-21", - "port-version": 1, + "version-date": "2022-09-15", "description": "General purpose library for communication over the mqtt protocol", "homepage": "https://github.com/Azure/azure-umqtt-c", "license": "MIT", diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index ea11d2ee568e72..d140703f89ace6 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bfbac018e320a4f8d18aba279855bebd798e74f", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "ec45ec6a9a5b28ecab27857508355956d151a814", "version-date": "2022-01-21", diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index 3953986f7d4d00..f1a5b978a4041f 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a47653f79ed3d0017784d96142716554dd4de95", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "80f1eb4e465fef817503af2c9599b2186d4922e6", "version-date": "2022-01-21", diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json index 3684f27960299c..0d039376f98844 100644 --- a/versions/a-/azure-uamqp-c.json +++ b/versions/a-/azure-uamqp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42efba430e30e78eaf72b03c94f8c4afe07bcfda", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "d7d284a159afe6ab21ce65d5e5d96dbee83339f6", "version-date": "2022-01-21", diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json index e7cf5ca1a18c8f..ae63cab50a9327 100644 --- a/versions/a-/azure-uhttp-c.json +++ b/versions/a-/azure-uhttp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c83542c6dc2b853932ac25c4d8314a5556aab40", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "28439985096cc9a714695d10830ceb2f54859c24", "version-date": "2022-01-21", diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json index 8933265990a138..a010bbe8f3a0fc 100644 --- a/versions/a-/azure-umqtt-c.json +++ b/versions/a-/azure-umqtt-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28ef0c8d4778d3fd30120290bcb4a121a2efc14f", + "version-date": "2022-09-15", + "port-version": 0 + }, { "git-tree": "5953c7aee01e5c0972a8eb97fbb763c74b60c49c", "version-date": "2022-01-21", diff --git a/versions/baseline.json b/versions/baseline.json index 5dcbe8e6077cb4..7ca5c98c61e953 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -333,8 +333,8 @@ "port-version": 0 }, "azure-c-shared-utility": { - "baseline": "2022-01-21", - "port-version": 3 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-core-cpp": { "baseline": "1.7.2", @@ -349,8 +349,8 @@ "port-version": 0 }, "azure-iot-sdk-c": { - "baseline": "2022-01-21", - "port-version": 2 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", @@ -401,16 +401,16 @@ "port-version": 0 }, "azure-uamqp-c": { - "baseline": "2022-01-21", - "port-version": 1 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-uhttp-c": { - "baseline": "2022-01-21", - "port-version": 1 + "baseline": "2022-09-15", + "port-version": 0 }, "azure-umqtt-c": { - "baseline": "2022-01-21", - "port-version": 1 + "baseline": "2022-09-15", + "port-version": 0 }, "b64": { "baseline": "2.0.0.1", From 0e0aa20677f2f98d6b6065999a81b01a6df4682e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 22 Sep 2022 23:34:02 +0200 Subject: [PATCH 629/791] [xwindow] part 5b (#26851) * [libice] add new port * [libsm] add new port * add license * v db * [libxi] add port * [libxres] add port * [libxrandr] add port * v db * add license * v db * fix port name * fix vdb * [libxrender] add port * format * v db * fix arm ? * use configure option * arm fixes * v db --- ports/libxi/portfile.cmake | 35 +++++++++++++++++++++++++++++++++ ports/libxi/vcpkg.json | 11 +++++++++++ ports/libxrandr/portfile.cmake | 35 +++++++++++++++++++++++++++++++++ ports/libxrandr/vcpkg.json | 15 ++++++++++++++ ports/libxrender/portfile.cmake | 35 +++++++++++++++++++++++++++++++++ ports/libxrender/vcpkg.json | 11 +++++++++++ ports/libxres/build.patch | 16 +++++++++++++++ ports/libxres/portfile.cmake | 35 +++++++++++++++++++++++++++++++++ ports/libxres/vcpkg.json | 14 +++++++++++++ versions/baseline.json | 16 +++++++++++++++ versions/l-/libxi.json | 9 +++++++++ versions/l-/libxrandr.json | 9 +++++++++ versions/l-/libxrender.json | 9 +++++++++ versions/l-/libxres.json | 9 +++++++++ 14 files changed, 259 insertions(+) create mode 100644 ports/libxi/portfile.cmake create mode 100644 ports/libxi/vcpkg.json create mode 100644 ports/libxrandr/portfile.cmake create mode 100644 ports/libxrandr/vcpkg.json create mode 100644 ports/libxrender/portfile.cmake create mode 100644 ports/libxrender/vcpkg.json create mode 100644 ports/libxres/build.patch create mode 100644 ports/libxres/portfile.cmake create mode 100644 ports/libxres/vcpkg.json create mode 100644 versions/l-/libxi.json create mode 100644 versions/l-/libxrandr.json create mode 100644 versions/l-/libxrender.json create mode 100644 versions/l-/libxres.json diff --git a/ports/libxi/portfile.cmake b/ports/libxi/portfile.cmake new file mode 100644 index 00000000000000..7f7676bda39ce5 --- /dev/null +++ b/ports/libxi/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxi + REF f24d7f43ab4d97203e60677a3d42e11dbc80c8b4 # 1.8 + SHA512 bc98d03f1c53f26d0c2063de5a0b58951c9db44dfcfb44519efca89f20c8f8f50599c264d11546357164430f3486dd263742657de426cc7fbb3a306be0bc8866 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxi/vcpkg.json b/ports/libxi/vcpkg.json new file mode 100644 index 00000000000000..1993f6c8f4aeb0 --- /dev/null +++ b/ports/libxi/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libxi", + "version": "1.8", + "description": "Xlib library for the X Input Extension", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxi", + "license": null, + "dependencies": [ + "libxext", + "libxfixes" + ] +} diff --git a/ports/libxrandr/portfile.cmake b/ports/libxrandr/portfile.cmake new file mode 100644 index 00000000000000..229122bd7cc293 --- /dev/null +++ b/ports/libxrandr/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in the triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxrandr + REF 55dcda4518eda8ae03ef25ea29d3c994ad71eb0a # 1.5.2 + SHA512 63a3a7c5db8d41c73ef2f55e86a47bdae0112ac39802efa5da4fa26a8794066d6906d4a5e4e9af5abb5838a061f2583dc2b8865e38754ee3f2a8e3918de87168 + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxrandr/vcpkg.json b/ports/libxrandr/vcpkg.json new file mode 100644 index 00000000000000..0d769dab849f46 --- /dev/null +++ b/ports/libxrandr/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libxrandr", + "version": "1.5.2", + "description": "Xlib Resize, Rotate and Reflection (RandR) extension library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrandr", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxext", + "libxrender", + "xorg-macros", + "xproto" + ] +} diff --git a/ports/libxrender/portfile.cmake b/ports/libxrender/portfile.cmake new file mode 100644 index 00000000000000..0a60e04c092de7 --- /dev/null +++ b/ports/libxrender/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxrender + REF 845716f8f14963d338e5a8d5d2424baafc90fb30 # 0.9.10 + SHA512 a7e8d383a8400d63eb726b741cd25a1e9e671c7eadef04beddc4e31fec59b384ae4fa3f305e62a2aecbaedffc76c7b0626f525ec8634c9940a29de058e4a653c + HEAD_REF master +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxrender/vcpkg.json b/ports/libxrender/vcpkg.json new file mode 100644 index 00000000000000..6c0bd85f3d0098 --- /dev/null +++ b/ports/libxrender/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libxrender", + "version": "0.9.10", + "description": "library for the Render Extension to the X11 protocol", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxrender", + "license": null, + "dependencies": [ + "libx11", + "xorg-macros" + ] +} diff --git a/ports/libxres/build.patch b/ports/libxres/build.patch new file mode 100644 index 00000000000000..04b3ce3ec198f1 --- /dev/null +++ b/ports/libxres/build.patch @@ -0,0 +1,16 @@ +diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h +index 1c816165e..8da68aa23 100644 +--- a/include/X11/extensions/XRes.h ++++ b/include/X11/extensions/XRes.h +@@ -6,7 +6,10 @@ + #define _XRES_H + + #include +- ++#if defined(_MSC_VER) ++ #include ++ typedef int pid_t; ++#endif + /* v1.0 */ + + typedef struct { diff --git a/ports/libxres/portfile.cmake b/ports/libxres/portfile.cmake new file mode 100644 index 00000000000000..7d2d27ba50ad5d --- /dev/null +++ b/ports/libxres/portfile.cmake @@ -0,0 +1,35 @@ +if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +else() +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/xorg + OUT_SOURCE_PATH SOURCE_PATH + REPO lib/libxres + REF c05c6d918b0e2011d4bfa370c321482e34630b17 # 1.2.1 + SHA512 c2eabf65b03393991b56b84bea4d770e9c0295d685e8b22bb7dabbd37dd6c7c6f5e519cefa790b05c0f124bb739a5abe03249b89e2ce6d5276014e9752c11251 + HEAD_REF master + PATCHES build.patch +) + +set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"") + +if (VCPKG_CROSSCOMPILING) + list(APPEND OPTIONS --enable-malloc0returnsnull) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +endif() diff --git a/ports/libxres/vcpkg.json b/ports/libxres/vcpkg.json new file mode 100644 index 00000000000000..46d1479f0c0fea --- /dev/null +++ b/ports/libxres/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libxres", + "version": "1.2.1", + "description": "Xlib-based X-Resource extension client library", + "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxres", + "license": null, + "dependencies": [ + "bzip2", + "libx11", + "libxext", + "xorg-macros", + "xproto" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7ca5c98c61e953..9f765d3d85121f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4348,6 +4348,10 @@ "baseline": "6.0.0", "port-version": 0 }, + "libxi": { + "baseline": "1.8", + "port-version": 0 + }, "libxkbcommon": { "baseline": "1.4.1", "port-version": 0 @@ -4380,6 +4384,18 @@ "baseline": "3.5.11", "port-version": 1 }, + "libxrandr": { + "baseline": "1.5.2", + "port-version": 0 + }, + "libxrender": { + "baseline": "0.9.10", + "port-version": 0 + }, + "libxres": { + "baseline": "1.2.1", + "port-version": 0 + }, "libxslt": { "baseline": "1.1.37", "port-version": 0 diff --git a/versions/l-/libxi.json b/versions/l-/libxi.json new file mode 100644 index 00000000000000..4c3bd3155ab9f1 --- /dev/null +++ b/versions/l-/libxi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "af8e343976780e89ba9aca93f5dafcf3e0dcfecf", + "version": "1.8", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxrandr.json b/versions/l-/libxrandr.json new file mode 100644 index 00000000000000..e621e9f4b27c61 --- /dev/null +++ b/versions/l-/libxrandr.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a2319ebdf2506031a67829f725660eba807869cc", + "version": "1.5.2", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxrender.json b/versions/l-/libxrender.json new file mode 100644 index 00000000000000..a2e03f0a6b2059 --- /dev/null +++ b/versions/l-/libxrender.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f0ef5b766bea2ae48efec7303a59faefdbb0bb96", + "version": "0.9.10", + "port-version": 0 + } + ] +} diff --git a/versions/l-/libxres.json b/versions/l-/libxres.json new file mode 100644 index 00000000000000..d2366d8fcda2b6 --- /dev/null +++ b/versions/l-/libxres.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a045d82350a03dfa05a612ae66ec5698c21bf195", + "version": "1.2.1", + "port-version": 0 + } + ] +} From 86eb754bce1ac2087cbf8351a11015a9df7ca8dd Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 22 Sep 2022 16:55:36 -0700 Subject: [PATCH 630/791] Minor github bot cleanups. (#26930) * Remove no longer necessary caching step in the github bot. --- .github/workflows/untrustedPR.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 141c7efd42f4eb..ca76f05dbc13ac 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -17,15 +17,7 @@ jobs: # fetch-depth 50 tries to ensure we capture the whole history of the branch fetch-depth: 50 - - uses: actions/cache@v2 - id: cache - with: - path: | - ./vcpkg - key: ${{ runner.os }}-${{ hashFiles('scripts/bootstrap*') }} - - name: bootstrap - if: steps.cache.outputs.cache-hit != 'true' run: ./bootstrap-vcpkg.sh - name: Save PR number @@ -38,6 +30,8 @@ jobs: git config user.email github-actions git config user.name github-actions@github.com + git --version + 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*//' > .github-pr.changed-manifest-files cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license From 038dc2df422946976b949cdb08f33aba495b9854 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 23 Sep 2022 10:13:02 -0700 Subject: [PATCH 631/791] [protobuf] update to v3.21.6 release (#26927) --- ports/protobuf/portfile.cmake | 6 +++--- ports/protobuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index ebf240d7370d2a..bab855835185ad 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -1,10 +1,10 @@ -set(version 3.21.4) +set(version 3.21.6) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF c9869dc7803eb0a21d7e589c40ff4f9288cd34ae #v3.21.4 - SHA512 99f90020bfc21f717341cf88b43950ede4ba4bd75357397eb2517cb4f6699ae88dcabd65e666df7321b9ba5203b18603fa1c4e97d924aa7978b1ba6b63216fbb + REF v3.21.6 + SHA512 31506c777d30c7ff0d510a4cfa56d5b352e3c299dbaf8ab6c623220dbead96ff8d3cd5819d28d9f9fe742e31fa5e260c68be7074dae6412860195ab3b6aec5d0 HEAD_REF master PATCHES fix-static-build.patch diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 9b341c1a03f986..99afe602615ce1 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "protobuf", - "version": "3.21.4", + "version": "3.21.6", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 9f765d3d85121f..d00496a747a76f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5817,7 +5817,7 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.21.4", + "baseline": "3.21.6", "port-version": 0 }, "protobuf-c": { diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index efed0c5b4b0b71..4897c20ca608a4 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d2c32252e568decb813b1109f1d86e6023af6dd", + "version": "3.21.6", + "port-version": 0 + }, { "git-tree": "b66573195da9e32b3396e253b520ad498617405b", "version": "3.21.4", From 3dde7849b9fddf64a9c96b8fe3f0d6c7930cda0e Mon Sep 17 00:00:00 2001 From: Ray Tang <30689714+raytangRT@users.noreply.github.com> Date: Sat, 24 Sep 2022 01:13:27 +0800 Subject: [PATCH 632/791] [capnproto] update capnp version to 0.10.2 (#26936) * update capnp version to 0.10.2 * fix build * Update ports/capnproto/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix after port update * add license * update version * update version Co-authored-by: Ray Tang Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/capnproto/portfile.cmake | 4 ++-- ports/capnproto/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/c-/capnproto.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index a425280b33493c..cb185dcf890fcd 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO capnproto/capnproto - REF v0.9.1 - SHA512 BDC5960F26214139744D768CA4558B085E2D359C375A8849CA532A4C458A2DAF0EE1A1F4D00745DE5ABF353AA1E4084A2D85E5523006F23F591F21FAC2D847FD + REF v0.10.2 + SHA512 079AB715EA19AC207F72BB4874AB6362C11DFB9128342EC937E3F4D27E4100530CF9E6A0275EACA1E45A1BB706B65179A526EA8CFCEBA93BB36CD6C4F1C0CF5B HEAD_REF master ) diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json index 2a2c4f48274c58..85c7d452ca32cc 100644 --- a/ports/capnproto/vcpkg.json +++ b/ports/capnproto/vcpkg.json @@ -1,9 +1,9 @@ { "name": "capnproto", - "version": "0.9.1", - "port-version": 2, + "version": "0.10.2", "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", + "license": "MIT", "supports": "!windows | (!uwp & !arm)", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index d00496a747a76f..22bc60e516306f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1277,8 +1277,8 @@ "port-version": 0 }, "capnproto": { - "baseline": "0.9.1", - "port-version": 2 + "baseline": "0.10.2", + "port-version": 0 }, "capstone": { "baseline": "5.0.0-rc2", diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index 7916de0c00fb71..e92b4d311e624e 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39b6753b801bbb3981ed2622a92c9b1642e11fde", + "version": "0.10.2", + "port-version": 0 + }, { "git-tree": "17b054432f141c746019130d2b689d4fd4919938", "version": "0.9.1", From 20630e616beb864863ed2689ef9a14994f8b43a9 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 23 Sep 2022 11:36:45 -0700 Subject: [PATCH 633/791] Version lock the github actions actions. (#26933) * Version lock the github actions actions. * Work around https://github.com/actions/runner-images/pull/6196 --- .github/workflows/trustedPR.yml | 2 +- .github/workflows/untrustedPR.yml | 4 +++- .github/workflows/validateDocs.yml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/trustedPR.yml b/.github/workflows/trustedPR.yml index ce17ba9d788254..aa9cb6cd1e1c3c 100644 --- a/.github/workflows/trustedPR.yml +++ b/.github/workflows/trustedPR.yml @@ -15,7 +15,7 @@ jobs: comment: permissions: pull-requests: write - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: > ${{ github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' }} diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index ca76f05dbc13ac..4784bc48598d8f 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 @@ -32,6 +32,8 @@ jobs: git --version + export VCPKG_ROOT=. + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files cat .github-pr.changed-manifest-files | while read filename; do grep -q -E '"license": ' "$filename" || echo " - \`$filename\`" || true; done > .github-pr.missing-license diff --git a/.github/workflows/validateDocs.yml b/.github/workflows/validateDocs.yml index aabdb97b08ae48..3a856548080ac6 100644 --- a/.github/workflows/validateDocs.yml +++ b/.github/workflows/validateDocs.yml @@ -7,7 +7,7 @@ on: jobs: validate: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout From 5f6dfcb4d7a240309c79ad725007ad1a7c9e4157 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 23 Sep 2022 12:03:33 -0700 Subject: [PATCH 634/791] [tbb, pagmo2] Update TBB to 2021.5 and update pagmo2 to 2.18.0 (#26284) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [tbb] Update to 2021.3.0 * [tbb] Add Threads dependency * [pagmo2] Update to support new TBB * [openvdb] Update to 8.1.0 * [embree2] Remove from baseline -- it is no longer receiving support from upstream * [usd] Mark as unsupported * [usd] Disable USD in CI due to policy https://github.com/PixarAnimationStudios/USD/issues/1600 * [openvdb] Bump port-version * Update version database * [pagmo2] Fix vcpkg.json * update version * wip update * versions * [embree2] deprecate, [openvdb,usd] resolve conflicts, [tbb] update * Added libxml port. * Remove port version as it's initial port. * Added baseline version * Support only for windows and static * Allowed building debug version * update versions * Update ports/libxpm/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Added new lines * Update ports/libxpm/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update ports/libxpm/portfile.cmake Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Update ports/libxpm/vcpkg.json Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> * Regenerated versions * Update ports/libxpm/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Libxpm is taken from gitlab now. * Dropped changes against master in original repo for libxpm. * Dropped libxpm from baseline * Dropped version for libxpm * Update cpuinfo * Updated date of version * Update version database * Removed support for arm32 & uwp as library is not supporting it. * Version regenerated * Update ports/cpuinfo/vcpkg.json Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Updated versions * Initial commit WIP * Fixed compilation of latest stable version * Dropped comments * Switch from version-string to version * Added versions * Fixed path of cmake files for other projects * Updated versions * Various modernization. * Fully mark embree2 as deprecated. * [pagmo2] Disable -Werror * [cctag] Fix finding and use of TBB. * [openvdb] Baseline the static versions because they exceed FFFFFFFF in size, and I'm not sure if that's fixable.... * [gazebo] Apply https://github.com/osrf/gazebo/pull/3174 patch to fix TBB. * Respond to failures in https://dev.azure.com/vcpkg/public/_build/results?buildId=76586 * [pagmo2] Add license. See https://github.com/esa/pagmo2/blob/19d774fbb6128124305225803f8c1ad9e2f95c8c/src/bfe.cpp#L5-L27 * [tbb] Add license. * [embree2] Add "license". * [tbb] Use vcpkg_cmake_config_fixup and fix version as requested by @LilyWangLL * [usd] Add usd is known broken message. * [embree2] Remove completely. * Fix version database. * Fix usd version database. * Fix wrong case on Linux. * Lowercase the tbb directory to get to their configs. * [cctag] minimize patches * [tbb] Apply supports expression fix suggested in https://github.com/microsoft/vcpkg/pull/26284#discussion_r967427833 * [usd] Add note about upstream issue. * [pagmo2] Minimize patch. Co-authored-by: Robert Schumacher Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Mathis Logemann Co-authored-by: Victor Romero Co-authored-by: Vladimír Aubrecht Co-authored-by: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> --- ports/cctag/0001-fix-osx.patch | 7 +- ports/cctag/0002-find-tbb.patch | 173 +++++++ ports/cctag/portfile.cmake | 5 +- ports/cctag/vcpkg.json | 2 +- ports/embree2/cmake_policy.patch | 14 - ports/embree2/portfile.cmake | 53 --- ports/embree2/vcpkg.json | 15 - ports/gazebo/fix-tbb.patch | 443 ++++++++++++++++++ ports/gazebo/portfile.cmake | 5 +- ports/gazebo/vcpkg.json | 2 +- ports/pagmo2/disable-C4701.patch | 13 - ports/pagmo2/disable-md-override.patch | 20 - ports/pagmo2/disable-werror.patch | 20 + ports/pagmo2/doxygen.patch | 15 + ports/pagmo2/find-tbb.patch | 5 +- ports/pagmo2/portfile.cmake | 33 +- ports/pagmo2/vcpkg.json | 15 +- ports/tbb/CMakeLists.txt | 40 -- ports/tbb/fix-static-build.patch | 13 - ports/tbb/portfile.cmake | 152 +----- .../terminate-when-buildtool-notfound.patch | 13 - ports/tbb/usage | 4 - ports/tbb/vcpkg.json | 16 +- ports/usd/portfile.cmake | 9 + ports/usd/vcpkg.json | 2 +- scripts/ci.baseline.txt | 25 +- versions/baseline.json | 16 +- versions/c-/cctag.json | 5 + versions/g-/gazebo.json | 5 + versions/p-/pagmo2.json | 5 + versions/t-/tbb.json | 5 + versions/u-/usd.json | 5 + 32 files changed, 790 insertions(+), 365 deletions(-) create mode 100644 ports/cctag/0002-find-tbb.patch delete mode 100644 ports/embree2/cmake_policy.patch delete mode 100644 ports/embree2/portfile.cmake delete mode 100644 ports/embree2/vcpkg.json create mode 100644 ports/gazebo/fix-tbb.patch delete mode 100644 ports/pagmo2/disable-C4701.patch delete mode 100644 ports/pagmo2/disable-md-override.patch create mode 100644 ports/pagmo2/disable-werror.patch create mode 100644 ports/pagmo2/doxygen.patch delete mode 100644 ports/tbb/CMakeLists.txt delete mode 100644 ports/tbb/fix-static-build.patch delete mode 100644 ports/tbb/terminate-when-buildtool-notfound.patch delete mode 100644 ports/tbb/usage diff --git a/ports/cctag/0001-fix-osx.patch b/ports/cctag/0001-fix-osx.patch index 8d3f76acfdfb8d..759fd6190c3117 100644 --- a/ports/cctag/0001-fix-osx.patch +++ b/ports/cctag/0001-fix-osx.patch @@ -1,10 +1,11 @@ +diff --git a/src/cctag/utils/Exceptions.hpp b/src/cctag/utils/Exceptions.hpp +index 094d278..8647f76 100644 --- a/src/cctag/utils/Exceptions.hpp +++ b/src/cctag/utils/Exceptions.hpp -@@ -7,7 +7,7 @@ - */ +@@ -8,6 +8,7 @@ #ifndef _CCTAG_EXCEPTIONS_HPP_ #define _CCTAG_EXCEPTIONS_HPP_ -- + +#define _GNU_SOURCE #include #include diff --git a/ports/cctag/0002-find-tbb.patch b/ports/cctag/0002-find-tbb.patch new file mode 100644 index 00000000000000..7badc072f98187 --- /dev/null +++ b/ports/cctag/0002-find-tbb.patch @@ -0,0 +1,173 @@ +diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in +index c5a82c0..3ce4719 100644 +--- a/cmake/Config.cmake.in ++++ b/cmake/Config.cmake.in +@@ -42,6 +42,7 @@ + include(CMakeFindDependencyMacro) + + set(OpenCV_DIR @OpenCV_DIR@) ++find_dependency(TBB) + find_dependency(OpenCV) + find_dependency(Eigen3 @CCTAG_EIGEN_REQUIRED_VERSION@) + find_dependency(Boost 1.66 REQUIRED COMPONENTS @BOOST_REQUIRED_COMPONENTS@) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7b64b83..5398ed4 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -176,7 +176,8 @@ if(CCTAG_WITH_CUDA) + ${OpenCV_LIBS} + Boost::date_time Boost::chrono Boost::thread Boost::serialization Boost::system Boost::filesystem Boost::atomic Boost::program_options Boost::timer Boost::math_c99 + Eigen3::Eigen +- ${TBB_LIBRARIES} ${CUDA_CUDADEVRT_LIBRARY}) ++ TBB::tbb ++ ${CUDA_CUDADEVRT_LIBRARY}) + + if(NOT MSVC) + target_link_libraries(CCTag pthread dl) +@@ -184,7 +185,7 @@ if(CCTAG_WITH_CUDA) + + target_compile_definitions(CCTag + PUBLIC -DCCTAG_WITH_CUDA +- PRIVATE ${TBB_DEFINITIONS}) ++) + + if(CCTAG_HAVE_SHFL_DOWN_SYNC) + target_compile_definitions(CCTag PRIVATE "-DCCTAG_HAVE_SHFL_DOWN_SYNC") +@@ -220,16 +221,13 @@ else() # without CUDA + # get_target_property(testprop CCTag INTERFACE_INCLUDE_DIRECTORIES ) + # message(STATUS "testprop: ${testprop}") + +- target_compile_definitions(CCTag +- PRIVATE ${TBB_DEFINITIONS}) + + target_link_libraries(CCTag + PUBLIC + ${OpenCV_LIBS} + Eigen3::Eigen + Boost::atomic Boost::chrono Boost::date_time Boost::filesystem Boost::serialization Boost::system Boost::thread Boost::timer Boost::math_c99 +- PRIVATE +- ${TBB_LIBRARIES}) ++ TBB::tbb) + + if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + target_link_libraries(CCTag PRIVATE pthread dl) +diff --git a/src/applications/CMakeLists.txt b/src/applications/CMakeLists.txt +index 506d19b..c7154fc 100644 +--- a/src/applications/CMakeLists.txt ++++ b/src/applications/CMakeLists.txt +@@ -86,7 +86,7 @@ target_include_directories(detection PUBLIC + ) + target_link_libraries(detection PUBLIC + CCTag::CCTag +- ${TBB_LIBRARIES} ++ TBB::tbb + ${OpenCV_LIBS} + Boost::filesystem Boost::program_options Boost::timer + ) +diff --git a/src/cctag/Detection.cpp b/src/cctag/Detection.cpp +index 21c47bf..a800fbc 100644 +--- a/src/cctag/Detection.cpp ++++ b/src/cctag/Detection.cpp +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + #ifdef CCTAG_WITH_CUDA + #include // only for debugging + #endif // CCTAG_WITH_CUDA +@@ -71,7 +72,7 @@ static void constructFlowComponentFromSeed( + std::vector & vCandidateLoopOne, + const Parameters & params) + { +- static tbb::mutex G_SortMutex; ++ static std::mutex G_SortMutex; + + assert( seed ); + // Check if the seed has already been processed, i.e. belongs to an already +@@ -102,7 +103,7 @@ static void constructFlowComponentFromSeed( + } + + { +- tbb::mutex::scoped_lock lock(G_SortMutex); ++ std::lock_guard lock(G_SortMutex); + candidate->_averageReceivedVote = (float) (nReceivedVote*nReceivedVote) / (float) nVotedPoints; + auto it = std::lower_bound(vCandidateLoopOne.begin(), vCandidateLoopOne.end(), candidate, + [](const CandidatePtr& c1, const CandidatePtr& c2) { return c1->_averageReceivedVote > c2->_averageReceivedVote; }); +@@ -119,8 +120,8 @@ static void completeFlowComponent( + std::size_t runId, + const Parameters & params) + { +- static tbb::spin_mutex G_UpdateMutex; +- static tbb::mutex G_InsertMutex; ++ static std::mutex G_UpdateMutex; ++ static std::mutex G_InsertMutex; + + try + { +@@ -171,7 +172,7 @@ static void completeFlowComponent( + if (nSegmentCommon == -1) + { + { +- tbb::spin_mutex::scoped_lock lock(G_UpdateMutex); ++ std::lock_guard lock(G_UpdateMutex); + nLabel = nSegmentOut; + ++nSegmentOut; + } +@@ -239,7 +240,7 @@ static void completeFlowComponent( + } + + { +- tbb::mutex::scoped_lock lock(G_InsertMutex); ++ std::lock_guard lock(G_InsertMutex); + vCandidateLoopTwo.push_back(candidate); + } + +@@ -384,7 +385,7 @@ static void cctagDetectionFromEdgesLoopTwoIteration( + float scale, + const Parameters& params) + { +- static tbb::mutex G_InsertMutex; ++ static std::mutex G_InsertMutex; + + const Candidate& candidate = vCandidateLoopTwo[iCandidate]; + +@@ -543,7 +544,7 @@ static void cctagDetectionFromEdgesLoopTwoIteration( + #endif + + { +- tbb::mutex::scoped_lock lock(G_InsertMutex); ++ std::lock_guard lock(G_InsertMutex); + markers.push_back( tag ); // markers takes responsibility for delete + } + #ifdef CCTAG_SERIALIZE +diff --git a/src/cctag/Identification.cpp b/src/cctag/Identification.cpp +index 15c9d9b..99b616a 100644 +--- a/src/cctag/Identification.cpp ++++ b/src/cctag/Identification.cpp +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + #include + +@@ -71,7 +72,7 @@ bool orazioDistanceRobust( + #endif // GRIFF_DEBUG + + const size_t cut_count = cuts.size(); +- static tbb::mutex vscore_mutex; ++ static std::mutex vscore_mutex; + + tbb::parallel_for(size_t(0), cut_count, [&](size_t i) { + const cctag::ImageCut& cut = cuts[i]; +@@ -183,7 +184,7 @@ bool orazioDistanceRobust( + #endif // GRIFF_DEBUG + + { +- tbb::mutex::scoped_lock lock(vscore_mutex); ++ std::lock_guard lock(vscore_mutex); + vScore[idSet.front().first].push_back(idSet.front().second); + } + } diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake index 6b4a4d3aed6f97..a57d142c0dea7b 100644 --- a/ports/cctag/portfile.cmake +++ b/ports/cctag/portfile.cmake @@ -6,8 +6,11 @@ vcpkg_from_github( HEAD_REF develop PATCHES 0001-fix-osx.patch + 0002-find-tbb.patch # Includes changes similar to https://github.com/alicevision/CCTag/pull/178/ ) +file(REMOVE "${SOURCE_PATH}/cmake/FindTBB.cmake" "${SOURCE_PATH}/src/applications/cmake/FindTBB.cmake") + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cuda CCTAG_WITH_CUDA @@ -15,7 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) if("cuda" IN_LIST FEATURES) - include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) + include("${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake") vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") endif() diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json index 184400043093a7..989c99b7d6e5ad 100644 --- a/ports/cctag/vcpkg.json +++ b/ports/cctag/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cctag", "version-semver": "1.0.2", - "port-version": 1, + "port-version": 2, "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", diff --git a/ports/embree2/cmake_policy.patch b/ports/embree2/cmake_policy.patch deleted file mode 100644 index ed4d339e380569..00000000000000 --- a/ports/embree2/cmake_policy.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index afa704d..96dc4f8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,6 +57,9 @@ IF(COMMAND cmake_policy) - if (POLICY CMP0042) - cmake_policy(SET CMP0042 OLD) - endif() -+ if (POLICY CMP0001) -+ cmake_policy(SET CMP0001 OLD) -+ endif() - ENDIF(COMMAND cmake_policy) - - MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY) diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake deleted file mode 100644 index fc1e8384ea7745..00000000000000 --- a/ports/embree2/portfile.cmake +++ /dev/null @@ -1,53 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO embree/embree - REF v2.17.7 - SHA512 3ea548e5ed85f68dc1f9dfe864711f9b731e0df8a2258257f77db08bbdbe3a9014a626313e3ff41174f3b26f09dc8ff523900119ff4c8465bfff53f621052873 - HEAD_REF devel2 - PATCHES - cmake_policy.patch -) - -file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake") - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB) -string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - -DEMBREE_ISPC_SUPPORT=OFF - -DEMBREE_TUTORIALS=OFF - -DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB} - -DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME} - "-DTBB_LIBRARIES=TBB::tbb" - "-DTBB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include" -) - -# just wait, the release build of embree is insanely slow in MSVC -# a single file will took about 2-10 min -vcpkg_cmake_install() -vcpkg_copy_pdbs() - -# these cmake files do not seem to contain helpful configuration for find libs, just remove them -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/uninstall.command" "${CURRENT_PACKAGES_DIR}/debug/uninstall.command") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/models") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/models") - -if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") -endif() - -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/embree2") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/embree2/doc") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json deleted file mode 100644 index e89bc2b2edc284..00000000000000 --- a/ports/embree2/vcpkg.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "embree2", - "version-semver": "2.17.7", - "port-version": 4, - "description": "High Performance Ray Tracing Kernels.", - "homepage": "https://github.com/embree/embree", - "supports": "!arm", - "dependencies": [ - "tbb", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/ports/gazebo/fix-tbb.patch b/ports/gazebo/fix-tbb.patch new file mode 100644 index 00000000000000..b494c93bc7615a --- /dev/null +++ b/ports/gazebo/fix-tbb.patch @@ -0,0 +1,443 @@ +diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake +index af56ee4..8583740 100644 +--- a/cmake/SearchForStuff.cmake ++++ b/cmake/SearchForStuff.cmake +@@ -301,7 +301,7 @@ if (PKG_CONFIG_FOUND) + + ################################################# + # Find TBB +- pkg_check_modules(TBB tbb<2021) ++ pkg_check_modules(TBB tbb) + set (TBB_PKG_CONFIG "tbb") + if (NOT TBB_FOUND) + message(STATUS "TBB not found, attempting to detect manually") +@@ -325,6 +325,12 @@ if (PKG_CONFIG_FOUND) + endif(tbb_library) + endif (NOT TBB_FOUND) + endif (NOT TBB_FOUND) ++ set(HAVE_TBB_GREATER_OR_EQUAL_2021 OFF) ++ if (DEFINED TBB_VERSION AND NOT ${TBB_VERSION} STREQUAL "") ++ if (${TBB_VERSION} VERSION_GREATER_EQUAL "2021.0") ++ set(HAVE_TBB_GREATER_OR_EQUAL_2021 ON) ++ endif() ++ endif() + + ################################################# + # Find OGRE +diff --git a/cmake/gazebo-config.cmake.in b/cmake/gazebo-config.cmake.in +index 36bb341..6bb8e51 100644 +--- a/cmake/gazebo-config.cmake.in ++++ b/cmake/gazebo-config.cmake.in +@@ -223,3 +223,11 @@ list(APPEND @PKG_NAME@_LIBRARIES ${IGNITION-FUEL_TOOLS_LIBRARIES}) + list(APPEND @PKG_NAME@_LDFLAGS -Wl,-rpath,${GAZEBO_INSTALL_LIB_DIR}/gazebo-@GAZEBO_MAJOR_VERSION@/plugins) + list(APPEND @PKG_NAME@_LDFLAGS -L${GAZEBO_INSTALL_LIB_DIR}) + list(APPEND @PKG_NAME@_LDFLAGS -L${GAZEBO_INSTALL_LIB_DIR}/gazebo-@GAZEBO_MAJOR_VERSION@/plugins) ++ ++set (GAZEBO_HAS_TBB_GREATER_OR_EQUAL_2021 @HAVE_TBB_GREATER_OR_EQUAL_2021@) ++if (GAZEBO_HAS_TBB_GREATER_OR_EQUAL_2021) ++ find_package(TBB CONFIG) ++ if (TARGET tbb::tbb) ++ list(APPEND @PKG_NAME@_LIBRARIES TBB::tbb) ++ endif () ++endif () +diff --git a/gazebo/transport/CMakeLists.txt b/gazebo/transport/CMakeLists.txt +index 8e59020..a72d49b 100644 +--- a/gazebo/transport/CMakeLists.txt ++++ b/gazebo/transport/CMakeLists.txt +@@ -29,6 +29,7 @@ set (headers + SubscribeOptions.hh + Subscriber.hh + SubscriptionTransport.hh ++ TaskGroup.hh + TopicManager.hh + TransportIface.hh + TransportTypes.hh +@@ -70,6 +71,12 @@ if (WIN32) + target_link_libraries(gazebo_transport ws2_32 Iphlpapi) + endif() + ++if(${CMAKE_VERSION} VERSION_LESS "3.13.0") ++ link_directories(${TBB_LIBRARY_DIRS}) ++else() ++ target_link_directories(gazebo_transport PUBLIC ${TBB_LIBRARY_DIRS}) ++endif() ++ + if (USE_PCH) + add_pch(gazebo_transport transport_pch.hh ${Boost_PKGCONFIG_CFLAGS} "-I${PROTOBUF_INCLUDE_DIR}" "-I${TBB_INCLUDEDIR}") + endif() +diff --git a/gazebo/transport/Connection.hh b/gazebo/transport/Connection.hh +index 0e7d88a..cbcd7af 100644 +--- a/gazebo/transport/Connection.hh ++++ b/gazebo/transport/Connection.hh +@@ -17,7 +17,16 @@ + #ifndef _CONNECTION_HH_ + #define _CONNECTION_HH_ + ++#undef emit + #include ++#define emit ++ ++// If TBB_VERSION_MAJOR is not defined, this means that ++// tbb >= 2021 and we can include the tbb/version.h header ++#ifndef TBB_VERSION_MAJOR ++#include ++#endif ++ + #include + + #include +@@ -37,6 +46,9 @@ + #include "gazebo/common/Console.hh" + #include "gazebo/common/Exception.hh" + #include "gazebo/common/WeakBind.hh" ++#if TBB_VERSION_MAJOR >= 2021 ++#include "gazebo/transport/TaskGroup.hh" ++#endif + #include "gazebo/util/system.hh" + + #define HEADER_LENGTH 8 +@@ -54,7 +66,11 @@ namespace gazebo + /// \cond + /// \brief A task instance that is created when data is read from + /// a socket and used by TBB ++#if TBB_VERSION_MAJOR < 2021 + class GZ_TRANSPORT_VISIBLE ConnectionReadTask : public tbb::task ++#else ++ class GZ_TRANSPORT_VISIBLE ConnectionReadTask ++#endif + { + /// \brief Constructor + /// \param[_in] _func Boost function pointer, which is the function +@@ -68,6 +84,7 @@ namespace gazebo + { + } + ++#if TBB_VERSION_MAJOR < 2021 + /// \bried Overridden function from tbb::task that exectues the data + /// callback. + public: tbb::task *execute() +@@ -75,6 +92,11 @@ namespace gazebo + this->func(this->data); + return NULL; + } ++#else ++ /// \brief Execute the data callback ++ public: void operator()() const ++ { this->func(this->data); } ++#endif + + /// \brief The boost function pointer + private: boost::function func; +@@ -310,12 +332,16 @@ namespace gazebo + + if (!_e && !transport::is_stopped()) + { ++#if TBB_VERSION_MAJOR < 2021 + ConnectionReadTask *task = new(tbb::task::allocate_root()) + ConnectionReadTask(boost::get<0>(_handler), data); + tbb::task::enqueue(*task); + + // Non-tbb version: + // boost::get<0>(_handler)(data); ++#else ++ this->taskGroup.run(boost::get<0>(_handler), data); ++#endif + } + } + +@@ -465,6 +491,11 @@ namespace gazebo + + /// \brief True if the connection is open. + private: bool isOpen; ++ ++#if TBB_VERSION_MAJOR >= 2021 ++ /// \brief For managing asynchronous tasks with tbb ++ private: TaskGroup taskGroup; ++#endif + }; + /// \} + } +diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc +index b0546e5..17016a4 100644 +--- a/gazebo/transport/ConnectionManager.cc ++++ b/gazebo/transport/ConnectionManager.cc +@@ -27,6 +27,7 @@ + using namespace gazebo; + using namespace transport; + ++#if TBB_VERSION_MAJOR < 2021 + /// TBB task to process nodes. + class TopicManagerProcessTask : public tbb::task + { +@@ -37,20 +38,30 @@ class TopicManagerProcessTask : public tbb::task + return NULL; + } + }; ++#endif + + /// TBB task to establish subscriber to publisher connection. ++#if TBB_VERSION_MAJOR < 2021 + class TopicManagerConnectionTask : public tbb::task ++#else ++class TopicManagerConnectionTask ++#endif + { + /// \brief Constructor. + /// \param[in] _pub Publish message + public: explicit TopicManagerConnectionTask(msgs::Publish _pub) : pub(_pub) {} + + /// Implements the necessary execute function ++#if TBB_VERSION_MAJOR < 2021 + public: tbb::task *execute() + { + TopicManager::Instance()->ConnectSubToPub(pub); + return NULL; + } ++#else ++ public: void operator()() const ++ { TopicManager::Instance()->ConnectSubToPub(pub); } ++#endif + + /// \brief Publish message + private: msgs::Publish pub; +@@ -273,11 +284,6 @@ void ConnectionManager::RunUpdate() + if (this->masterConn) + this->masterConn->ProcessWriteQueue(); + +- // Use TBB to process nodes. Need more testing to see if this makes +- // a difference. +- // TopicManagerProcessTask *task = new(tbb::task::allocate_root()) +- // TopicManagerProcessTask(); +- // tbb::task::enqueue(*task); + boost::recursive_mutex::scoped_lock lock(this->connectionMutex); + + TopicManager::Instance()->ProcessNodes(); +@@ -403,9 +409,13 @@ void ConnectionManager::ProcessMessage(const std::string &_data) + if (pub.host() != this->serverConn->GetLocalAddress() || + pub.port() != this->serverConn->GetLocalPort()) + { ++#if TBB_VERSION_MAJOR < 2021 + TopicManagerConnectionTask *task = new(tbb::task::allocate_root()) + TopicManagerConnectionTask(pub); + tbb::task::enqueue(*task); ++#else ++ this->taskGroup.run(pub); ++#endif + } + } + // publisher_subscribe. This occurs when we try to subscribe to a topic, and +diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh +index ef80eaf..6dc212b 100644 +--- a/gazebo/transport/ConnectionManager.hh ++++ b/gazebo/transport/ConnectionManager.hh +@@ -27,8 +27,11 @@ + #include "gazebo/msgs/msgs.hh" + #include "gazebo/common/SingletonT.hh" + +-#include "gazebo/transport/Publisher.hh" + #include "gazebo/transport/Connection.hh" ++#include "gazebo/transport/Publisher.hh" ++#if TBB_VERSION_MAJOR >= 2021 ++#include "gazebo/transport/TaskGroup.hh" ++#endif + #include "gazebo/util/system.hh" + + /// \brief Explicit instantiation for typed SingletonT. +@@ -194,6 +197,11 @@ namespace gazebo + /// \brief Condition used for synchronization + private: boost::condition_variable namespaceCondition; + ++#if TBB_VERSION_MAJOR >= 2021 ++ /// \brief For managing asynchronous tasks with tbb ++ private: TaskGroup taskGroup; ++#endif ++ + // Singleton implementation + private: friend class SingletonT; + }; +diff --git a/gazebo/transport/Node.hh b/gazebo/transport/Node.hh +index b7d37f7..7248b72 100644 +--- a/gazebo/transport/Node.hh ++++ b/gazebo/transport/Node.hh +@@ -18,7 +18,12 @@ + #ifndef GAZEBO_TRANSPORT_NODE_HH_ + #define GAZEBO_TRANSPORT_NODE_HH_ + ++#undef emit + #include ++#define emit ++#ifndef TBB_VERSION_MAJOR ++#include ++#endif + #include + #include + #include +@@ -26,6 +31,9 @@ + #include + #include + ++#if TBB_VERSION_MAJOR >= 2021 ++#include "gazebo/transport/TaskGroup.hh" ++#endif + #include "gazebo/transport/TransportTypes.hh" + #include "gazebo/transport/TopicManager.hh" + #include "gazebo/util/system.hh" +@@ -36,7 +44,11 @@ namespace gazebo + { + /// \cond + /// \brief Task used by Node::Publish to publish on a one-time publisher ++#if TBB_VERSION_MAJOR < 2021 + class GZ_TRANSPORT_VISIBLE PublishTask : public tbb::task ++#else ++ class GZ_TRANSPORT_VISIBLE PublishTask ++#endif + { + /// \brief Constructor + /// \param[in] _pub Publisher to publish the message on. +@@ -49,16 +61,23 @@ namespace gazebo + this->msg->CopyFrom(_message); + } + ++#if TBB_VERSION_MAJOR < 2021 + /// \brief Overridden function from tbb::task that exectues the + /// publish task. + public: tbb::task *execute() ++#else ++ /// \brief Executes the publish task. ++ public: void operator()() const ++#endif + { + this->pub->WaitForConnection(); + this->pub->Publish(*this->msg, true); + this->pub->SendMessage(); + delete this->msg; ++#if TBB_VERSION_MAJOR < 2021 + this->pub.reset(); + return NULL; ++#endif + } + + /// \brief Pointer to the publisher. +@@ -159,11 +178,15 @@ namespace gazebo + const google::protobuf::Message &_message) + { + transport::PublisherPtr pub = this->Advertise(_topic); ++#if TBB_VERSION_MAJOR < 2021 + PublishTask *task = new(tbb::task::allocate_root()) + PublishTask(pub, _message); + + tbb::task::enqueue(*task); + return; ++#else ++ this->taskGroup.run(pub, _message); ++#endif + } + + /// \brief Advertise a topic +@@ -420,6 +443,10 @@ namespace gazebo + + /// \brief List of newly arrive messages + private: std::map > incomingMsgsLocal; ++#if TBB_VERSION_MAJOR >= 2021 ++ /// \brief For managing asynchronous tasks with tbb ++ private: TaskGroup taskGroup; ++#endif + + private: boost::mutex publisherMutex; + private: boost::mutex publisherDeleteMutex; +diff --git a/gazebo/transport/TaskGroup.hh b/gazebo/transport/TaskGroup.hh +new file mode 100644 +index 0000000..b95b5d8 +--- /dev/null ++++ b/gazebo/transport/TaskGroup.hh +@@ -0,0 +1,47 @@ ++/* ++ * Copyright (C) 2021 Open Source Robotics Foundation ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ * ++*/ ++#ifndef GAZEBO_TRANSPORT_TASKGROUP_HH_ ++#define GAZEBO_TRANSPORT_TASKGROUP_HH_ ++ ++#include ++ ++// Emit is both a macro in Qt and a function defined by tbb ++#undef emit ++#include ++#define emit ++ ++namespace gazebo { ++ namespace transport { ++ class TaskGroup ++ { ++ public: ~TaskGroup() noexcept ++ { ++ // Wait for running tasks to finish ++ this->taskGroup.wait(); ++ } ++ ++ public: template void run(Args&&... args) ++ { ++ this->taskGroup.run(Functor(std::forward(args)...)); ++ } ++ ++ private: tbb::task_group taskGroup; ++ }; ++ } ++} ++ ++#endif +diff --git a/gazebo/transport/transport_pch.hh b/gazebo/transport/transport_pch.hh +index 0119d40..f288de2 100644 +--- a/gazebo/transport/transport_pch.hh ++++ b/gazebo/transport/transport_pch.hh +@@ -21,6 +21,7 @@ + * To get a starting list for this file, I use the command: + * grep --include="*.hh" --include="*.cc" --no-filename -r "#include <" | sort -u + */ ++ + #include + #include + #include +@@ -44,8 +45,18 @@ + #include + #include + #include ++#include ++#ifndef TBB_VERSION_MAJOR ++#include ++#endif ++#if TBB_VERSION_MAJOR < 2021 + #include + #include + #include ++#else ++#undef emit ++#include ++#define emit ++#endif + #include + #include +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 5f2c112..6d09a11 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -49,6 +49,7 @@ target_link_libraries(gz + gazebo_gui + gazebo_physics + gazebo_sensors ++ gazebo_transport + ${Qt5Core_LIBRARIES} + ${Qt5Widgets_LIBRARIES} + ${Boost_LIBRARIES} diff --git a/ports/gazebo/portfile.cmake b/ports/gazebo/portfile.cmake index 40de3b16bff7d3..bc85591128a089 100644 --- a/ports/gazebo/portfile.cmake +++ b/ports/gazebo/portfile.cmake @@ -12,7 +12,8 @@ vcpkg_from_github( HEAD_REF gazebo11 PATCHES 0001-Fix-deps.patch - ${gazebo3211} + "${gazebo3211}" + fix-tbb.patch # Effectively https://github.com/osrf/gazebo/pull/3174 with merge conflict resolutions ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -33,7 +34,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON - -DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX} + "-DPKG_CONFIG_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF # Not enabled by default, but to be sure ) diff --git a/ports/gazebo/vcpkg.json b/ports/gazebo/vcpkg.json index 30b8dac5baac5b..6daf4a7a013441 100644 --- a/ports/gazebo/vcpkg.json +++ b/ports/gazebo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gazebo", "version-date": "2022-01-20", - "port-version": 3, + "port-version": 4, "description": "Open source robotics simulator.", "homepage": "http://gazebosim.org", "license": "Apache-2.0", diff --git a/ports/pagmo2/disable-C4701.patch b/ports/pagmo2/disable-C4701.patch deleted file mode 100644 index 05ed75bd2dc005..00000000000000 --- a/ports/pagmo2/disable-C4701.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96653ba..1afaafa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,7 +80,7 @@ endif() - if(YACMA_COMPILER_IS_MSVC) - # Disable the idiotic minmax macros on MSVC, some annoying warnings, - # enable the bigobj option and the WIN32_LEAN_AND_MEAN definition. -- list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") -+ list(APPEND PAGMO_CXX_FLAGS_DEBUG "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/wd4701" "/bigobj" "-DWIN32_LEAN_AND_MEAN") - list(APPEND PAGMO_CXX_FLAGS_RELEASE "-DNOMINMAX" "/wd4459" "/wd4127" "/wd4702" "/wd4251" "/bigobj" "-DWIN32_LEAN_AND_MEAN") - # Enable strict conformance mode, if supported. - set(CMAKE_REQUIRED_QUIET TRUE) diff --git a/ports/pagmo2/disable-md-override.patch b/ports/pagmo2/disable-md-override.patch deleted file mode 100644 index a5e09d3fa3bb11..00000000000000 --- a/ports/pagmo2/disable-md-override.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96653ba..549d9d4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -141,6 +141,7 @@ endif() - # Boost setup. - include(PagmoFindBoost) - -+if(0) - # Explanation: on MSVC, when building static libraries, it is good practice to link - # to the static runtime. CMake, however, is hard-coded to link to the dynamic runtime. - # Hence we hackishly replace the /MD flag with /MT. This is the approach suggested -@@ -161,6 +162,7 @@ if(YACMA_COMPILER_IS_MSVC AND PAGMO_BUILD_STATIC_LIBRARY) - endif() - endforeach() - endif() -+endif() - - # List of source files. - set(PAGMO_SRC_FILES diff --git a/ports/pagmo2/disable-werror.patch b/ports/pagmo2/disable-werror.patch new file mode 100644 index 00000000000000..bc5ba11b305a7f --- /dev/null +++ b/ports/pagmo2/disable-werror.patch @@ -0,0 +1,20 @@ +diff --git a/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake b/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake +index 7d7aa1b..81c8bf6 100644 +--- a/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake ++++ b/cmake_modules/yacma/YACMACompilerLinkerSettings.cmake +@@ -95,7 +95,6 @@ if(NOT _YACMACompilerLinkerSettingsRun) + # NOTE: enable unconditionally, as it seems like the CMake + # machinery for detecting this fails. Perhaps the source code + # used for checking the flag emits warnings? +- list(APPEND _YACMA_CXX_FLAGS_DEBUG "-Werror") + # New warnings in clang 8. + # NOTE: a few issues with macros here, let's disable for now. + # _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(-Wextra-semi-stmt) +@@ -180,7 +179,6 @@ if(NOT _YACMACompilerLinkerSettingsRun) + # Enable higher warning level than usual. + _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(/W4) + # Treat warnings as errors. +- _YACMA_CHECK_ENABLE_DEBUG_CXX_FLAG(/WX) + endif() + + # Set the cache variables. diff --git a/ports/pagmo2/doxygen.patch b/ports/pagmo2/doxygen.patch new file mode 100644 index 00000000000000..1a59a9110c7d0c --- /dev/null +++ b/ports/pagmo2/doxygen.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 34bad69..dfb942d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -398,8 +398,8 @@ endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in" "${CMAKE_CURRENT_BINARY_DIR}/include/pagmo/config.hpp" @ONLY) + + # Configure the doc files. +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile" @ONLY) +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py" @ONLY) ++# configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/doxygen/Doxyfile" @ONLY) ++# configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py.in" "${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/conf.py" @ONLY) + + # This is just a simple counter variable, internal use only. + set(_PAGMO_TEST_NUM "0") diff --git a/ports/pagmo2/find-tbb.patch b/ports/pagmo2/find-tbb.patch index 8781910f8aae5c..56d998e3e72ab2 100644 --- a/ports/pagmo2/find-tbb.patch +++ b/ports/pagmo2/find-tbb.patch @@ -2,11 +2,12 @@ diff --git a/pagmo-config.cmake.in b/pagmo-config.cmake.in index 9553fc8..cb5e90b 100644 --- a/pagmo-config.cmake.in +++ b/pagmo-config.cmake.in -@@ -8,6 +8,7 @@ set(THREADS_PREFER_PTHREAD_FLAG YES) +@@ -8,6 +8,8 @@ set(THREADS_PREFER_PTHREAD_FLAG YES) find_package(Threads REQUIRED) unset(THREADS_PREFER_PTHREAD_FLAG) include(PagmoFindBoost) -+find_package(TBB REQUIRED) ++include(CMakeFindDependencyMacro) ++find_dependency(TBB CONFIG) @_PAGMO_CONFIG_OPTIONAL_DEPS@ # Restore original module path. set(CMAKE_MODULE_PATH "${_PAGMO_CONFIG_OLD_MODULE_PATH}") diff --git a/ports/pagmo2/portfile.cmake b/ports/pagmo2/portfile.cmake index a709a2fb6a61e5..a221745543d8aa 100644 --- a/ports/pagmo2/portfile.cmake +++ b/ports/pagmo2/portfile.cmake @@ -1,36 +1,37 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO esa/pagmo2 - REF v2.16.1 - SHA512 dac85a8525316e827df809d187d40f14dc20db7119796b7384d7855f83ba37e0bb595f6d8199053aac857460816929dd599c9d43802f2ed920a6f42dd2f16a03 + REPO esa/pagmo2 + REF v2.18.0 + SHA512 026f038e979bb884bdc4e465bd60ffe60d3d74d38159a70897da7c890230450a0457a943e25c8bdb3f17bafdaa388a6a21f6d44502b4d08860dae6cb4e75a477 HEAD_REF master PATCHES - "disable-C4701.patch" - "disable-md-override.patch" - "find-tbb.patch" + doxygen.patch + find-tbb.patch + disable-werror.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - nlopt PAGMO_WITH_NLOPT + nlopt PAGMO_WITH_NLOPT ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAGMO_BUILD_STATIC_LIBRARY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DPAGMO_BUILD_TESTS=OFF + -DPAGMO_BUILD_BENCHMARKS=OFF + -DPAGMO_BUILD_TUTORIALS=OFF -DPAGMO_WITH_EIGEN3=ON -DPAGMO_BUILD_STATIC_LIBRARY=${PAGMO_BUILD_STATIC_LIBRARY} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pagmo) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/pagmo") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -file(INSTALL ${SOURCE_PATH}/COPYING.lgpl3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.lgpl3" "${SOURCE_PATH}/COPYING.gpl3") diff --git a/ports/pagmo2/vcpkg.json b/ports/pagmo2/vcpkg.json index 4e491b4969ef1f..a177b2df3bade7 100644 --- a/ports/pagmo2/vcpkg.json +++ b/ports/pagmo2/vcpkg.json @@ -1,14 +1,23 @@ { "name": "pagmo2", - "version": "2.16.1", - "description": "A C++ platform to perform parallel computations of optimisation tasks (global and local) via the asynchronous generalized island model.", + "version": "2.18.0", + "description": "A C++ platform to perform parallel computations of optimization tasks (global and local) via the asynchronous generalized island model.", "homepage": "https://esa.github.io/pagmo2/", + "license": "GPL-3.0-or-later OR LGPL-3.0-or-later", "dependencies": [ "boost-any", "boost-graph", "boost-serialization", "eigen3", - "tbb" + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "nlopt": { diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt deleted file mode 100644 index ae53c40f2a6251..00000000000000 --- a/ports/tbb/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -project(tbb CXX) - -file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*) -file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src) - -include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED) -if(NOT BUILD_SHARED_LIBS) - set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc) -endif() -if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - set(FORWARD_SDK_ROOT "SDKROOT=${CMAKE_OSX_SYSROOT}") - if(CMAKE_OSX_ARCHITECTURES STREQUAL "arm64") - set(arch "arch=arm64") - endif() -endif() - -if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL CMAKE_SYSTEM_PROCESSOR) - set(arch "arch=${CMAKE_SYSTEM_PROCESSOR}") - if(CMAKE_CXX_COMPILER) - set(CPLUS "CPLUS=${CMAKE_CXX_COMPILER}") - endif() - if(CMAKE_C_COMPILER) - set(CONLY "CONLY=${CMAKE_C_COMPILER}") - endif() - endif() -endif() - -tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) - -set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir) -if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(SUBDIR "${SUBDIR}_release") -else() - set(SUBDIR "${SUBDIR}_debug") -endif() - -file(GLOB OUTPUTS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*) - -install(FILES ${OUTPUTS} DESTINATION lib) diff --git a/ports/tbb/fix-static-build.patch b/ports/tbb/fix-static-build.patch deleted file mode 100644 index 18f3e2b493f95f..00000000000000 --- a/ports/tbb/fix-static-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/tbb/cilk-tbb-interop.h b/src/tbb/cilk-tbb-interop.h -index 295734b..f35531e 100644 ---- a/src/tbb/cilk-tbb-interop.h -+++ b/src/tbb/cilk-tbb-interop.h -@@ -29,6 +29,8 @@ - #else - #ifdef IN_CILK_RUNTIME - #define CILK_EXPORT __declspec(dllexport) -+#elif defined(IN_CILK_STATIC) -+#define CILK_EXPORT /* nothing */ - #else - #define CILK_EXPORT __declspec(dllimport) - #endif // IN_CILK_RUNTIME diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index e826081f8cdf25..c6a46dee1b0958 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -3,136 +3,36 @@ set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneTBB - REF eca91f16d7490a8abfdee652dadf457ec820cc37 # 2020_U3 - SHA512 7144e1dc68304b5358e6ea330431b6f0c61fadb147efa353a5b242777d6fabf7b8cf99b79cffb51b49b911dd17a9f1879619d6eebdf319f23ec3235c89cffc25 - HEAD_REF tbb_2019 - PATCHES - fix-static-build.patch - terminate-when-buildtool-notfound.patch + REF v2021.5.0 + SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46 + HEAD_REF onetbb_2021 ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -if (NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - ) - - vcpkg_install_cmake() - - # Settings for TBBConfigInternal.cmake.in - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(TBB_LIB_EXT a) - else() - if (VCPKG_TARGET_IS_LINUX) - set(TBB_LIB_EXT "so.2") - elseif(VCPKG_TARGET_IS_OSX) - set(TBB_LIB_EXT "dylib") - else() - set(TBB_LIB_EXT "so") - endif() - endif() - set(TBB_LIB_PREFIX lib) -else() - if (VCPKG_CRT_LINKAGE STREQUAL static) - set(RELEASE_CONFIGURATION Release-MT) - set(DEBUG_CONFIGURATION Debug-MT) - else() - set(RELEASE_CONFIGURATION Release) - set(DEBUG_CONFIGURATION Debug) - endif() - - macro(CONFIGURE_PROJ_FILE arg) - set(CONFIGURE_FILE_NAME ${arg}) - set(CONFIGURE_BAK_FILE_NAME ${arg}.bak) - if (NOT EXISTS ${CONFIGURE_BAK_FILE_NAME}) - configure_file(${CONFIGURE_FILE_NAME} ${CONFIGURE_BAK_FILE_NAME} COPYONLY) - endif() - configure_file(${CONFIGURE_BAK_FILE_NAME} ${CONFIGURE_FILE_NAME} COPYONLY) - file(READ ${CONFIGURE_FILE_NAME} SLN_CONFIGURE) - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - string(REPLACE "DynamicLibrary<\/ConfigurationType>" - "StaticLibrary<\/ConfigurationType>" SLN_CONFIGURE "${SLN_CONFIGURE}") - string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" - "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_STATIC" SLN_CONFIGURE "${SLN_CONFIGURE}") - else() - string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" - "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}") - endif() - file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}") - endmacro() - - CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbb.vcxproj) - CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc.vcxproj) - CONFIGURE_PROJ_FILE(${SOURCE_PATH}/build/vs2013/tbbmalloc_proxy.vcxproj) - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH build/vs2013/makefile.sln - RELEASE_CONFIGURATION ${RELEASE_CONFIGURATION} - DEBUG_CONFIGURATION ${DEBUG_CONFIGURATION} - ) - # Settings for TBBConfigInternal.cmake.in - set(TBB_LIB_EXT lib) - set(TBB_LIB_PREFIX) -endif() - -file(COPY - ${SOURCE_PATH}/include/tbb - ${SOURCE_PATH}/include/serial - DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -# Settings for TBBConfigInternal.cmake.in -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc) -else() - set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc tbbmalloc_proxy) -endif() - -file(READ "${SOURCE_PATH}/include/tbb/tbb_stddef.h" _tbb_stddef) -string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}") -string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}") -string(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" TBB_INTERFACE_VERSION "${_tbb_stddef}") -set(TBB_VERSION "${_tbb_ver_major}.${_tbb_ver_minor}") -set(TBB_RELEASE_DIR "\${_tbb_root}/lib") -set(TBB_DEBUG_DIR "\${_tbb_root}/debug/lib") - -configure_file( - ${SOURCE_PATH}/cmake/templates/TBBConfigInternal.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake - @ONLY +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTBB_TEST=OFF + -DTBB_STRICT=OFF ) -configure_file( - ${SOURCE_PATH}/cmake/templates/TBBConfigVersion.cmake.in - ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfigVersion.cmake - @ONLY -) - -file(READ ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake _contents) -string(REPLACE - "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" - "get_filename_component(_tbb_root \"\${_tbb_root}\" PATH)\nget_filename_component(_tbb_root \"\${_tbb_root}\" PATH)" - _contents - "${_contents}" -) -string(REPLACE - "set(_tbb_release_lib \"/${TBB_LIB_PREFIX}" - "set(_tbb_release_lib \"\${_tbb_root}/lib/${TBB_LIB_PREFIX}" - _contents - "${_contents}" -) -string(REPLACE - "set(_tbb_debug_lib \"/${TBB_LIB_PREFIX}" - "set(_tbb_debug_lib \"\${_tbb_root}/debug/lib/${TBB_LIB_PREFIX}" - _contents - "${_contents}" +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/TBB") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/share/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + # These are duplicate libraries provided on Windows -- users should use the tbb12 libraries instead + "${CURRENT_PACKAGES_DIR}/lib/tbb.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/tbb_debug.lib" ) -string(REPLACE "SHARED IMPORTED)" "UNKNOWN IMPORTED)" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake "${_contents}") +file(READ "${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake" _contents) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/tbb/TBBConfig.cmake" " +include(CMakeFindDependencyMacro) +find_dependency(Threads) +${_contents}") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/tbb) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tbb/terminate-when-buildtool-notfound.patch b/ports/tbb/terminate-when-buildtool-notfound.patch deleted file mode 100644 index 9599b48cd09116..00000000000000 --- a/ports/tbb/terminate-when-buildtool-notfound.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/TBBBuild.cmake b/cmake/TBBBuild.cmake -index a2222e3..756d85c 100644 ---- a/cmake/TBBBuild.cmake -+++ b/cmake/TBBBuild.cmake -@@ -158,7 +158,7 @@ function(tbb_build) - mark_as_advanced(TBB_MAKE_TOOL) - - if (NOT TBB_MAKE_TOOL) -- message(STATUS "Intel TBB can not be built: required make-tool (${make_tool_name}) was not found") -+ message(FATAL_ERROR "Intel TBB can not be built: required make-tool (${make_tool_name}) was not found") - set(${tbb_build_CONFIG_DIR} ${tbb_build_CONFIG_DIR}-NOTFOUND PARENT_SCOPE) - return() - endif() diff --git a/ports/tbb/usage b/ports/tbb/usage deleted file mode 100644 index ecea9834c9a140..00000000000000 --- a/ports/tbb/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package tbb provides CMake targets: - - find_package(TBB CONFIG REQUIRED) - target_link_libraries(main PRIVATE TBB::tbb) diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json index 09ab4cd1e33b52..32a12b26f3cd8e 100644 --- a/ports/tbb/vcpkg.json +++ b/ports/tbb/vcpkg.json @@ -1,8 +1,18 @@ { "name": "tbb", - "version-string": "2020_U3", - "port-version": 8, + "version": "2021.5.0", "description": "Intel's Threading Building Blocks.", "homepage": "https://github.com/01org/tbb", - "supports": "!(uwp | arm | arm64) | linux | osx" + "license": "Apache-2.0", + "supports": "(windows & !uwp) | linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index 58d328ea87db75..b1eda984b3bf54 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -1,6 +1,15 @@ # Don't file if the bin folder exists. We need exe and custom files. SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) +message(STATUS [=[ +The usd port does not work the the version of Threading Building Blocks (tbb) currently chosen by vcpkg's baselines, +and does not expect to be updated to work with current versions soon. See +https://github.com/PixarAnimationStudios/USD/issues/1600 + +If you must use this port in your project, pin a version of tbb of 2020_U3 or older via a manifest file. +See https://vcpkg.io/en/docs/examples/versioning.getting-started.html for instructions. +]=]) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/USD diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index dd308fe5d8a1be..55dd4cc3e5f0aa 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "usd", "version-string": "20.08", - "port-version": 2, + "port-version": 3, "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", "homepage": "https://github.com/PixarAnimationStudios/USD", "supports": "!x86", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c4f36f301477d5..4827d11b08dd41 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -222,15 +222,6 @@ ecsutil:x64-uwp=fail # Checks for gnu extension so only works with gcc. elfutils:x64-osx=fail elfutils:arm64-osx=fail -# embree creates common conflicting static library names when built in static mode, reported upstream: -# https://github.com/embree/embree/issues/331 -embree2:x64-windows-static=skip -embree2:x64-windows-static-md=skip -# embree2 conflicts with embree3 -embree2:x64-linux=skip -embree2:x64-osx=skip -embree2:arm64-osx=skip -embree2:arm64-osx=skip epsilon:arm-uwp=fail epsilon:x64-uwp=fail faiss:arm64-windows=fail @@ -813,7 +804,10 @@ openmesh:arm-uwp=fail openmesh:x64-uwp=fail openscap:x64-windows-static=fail openscap:x64-osx=fail -openscap:arm64-osx=fail +# https://github.com/AcademySoftwareFoundation/openvdb/issues/1362 +# openvdb\openvdb\libopenvdb.lib : fatal error LNK1248: image size (109A36020) exceeds maximum allowable size (FFFFFFFF) +openvdb:x64-windows-static=fail +openvdb:x64-windows-static-md=fail openvpn3:x64-osx=fail openvpn3:arm64-osx=fail openvr:arm64-windows=fail @@ -1142,7 +1136,16 @@ unicorn-lib:x64-uwp=fail unittest-cpp:arm64-windows=fail unittest-cpp:arm-uwp=fail unittest-cpp:x64-uwp=fail -usd:x86-windows=fail +# USD has set official policy that they will not update to be compatible with TBB in the near term (https://github.com/PixarAnimationStudios/USD/issues/1600) +usd:arm64-windows=skip +usd:arm-uwp=skip +usd:x64-uwp=skip +usd:x64-windows=skip +usd:x64-windows-static=skip +usd:x64-windows-static-md=skip +usd:x64-linux=skip +usd:x64-osx=skip +usd:x86-windows=skip uthenticode:arm-uwp=fail uthenticode:x64-uwp=fail v8:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 22bc60e516306f..8215bf817de877 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1322,7 +1322,7 @@ }, "cctag": { "baseline": "1.0.2", - "port-version": 1 + "port-version": 2 }, "cctz": { "baseline": "2.3", @@ -2128,10 +2128,6 @@ "baseline": "0.186", "port-version": 4 }, - "embree2": { - "baseline": "2.17.7", - "port-version": 4 - }, "embree3": { "baseline": "3.12.2", "port-version": 2 @@ -2514,7 +2510,7 @@ }, "gazebo": { "baseline": "2022-01-20", - "port-version": 3 + "port-version": 4 }, "gcem": { "baseline": "1.14.1", @@ -5509,7 +5505,7 @@ "port-version": 2 }, "pagmo2": { - "baseline": "2.16.1", + "baseline": "2.18.0", "port-version": 0 }, "paho-mqtt": { @@ -7153,8 +7149,8 @@ "port-version": 0 }, "tbb": { - "baseline": "2020_U3", - "port-version": 8 + "baseline": "2021.5.0", + "port-version": 0 }, "tcb-span": { "baseline": "2021-12-15", @@ -7526,7 +7522,7 @@ }, "usd": { "baseline": "20.08", - "port-version": 2 + "port-version": 3 }, "usockets": { "baseline": "0.8.1", diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json index 25d459e2b6e71d..90bb7c0bf63fa9 100644 --- a/versions/c-/cctag.json +++ b/versions/c-/cctag.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9166dee873ce930a3c5e12b544dc47583343221", + "version-semver": "1.0.2", + "port-version": 2 + }, { "git-tree": "979f28c0cc646b1a4c057ee810772a6b8964b65a", "version-semver": "1.0.2", diff --git a/versions/g-/gazebo.json b/versions/g-/gazebo.json index 202e801f08c750..97ee3164a8b7a9 100644 --- a/versions/g-/gazebo.json +++ b/versions/g-/gazebo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1f5088e196340aad31ea3700aceae72df1407ae", + "version-date": "2022-01-20", + "port-version": 4 + }, { "git-tree": "094ba2b47c08f30d45b33081f8b2b3790b2ec070", "version-date": "2022-01-20", diff --git a/versions/p-/pagmo2.json b/versions/p-/pagmo2.json index c149fd0f0b4199..9d16ccd3210a89 100644 --- a/versions/p-/pagmo2.json +++ b/versions/p-/pagmo2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa28deef736ea34bcc41143a960e8be97653ba1d", + "version": "2.18.0", + "port-version": 0 + }, { "git-tree": "ea29ee58051fba73e950597ca2b0109dd6df0dec", "version": "2.16.1", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index bc96b938334ce5..c18242ed4678a0 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2d94c971f648a21fa3068485c590b70bfa8b716", + "version": "2021.5.0", + "port-version": 0 + }, { "git-tree": "016aeb70aa2dfba55a141a928863a0191314d4a9", "version-string": "2020_U3", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index f32c455a84edf2..f1d76f10ef5071 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c241a36daa1c8695be5e0d4a8a29f2cc304dd6b1", + "version-string": "20.08", + "port-version": 3 + }, { "git-tree": "177f2af7397316cc1fa92a72ea8992f6acca8dfb", "version-string": "20.08", From c5ca6fd46b5816dcf41ae8e0ab9a9aea49363557 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 23 Sep 2022 12:30:43 -0700 Subject: [PATCH 635/791] [docs] Fix issues encountered during publishing 2022-09-01 (#26794) * [docs] Document 'host' field in manifests * [docs] Assorted fixes found while regenerating website * Update docs/users/manifests.md Co-authored-by: Victor Romero --- docs/commands/common-options.md | 2 +- docs/commands/install.md | 14 ++++++++------ docs/commands/remove.md | 2 +- docs/commands/update-baseline.md | 8 ++++---- docs/users/manifests.md | 20 ++++++++++++++------ 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/docs/commands/common-options.md b/docs/commands/common-options.md index 86fb64595b64da..c58fb984fdde76 100644 --- a/docs/commands/common-options.md +++ b/docs/commands/common-options.md @@ -56,7 +56,7 @@ Specifies the path to lay out installed packages. In Classic Mode, defaults to `installed/` under the vcpkg root folder. -In [Manifest Mode][../users/manifests.md], defaults to `vcpkg_installed/` under the manifest folder. +In [Manifest Mode](../users/manifests.md), defaults to `vcpkg_installed/` under the manifest folder. diff --git a/docs/commands/install.md b/docs/commands/install.md index 6db460d34cf37b..f79929edb80d13 100644 --- a/docs/commands/install.md +++ b/docs/commands/install.md @@ -45,7 +45,7 @@ All vcpkg commands support a set of [common options](common-options.md). Instead of stopping on an unsupported port, continue with a warning. -By default, vcpkg refuses to execute an install plan containing a port installation for a triplet outside its [`"supports"`][] clause. The [`"supports"`][] clause of a package describes the full set of platforms a package is expected to be buildable on. This flag instructs vcpkg to warn that the build is expected to fail instead of stopping. +By default, vcpkg refuses to execute an install plan containing a port installation for a triplet outside its [`"supports"`][supports] clause. The [`"supports"`][supports] clause of a package describes the full set of platforms a package is expected to be buildable on. This flag instructs vcpkg to warn that the build is expected to fail instead of stopping. ### `--clean-after-build` @@ -103,6 +103,8 @@ Fail install if a port has detected problems or attempts to use a deprecated fea By default, vcpkg will run several checks on built packages and emit warnings if any issues are detected. This flag upgrades those warnings to an error. + + ### `--x-feature=` **Experimental and may change or be removed at any time** @@ -111,7 +113,7 @@ By default, vcpkg will run several checks on built packages and emit warnings if Specify an additional [feature](../users/manifests.md#features) from the `vcpkg.json` to install dependencies for. -By default, only [`"dependencies"`](../users/manifests.md#dependencies) and the dependencies of the [`"default-features"`](../users/manifests.md#default-features) will be installed. +By default, only [`"dependencies"`][dependencies] and the dependencies of the [`"default-features"`][default-features] will be installed. ### `--head` @@ -135,7 +137,7 @@ By default, vcpkg will stop at the first package build failure. This flag instru Don't install the default features from the top-level manifest. -When using `install` in Manifest Mode, by default all dependencies of the features listed in [`"default-features"`][] will be installed. This flag disables that behavior so (without any `TODO` flags) only the dependencies listed in [`"dependencies"`][] will be installed. +When using `install` in Manifest Mode, by default all dependencies of the features listed in [`"default-features"`][default-features] will be installed. This flag disables that behavior so only features explicitly enabled by [`--x-feature`](#feature) will be installed. ### `--no-downloads` @@ -186,6 +188,6 @@ Suppress generation of usage text printed at the end of installation. [Asset Caching]: ../users/assetcaching.md [Binary Caching]: ../users/binarycaching.md [Manifest Mode]: ../users/manifests.md -[`"supports"`]: ../users/manifests.md#supports -[`"default-features"`]: ../users/manifests.md#default-features -[`"dependencies"`]: ../users/manifests.md#dependencies +[supports]: ../users/manifests.md#supports +[default-features]: ../users/manifests.md#default-features +[dependencies]: ../users/manifests.md#dependencies diff --git a/docs/commands/remove.md b/docs/commands/remove.md index dd47374aab0fe0..4e1cb0c1c25703 100644 --- a/docs/commands/remove.md +++ b/docs/commands/remove.md @@ -16,7 +16,7 @@ vcpkg remove --outdated [options] Remove port packages from Classic Mode. -`remove` removes listed packages and any packages that require them from the Classic Mode [installed directory][common-options.md#install-root]. See the [install command documentation](install.md#package-syntax) for detailed syntax of the `` parameter. +`remove` removes listed packages and any packages that require them from the Classic Mode [installed directory](common-options.md#install-root). See the [install command documentation](install.md#package-syntax) for detailed syntax of the `` parameter. This command is not currently supported in [Manifest Mode][]. diff --git a/docs/commands/update-baseline.md b/docs/commands/update-baseline.md index 3b499b2551f691..8a5b36711f11d3 100644 --- a/docs/commands/update-baseline.md +++ b/docs/commands/update-baseline.md @@ -14,7 +14,7 @@ vcpkg x-update-baseline [options] [--add-initial-baseline] [--dry-run] Update baselines for all configured [registries][]. -In [Manifest Mode][], this command operates on all [registries][] in the `vcpkg.json` and the [`vcpkg-configuration.json`][]. In Classic Mode, this command operates on the [`vcpkg-configuration.json`][] in the vcpkg instance (`$VCPKG_ROOT`). +In [Manifest Mode][], this command operates on all [registries][] in the `vcpkg.json` and the [`vcpkg-configuration.json`][vcj]. In Classic Mode, this command operates on the [`vcpkg-configuration.json`][vcj] in the vcpkg instance (`$VCPKG_ROOT`). See the [versioning documentation](../users/versioning.md#baselines) for more information about baselines. @@ -32,11 +32,11 @@ Print the planned baseline upgrades, but do not modify the files on disk. **[Manifest Mode][] Only** -Add a [`"builtin-baseline"`][] field to the `vcpkg.json` if it does not already have one. +Add a [`"builtin-baseline"`][builtin-baseline] field to the `vcpkg.json` if it does not already have one. Without this flag, it is an error to run this command on a manifest that does not have any [registries][] configured. [Manifest Mode]: ../users/manifests.md -[`"builtin-baseline"`]: ../users/manifests.md#builtin-baseline -[`vcpkg-configuration.json`]: ../users/registries.md#vcpkg-configurationjson +[builtin-baseline]: ../users/manifests.md#builtin-baseline +[vcj]: ../users/registries.md#vcpkg-configurationjson [registries]: ../users/registries.md diff --git a/docs/users/manifests.md b/docs/users/manifests.md index 1817a10072e547..fc4e7dac13b2a5 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -31,6 +31,7 @@ manifest mode. - [`"name"`](#dependencies-name) - [`"default-features"`](#dependencies-default-features) - [`"features"`](#dependencies-features) + - [`"host"`](#host) - [`"platform"`](#platform) - [`"version>="`](#version-gt) - [`"overrides"`](#overrides) @@ -38,8 +39,6 @@ manifest mode. - [`"features"`](#features) - [`"default-features"`](#default-features) -See also [the original specification](../specifications/manifests.md) for more low-level details. - ## Simple Example Manifest ```json @@ -69,8 +68,9 @@ Manifests follow strict JSON: they can't contain C++-style comments (`//`) nor t you can use field names that start with `$` to write your comments in any object that has a well-defined set of keys. These comment fields are not allowed in any objects which permit user-defined keys (such as `"features"`). -Each manifest contains a top level object with the fields documented below; the most important ones are -[`"name"`](#name), the [version fields](#version-fields), and [`"dependencies"`](#dependencies): +The latest JSON Schema is available at https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json. IDEs with JSON Schema support such as Visual Studio and Visual Studio Code can use this file to provide IntelliSense and syntax checking. For most IDEs, you should set `"$schema"` in your `vcpkg.json` to this URL (like the above example). + +Each manifest contains a top level object with the following fields: @@ -80,8 +80,6 @@ This is the name of your project! It must be formatted in a way that vcpkg under it must be lowercase alphabetic characters, digits, and hyphens, and it must not start nor end with a hyphen. For example, `Boost.Asio` might be given the name `boost-asio`. -This is a required field. - ### Version Fields There are four version field options, depending on how the port orders its @@ -190,6 +188,16 @@ Then, you might just ask for: } ``` + + +#### `"host"` Field + +A boolean indicating that the dependency must be built for the [host triplet](host-dependencies.md) instead of the current port's triplet. Defaults to `false`. + +Any dependency that provides tools or scripts which should be "executed" during a build (such as buildsystems, code generators, or helpers) should be marked as `"host": true`. This enables correct cross-compilation in cases that the target is not executable -- such as when compiling for `arm64-android`. + +See [Host Dependencies](host-dependencies.md) for more information. + #### `"platform"` Field From 57d3194e702a2959e86a6748999ad71fc24f7922 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 23 Sep 2022 13:37:27 -0700 Subject: [PATCH 636/791] [docs] Link fixes (#26956) --- docs/maintainers/vcpkg_from_gitlab.md | 2 +- docs/users/versioning.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/maintainers/vcpkg_from_gitlab.md b/docs/maintainers/vcpkg_from_gitlab.md index b49453da40d5ed..42a9a8ac759f68 100644 --- a/docs/maintainers/vcpkg_from_gitlab.md +++ b/docs/maintainers/vcpkg_from_gitlab.md @@ -63,7 +63,7 @@ At least one of `REF` and `HEAD_REF` must be specified, however it is preferable This exports the `VCPKG_HEAD_VERSION` variable during head builds. ## Examples: -* [curl][https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75] +* [curl](https://github.com/Microsoft/vcpkg/blob/master/ports/curl/portfile.cmake#L75) * [folly](https://github.com/Microsoft/vcpkg/blob/master/ports/folly/portfile.cmake#L15) * [z3](https://github.com/Microsoft/vcpkg/blob/master/ports/z3/portfile.cmake#L13) diff --git a/docs/users/versioning.md b/docs/users/versioning.md index d10c7ace69eec1..2fe23832e97127 100644 --- a/docs/users/versioning.md +++ b/docs/users/versioning.md @@ -102,11 +102,11 @@ Examples: ### Baselines -Baselines define a global version floor for what versions will be considered. This enables top-level manifests to keep the entire graph of dependencies up-to-date without needing to individually specify direct [`"version>="`][] constraints. +Baselines define a global version floor for what versions will be considered. This enables top-level manifests to keep the entire graph of dependencies up-to-date without needing to individually specify direct [`"version>="`][version-gte] constraints. -Every configured registry has an associated baseline. For manifests that don't configure any registries, the [`"builtin-baseline"`][] field defines the baseline for the built-in registry. If a manifest does not configure any registries and does not have a [`"builtin-baseline"`][], the install operates according to the Classic Mode algorithm and ignores all versioning information. +Every configured registry has an associated baseline. For manifests that don't configure any registries, the [`"builtin-baseline"`][builtin-baseline] field defines the baseline for the built-in registry. If a manifest does not configure any registries and does not have a [`"builtin-baseline"`][builtin-baseline], the install operates according to the Classic Mode algorithm and ignores all versioning information. -Baselines, like other registry settings, are ignored from ports consumed as a dependency. If a minimum version is required during transitive version resolution the port should use [`"version>="`][]. +Baselines, like other registry settings, are ignored from ports consumed as a dependency. If a minimum version is required during transitive version resolution the port should use [`"version>="`][version-gte]. **Example** ```json @@ -170,5 +170,5 @@ For an override to take effect, the overridden package must form part of the dep * The [implementation details](versioning.implementation-details.md) * The [original specification](../specifications/versioning.md) -[`"version>="`]: #version-gte -[`"builtin-baseilne"`]: manifests.md#builtin-baseline +[version-gte]: #version-gte +[builtin-baseline]: manifests.md#builtin-baseline From 5f6a2ed8cf46de4b6ddfa2638f7f75a3d8bf7833 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 26 Sep 2022 08:11:57 +0200 Subject: [PATCH 637/791] [grpc] Update to 1.49.0 (#26836) * abseil: Update to 20220623.1 * upb: Update to 2022-06-21 * grpc: Update to 1.49.0 * grpc: Adjust SHA512 for v1.49.0 * abseil: Add license field --- ports/abseil/portfile.cmake | 4 ++-- ports/abseil/vcpkg.json | 3 ++- ports/grpc/00009-use-system-upb.patch | 14 +++++++------- ports/grpc/00014-pkgconfig-upbdefs.patch | 8 ++++---- ports/grpc/portfile.cmake | 4 ++-- ports/grpc/vcpkg.json | 3 +-- ports/upb/0001-make-cmakelists-py.patch | 8 ++++++-- ports/upb/portfile.cmake | 4 ++-- ports/upb/vcpkg.json | 2 +- versions/a-/abseil.json | 5 +++++ versions/baseline.json | 8 ++++---- versions/g-/grpc.json | 5 +++++ versions/u-/upb.json | 5 +++++ 13 files changed, 46 insertions(+), 27 deletions(-) diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index 1289eed36a9c53..804c23ead06300 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1 - SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330 + REF 8c0b94e793a66495e0b1f34a5eb26bd7dc672db0 # LTS 20220623.1 + SHA512 a076c198103dc5cf22ac978fe7754dd34cb2e782d7db1c2c98393c94639e461bfe31b10c0663f750f743bc1c0c245fd4b6115356f136fe14bd036d267caf2a8b HEAD_REF master PATCHES # in C++17 mode, use std::any, std::optional, std::string_view, std::variant diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 3c9dc5eef209cf..586ed58186bcb8 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "abseil", - "version-string": "20211102.1", + "version-string": "20220623.1", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", @@ -8,6 +8,7 @@ "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole." ], "homepage": "https://github.com/abseil/abseil-cpp", + "license": "Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch index 1cfa17d97a3162..35d936e473de1d 100644 --- a/ports/grpc/00009-use-system-upb.patch +++ b/ports/grpc/00009-use-system-upb.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25990a5d8a..9a24f7c6cb 100644 +index 8498b6e435..12d50a26ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") @@ -12,15 +12,15 @@ index 25990a5d8a..9a24f7c6cb 100644 set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package") set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") -@@ -1570,6 +1573,7 @@ target_link_libraries(gpr - absl::synchronization +@@ -1596,6 +1599,7 @@ target_link_libraries(gpr absl::time absl::optional + absl::variant + ${_gRPC_UPB_LIBRARIES} ) if(_gRPC_PLATFORM_ANDROID) target_link_libraries(gpr -@@ -2361,7 +2365,6 @@ target_link_libraries(grpc +@@ -2400,7 +2404,6 @@ target_link_libraries(grpc gpr ${_gRPC_SSL_LIBRARIES} address_sorting @@ -28,7 +28,7 @@ index 25990a5d8a..9a24f7c6cb 100644 ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc "-framework CoreFoundation") -@@ -2927,7 +2930,6 @@ target_link_libraries(grpc_unsecure +@@ -2961,7 +2964,6 @@ target_link_libraries(grpc_unsecure absl::utility gpr address_sorting @@ -36,7 +36,7 @@ index 25990a5d8a..9a24f7c6cb 100644 ) if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) target_link_libraries(grpc_unsecure "-framework CoreFoundation") -@@ -4181,6 +4183,7 @@ endif() +@@ -4254,6 +4256,7 @@ endif() endif() @@ -44,7 +44,7 @@ index 25990a5d8a..9a24f7c6cb 100644 add_library(upb third_party/upb/third_party/utf8_range/naive.c third_party/upb/third_party/utf8_range/range2-neon.c -@@ -4242,7 +4245,7 @@ if(gRPC_INSTALL) +@@ -4322,7 +4325,7 @@ if(gRPC_INSTALL) ARCHIVE DESTINATION ${gRPC_INSTALL_LIBDIR} ) endif() diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index 2307c996f6f0df..9a5c8efc1bbc9d 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25990a5d8a..4c7831cba5 100644 +index 8498b6e435..4e2e9a6130 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -20398,7 +20398,7 @@ generate_pkgconfig( +@@ -21946,7 +21946,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" + "gpr openssl absl_any_invocable absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_memory absl_optional absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" -+ "-lgrpc -laddress_sorting -lre2 -lupb_json -lupb_textformat -lupb_reflection -lupb -lupb_fastdecode -lupb_utf8_range -ldescriptor_upb_proto -lcares -lz" ++ "-lgrpc -laddress_sorting -lre2 -ldescriptor_upb_proto -lupb_collections -lupb_extension_registry -lupb_fastdecode -lupb_json -lupb_reflection -lupb_textformat -lupb_utf8_range -lupb -lcares -lz" "" "grpc.pc") diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 39bcd1a4c0353a..5936a2f7dbc37c 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF v1.48.0 - SHA512 558c659b325eb2f64f6caf78c0701eaaf3d9ae35f6d25ccd69b8995d5b82b98ca1a7ef9f497a0a1dab5914d2328c044c108373152426a15045d0c978b27f3503 + REF v1.49.0 + SHA512 592413f0f907ec5c7c6b22366e418c589a653ef105b61bf0f98fc64dc40ccea0d2fadc9af9ade62bffa99cafec6e1305300cb9531202923614fe308b7f831210 HEAD_REF master PATCHES 00001-fix-uwp.patch diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index aa8c2389a65e0f..6fe26b8c405097 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "grpc", - "version-semver": "1.48.0", - "port-version": 2, + "version-semver": "1.49.0", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "license": "Apache-2.0", diff --git a/ports/upb/0001-make-cmakelists-py.patch b/ports/upb/0001-make-cmakelists-py.patch index f0b73a50150d4a..15f333efe55f21 100644 --- a/ports/upb/0001-make-cmakelists-py.patch +++ b/ports/upb/0001-make-cmakelists-py.patch @@ -1,8 +1,8 @@ diff --git a/cmake/make_cmakelists.py b/cmake/make_cmakelists.py -index d64c14f..12226cf 100755 +index d64c14f6..ad3597c3 100755 --- a/cmake/make_cmakelists.py +++ b/cmake/make_cmakelists.py -@@ -316,10 +316,132 @@ class Converter(object): +@@ -316,10 +316,136 @@ class Converter(object): set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id") endif() @@ -104,6 +104,8 @@ index d64c14f..12226cf 100755 + set_target_properties(json PROPERTIES OUTPUT_NAME upb_json) + set_target_properties(utf8_range PROPERTIES OUTPUT_NAME upb_utf8_range) + set_target_properties(mini_table PROPERTIES OUTPUT_NAME upb_mini_table) ++ set_target_properties(extension_registry PROPERTIES OUTPUT_NAME upb_extension_registry) ++ set_target_properties(collections PROPERTIES OUTPUT_NAME upb_collections) + + install( + DIRECTORY ../upb @@ -127,6 +129,8 @@ index d64c14f..12226cf 100755 + textformat + mini_table_internal + mini_table ++ extension_registry ++ collections + ${UPB_CODEGEN_TARGETS} + EXPORT upb-config + ) diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake index 93bcbc1a5d3353..374b8e4eac2e39 100644 --- a/ports/upb/portfile.cmake +++ b/ports/upb/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/upb - REF bef53686ec702607971bd3ea4d4fefd80c6cc6e8 # 2022-04-04 - SHA512 3801625827a5511ab28e047d7111e6f43d522872eef929b61d7a64fdb9fff7a058af45fd55bd409610c07c735f50a2f6f45ad611bb5e4ee86cd656b89f0a8278 + REF e4635f223e7d36dfbea3b722a4ca4807a7e882e2 # 2022-06-21 + SHA512 c5d48b1d87be7db65ad1f04f5ab43d694958d0e6892fd79c29993e564a402891fcd24ee9d34a9ca642ad20b80c02d3157675885edb6bd3bbc8cf5f29cc3be32c HEAD_REF master PATCHES 0001-make-cmakelists-py.patch diff --git a/ports/upb/vcpkg.json b/ports/upb/vcpkg.json index 24a64398bfb8c4..26897ea8fcfd52 100644 --- a/ports/upb/vcpkg.json +++ b/ports/upb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "upb", - "version-date": "2022-04-04", + "version-date": "2022-06-21", "description": "μpb (often written 'upb') is a small protobuf implementation written in C.", "homepage": "https://github.com/protocolbuffers/upb/", "license": "BSD-2-Clause", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 5b24f90a969bff..0bbb1845e6a987 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c569c0e44beca0b94d5a2d52a24e3a91868550ae", + "version-string": "20220623.1", + "port-version": 0 + }, { "git-tree": "962a81319706d17c9e90bd0b873659ec7c75178a", "version-string": "20211102.1", diff --git a/versions/baseline.json b/versions/baseline.json index 8215bf817de877..eccb66b9bd00c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -13,7 +13,7 @@ "port-version": 1 }, "abseil": { - "baseline": "20211102.1", + "baseline": "20220623.1", "port-version": 0 }, "absent": { @@ -2741,8 +2741,8 @@ "port-version": 0 }, "grpc": { - "baseline": "1.48.0", - "port-version": 2 + "baseline": "1.49.0", + "port-version": 0 }, "grppi": { "baseline": "0.4.0", @@ -7497,7 +7497,7 @@ "port-version": 0 }, "upb": { - "baseline": "2022-04-04", + "baseline": "2022-06-21", "port-version": 0 }, "urdfdom": { diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 605b4fa32e6cc9..9d8e0d4f8e2dcc 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28334108999e49da12dbde24bcfc183984ecef41", + "version-semver": "1.49.0", + "port-version": 0 + }, { "git-tree": "efed7f493dec5fdebaebdec83c521fc860b432a3", "version-semver": "1.48.0", diff --git a/versions/u-/upb.json b/versions/u-/upb.json index 755b43a83265a4..46a2d02d402d85 100644 --- a/versions/u-/upb.json +++ b/versions/u-/upb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a5b5306d38f1a58f65c98c236b84ca297501ab1", + "version-date": "2022-06-21", + "port-version": 0 + }, { "git-tree": "de1d8718e4ea42428b87f4275352c4f3bbb6ac11", "version-date": "2022-04-04", From 1ea1da790eb4b1c699c84085f197747a2178c88e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 26 Sep 2022 08:25:17 +0200 Subject: [PATCH 638/791] [gdal] Update to v3.5.2 (#26676) * Remove obsolete file * Omit libspatialite on uwp [skip actions] * Update to 3.5.2 * Update versions * Use unofficial-libmariadb config * Update versions * Ensure host path setup * Merge BUILD_TOOLS into FEATURE_OPTIONS * Update versions * gdal_target_interfaces must recurse * Update versions * CI [skip actions] Co-authored-by: JackBoosY --- ports/gdal/cpl-disable-dll.patch | 45 ---- ports/gdal/dependency_win.cmake | 219 -------------------- ports/gdal/fix-gdal-target-interfaces.patch | 15 ++ ports/gdal/portfile.cmake | 18 +- ports/gdal/vcpkg.json | 5 +- versions/baseline.json | 4 +- versions/g-/gdal.json | 5 + 7 files changed, 32 insertions(+), 279 deletions(-) delete mode 100644 ports/gdal/cpl-disable-dll.patch delete mode 100644 ports/gdal/dependency_win.cmake create mode 100644 ports/gdal/fix-gdal-target-interfaces.patch diff --git a/ports/gdal/cpl-disable-dll.patch b/ports/gdal/cpl-disable-dll.patch deleted file mode 100644 index fd1c81191d0de2..00000000000000 --- a/ports/gdal/cpl-disable-dll.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake -index 652edf1..0d1441b 100644 ---- a/cmake/helpers/configure.cmake -+++ b/cmake/helpers/configure.cmake -@@ -42,6 +42,10 @@ check_type_size("int" SIZEOF_INT) - check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) - check_type_size("void*" SIZEOF_VOIDP) - -+if(MSVC AND NOT BUILD_SHARED_LIBS) -+ set(CPL_DISABLE_DLL 1) -+endif() -+ - if (MSVC) - set(HAVE_VSNPRINTF 1) - -diff --git a/cmake/template/cpl_config.h.in b/cmake/template/cpl_config.h.in -index c85d3b0..19d3f0a 100644 ---- a/cmake/template/cpl_config.h.in -+++ b/cmake/template/cpl_config.h.in -@@ -177,6 +177,9 @@ - /* Define to 1 if the compiler supports -Wzero-as-null-pointer-constant */ - #cmakedefine HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT @HAVE_GCC_WARNING_ZERO_AS_NULL_POINTER_CONSTANT@ - -+/* Define if building a static windows lib */ -+#cmakedefine CPL_DISABLE_DLL @CPL_DISABLE_DLL@ -+ - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_ATLBASE_H 1 - -diff --git a/gdal.cmake b/gdal.cmake -index ff1ca7e..7712f1d 100644 ---- a/gdal.cmake -+++ b/gdal.cmake -@@ -336,11 +336,6 @@ if (MINGW AND BUILD_SHARED_LIBS) - set_target_properties(${GDAL_LIB_TARGET_NAME} PROPERTIES SUFFIX "-${GDAL_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") - endif () - -- --if (MSVC AND NOT BUILD_SHARED_LIBS) -- target_compile_definitions(${GDAL_LIB_TARGET_NAME} PUBLIC CPL_DISABLE_DLL=) --endif () -- - if (MINGW) - if (TARGET_CPU MATCHES "x86_64") - add_definitions(-m64) diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake deleted file mode 100644 index be060ce8b0018b..00000000000000 --- a/ports/gdal/dependency_win.cmake +++ /dev/null @@ -1,219 +0,0 @@ -macro(find_dependency_win) - # curl - x_vcpkg_pkgconfig_get_modules(PREFIX CURL MODULES --msvc-syntax libcurl INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "CURL_INC=${CURL_INCLUDE_DIRS_RELEASE}" "CURL_LIB=${CURL_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "CURL_INC=${CURL_INCLUDE_DIRS_DEBUG}" "CURL_LIB=${CURL_LIBS_DEBUG}") - - # expat - list(APPEND NMAKE_OPTIONS "EXPAT_DIR=YES") - x_vcpkg_pkgconfig_get_modules(PREFIX EXPAT MODULES --msvc-syntax expat INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "EXPAT_INCLUDE=${EXPAT_INCLUDE_DIRS}" "EXPAT_LIB=${EXPAT_LIBS_DEBUG}") - - # geos - x_vcpkg_pkgconfig_get_modules(PREFIX GEOS MODULES --msvc-syntax geos INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_RELEASE} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "GEOS_CFLAGS=${GEOS_INCLUDE_DIRS_DEBUG} -DHAVE_GEOS" "GEOS_LIB=${GEOS_LIBS_DEBUG}") - - # libgeotiff - list(APPEND NMAKE_OPTIONS "GEOTIFF_INC=-I${CURRENT_INSTALLED_DIR}/include") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff_i.lib") - list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d_i.lib") - else() - # libgeotiff may need tiff and proj4, but these are added separately, with all transitive deps. - list(APPEND NMAKE_OPTIONS_REL "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/lib/geotiff.lib") - list(APPEND NMAKE_OPTIONS_DBG "GEOTIFF_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/geotiff_d.lib") - endif() - - # libiconv - # There is no pc file, and CMake added the Find module in version 3.11. - list(APPEND extra_exports ICONV) - set(ICONV_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib") - set(ICONV_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib") - list(APPEND NMAKE_OPTIONS "LIBICONV_INCLUDE=-I${CURRENT_INSTALLED_DIR}/include" "LIBICONV_CFLAGS=-DICONV_CONST=") - list(APPEND NMAKE_OPTIONS_REL "LIBICONV_LIBRARY=${ICONV_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "LIBICONV_LIBRARY=${ICONV_LIBS_DEBUG}") - - # libjpeg-turbo - list(APPEND NMAKE_OPTIONS "JPEG_EXTERNAL_LIB=1" "JPEGDIR=${CURRENT_INSTALLED_DIR}/include") - x_vcpkg_pkgconfig_get_modules(PREFIX JPEG MODULES --msvc-syntax libjpeg LIBS) - list(APPEND NMAKE_OPTIONS_REL "JPEG_LIB=${JPEG_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "JPEG_LIB=${JPEG_LIBS_DEBUG}") - - # liblzma - x_vcpkg_pkgconfig_get_modules(PREFIX LZMA MODULES --msvc-syntax liblzma INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_RELEASE}" "LZMA_LIBS=${LZMA_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "LZMA_CFLAGS=${LZMA_INCLUDE_DIRS_DEBUG}" "LZMA_LIBS=${LZMA_LIBS_DEBUG}") - - # libpng - list(APPEND NMAKE_OPTIONS "PNG_EXTERNAL_LIB=1" "PNGDIR=${CURRENT_INSTALLED_DIR}/include") - x_vcpkg_pkgconfig_get_modules(PREFIX PNG MODULES --msvc-syntax libpng LIBS) - list(APPEND NMAKE_OPTIONS_REL "PNG_LIB=${PNG_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "PNG_LIB=${PNG_LIBS_DEBUG}") - - # libwebp - list(APPEND NMAKE_OPTIONS "WEBP_ENABLED=YES") - x_vcpkg_pkgconfig_get_modules(PREFIX WEBP MODULES --msvc-syntax libwebp INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_RELEASE}" "WEBP_LIBS=${WEBP_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "WEBP_CFLAGS=${WEBP_INCLUDE_DIRS_DEBUG}" "WEBP_LIBS=${WEBP_LIBS_DEBUG}") - - # libxml2 - x_vcpkg_pkgconfig_get_modules(PREFIX LIBXML2 MODULES --msvc-syntax libxml-2.0 INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_RELEASE}" "LIBXML2_LIB=${LIBXML2_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "LIBXML2_INC=${LIBXML2_INCLUDE_DIRS_DEBUG}" "LIBXML2_LIB=${LIBXML2_LIBS_DEBUG}") - - # openjpeg - list(APPEND NMAKE_OPTIONS "OPENJPEG_ENABLED=YES") - x_vcpkg_pkgconfig_get_modules(PREFIX OPENJPEG MODULES --msvc-syntax libopenjp2 INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_RELEASE}" "OPENJPEG_LIB=${OPENJPEG_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "OPENJPEG_CFLAGS=${OPENJPEG_INCLUDE_DIRS_DEBUG}" "OPENJPEG_LIB=${OPENJPEG_LIBS_DEBUG}") - - # proj - x_vcpkg_pkgconfig_get_modules(PREFIX PROJ MODULES --msvc-syntax proj INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_RELEASE}" "PROJ_LIBRARY=${PROJ_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "PROJ_INCLUDE=${PROJ_INCLUDE_DIRS_DEBUG}" "PROJ_LIBRARY=${PROJ_LIBS_DEBUG}") - - # sqlite3 and spatialite - if ("libspatialite" IN_LIST FEATURES) - list(APPEND extra_exports SPATIALITE) - list(APPEND NMAKE_OPTIONS "SPATIALITE_412_OR_LATER=yes") - x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax spatialite sqlite3 INCLUDE_DIRS LIBS) - string(APPEND SQLITE_INCLUDE_DIRS_RELEASE " -DHAVE_SPATIALITE") - string(APPEND SQLITE_INCLUDE_DIRS_DEBUG " -DHAVE_SPATIALITE") - else() - x_vcpkg_pkgconfig_get_modules(PREFIX SQLITE MODULES --msvc-syntax sqlite3 INCLUDE_DIRS LIBS) - endif() - list(APPEND NMAKE_OPTIONS_REL "SQLITE_INC=${SQLITE_INCLUDE_DIRS_RELEASE}" "SQLITE_LIB=${SQLITE_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "SQLITE_INC=${SQLITE_INCLUDE_DIRS_DEBUG}" "SQLITE_LIB=${SQLITE_LIBS_DEBUG}") - - # tiff - x_vcpkg_pkgconfig_get_modules(PREFIX TIFF MODULES --msvc-syntax libtiff-4 INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "TIFF_INC=${TIFF_INCLUDE_DIRS_RELEASE} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "TIFF_INC=${TIFF_INCLUDE_DIRS_DEBUG} -DBIGTIFF_SUPPORT" "TIFF_LIB=${TIFF_LIBS_DEBUG}") - - # zlib - list(APPEND NMAKE_OPTIONS "ZLIB_EXTERNAL_LIB=1") - x_vcpkg_pkgconfig_get_modules(PREFIX ZLIB MODULES --msvc-syntax zlib INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "ZLIB_INC=${ZLIB_INCLUDE_DIRS_RELEASE}" "ZLIB_LIB=${ZLIB_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "ZLIB_INC=${ZLIB_INCLUDE_DIRS_DEBUG}" "ZLIB_LIB=${ZLIB_LIBS_DEBUG}") - - # zstd - x_vcpkg_pkgconfig_get_modules(PREFIX ZSTD MODULES --msvc-syntax libzstd INCLUDE_DIRS LIBS) - list(APPEND NMAKE_OPTIONS_REL "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_RELEASE}" "ZSTD_LIBS=${ZSTD_LIBS_RELEASE}") - list(APPEND NMAKE_OPTIONS_DBG "ZSTD_CFLAGS=${ZSTD_INCLUDE_DIRS_DEBUG}" "ZSTD_LIBS=${ZSTD_LIBS_DEBUG}") - - # Features - - if ("cfitsio" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "FITS_INC_DIR=${CURRENT_INSTALLED_DIR}/include" "FITS_PLUGIN=NO") - list(APPEND NMAKE_OPTIONS_REL "FITS_LIB=${CURRENT_INSTALLED_DIR}/lib/cfitsio.lib") - list(APPEND NMAKE_OPTIONS_DBG "FITS_LIB=${CURRENT_INSTALLED_DIR}/debug/lib/cfitsio.lib") - endif() - - if("hdf5" IN_LIST FEATURES) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR) - x_vcpkg_pkgconfig_get_modules(PREFIX HDF5 MODULES --msvc-syntax hdf5 LIBS) - list(APPEND NMAKE_OPTIONS "HDF5_DIR=${HDF5_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=3") # 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/ports/gdal/fix-gdal-target-interfaces.patch b/ports/gdal/fix-gdal-target-interfaces.patch new file mode 100644 index 00000000000000..bf159fce593af3 --- /dev/null +++ b/ports/gdal/fix-gdal-target-interfaces.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake +index 838f0fd..380e20d 100644 +--- a/cmake/helpers/GdalDriverHelper.cmake ++++ b/cmake/helpers/GdalDriverHelper.cmake +@@ -248,6 +248,10 @@ function(gdal_target_interfaces _TARGET) + if (_res) + target_compile_options(${_TARGET} PRIVATE ${_res}) + endif () ++ get_property(_res TARGET ${_LIB} PROPERTY INTERFACE_LINK_LIBRARIES) ++ if (_res) ++ gdal_target_interfaces(${_TARGET} ${_res}) ++ endif () + endif () + endforeach () + endfunction() diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index a2657bb2b183d0..114c42cfd141d4 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF v3.5.1 - SHA512 658e515a16ed2b45a0b3dffa6bb23f28d6454a902d8d9efbed320e353112463ff8e9c3efd5b6c98cf61cf187dc88a0dd13f4989041acc836de2b9c07e8da32e9 + REF v3.5.2 + SHA512 fece50709090e21200298cf0d5c0dd10418bb800a3c92fb77eedab42c3942169bf69abcad9a6d61d3368ac5265e053e8c2aeb361d297ed0ace92ffba3b21dbca HEAD_REF master PATCHES find-link-libraries.patch - cpl-disable-dll.patch + fix-gdal-target-interfaces.patch ) # `vcpkg clean` stumbles over one subdir file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") @@ -50,16 +50,12 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS default-features GDAL_USE_WEBP core GDAL_USE_ZLIB default-features GDAL_USE_ZSTD + tools BUILD_APPS ) if(GDAL_USE_ICONV AND VCPKG_TARGET_IS_WINDOWS) list(APPEND FEATURE_OPTIONS -D_ICONV_SECOND_ARGUMENT_IS_NOT_CONST=ON) endif() -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS_RELEASE - FEATURES - tools BUILD_APPS -) - # Compatibility with older Android versions https://github.com/OSGeo/gdal/pull/5941 if(VCPKG_TARGET_IS_ANDROID AND ANRDOID_PLATFORM VERSION_LESS 24 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) list(APPEND FEATURE_OPTIONS -DBUILD_WITHOUT_64BIT_OFFSET=ON) @@ -70,6 +66,7 @@ string(REPLACE "dynamic" "" qhull_target "Qhull::qhull${VCPKG_LIBRARY_LINKAGE}_r vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DVCPKG_HOST_TRIPLET=${HOST_TRIPLET} # for host pkgconf in PATH ${FEATURE_OPTIONS} -DBUILD_DOCS=OFF -DBUILD_PYTHON_BINDINGS=OFF @@ -83,13 +80,14 @@ vcpkg_cmake_configure( -DGDAL_USE_EXTERNAL_LIBS=OFF -DGDAL_BUILD_OPTIONAL_DRIVERS=ON -DOGR_BUILD_OPTIONAL_DRIVERS=ON + -DGDAL_CHECK_PACKAGE_MySQL_NAMES=unofficial-libmariadb + -DGDAL_CHECK_PACKAGE_MySQL_TARGETS=unofficial::libmariadb + -DMYSQL_LIBRARIES=unofficial::libmariadb -DGDAL_CHECK_PACKAGE_NetCDF_NAMES=netCDF -DGDAL_CHECK_PACKAGE_NetCDF_TARGETS=netCDF::netcdf -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}" "-DQHULL_LIBRARY=${qhull_target}" - OPTIONS_RELEASE - ${FEATURE_OPTIONS_RELEASE} OPTIONS_DEBUG -DBUILD_APPS=OFF ) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 343bc1b2c151ad..e041dc50796eaa 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.5.1", - "port-version": 6, + "version-semver": "3.5.2", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "license": null, @@ -64,7 +63,6 @@ "features": [ "curl", "geos", - "libspatialite", "recommended-features" ] }, @@ -72,6 +70,7 @@ "name": "gdal", "default-features": false, "features": [ + "libspatialite", "postgresql" ], "platform": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index eccb66b9bd00c0..e89b978e47e636 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2517,8 +2517,8 @@ "port-version": 0 }, "gdal": { - "baseline": "3.5.1", - "port-version": 6 + "baseline": "3.5.2", + "port-version": 0 }, "gdcm": { "baseline": "3.0.12", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index e067ef8e547c5d..a99c8bd1dc61ba 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f88341b75df68d585c06df3ed7b7b0a5412ae986", + "version-semver": "3.5.2", + "port-version": 0 + }, { "git-tree": "548d8ee81b0b34493dc57b3610fb19db2403bb50", "version-semver": "3.5.1", From 94b089b7c130b6aa6e49bbf923985176a888b9e3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 26 Sep 2022 08:45:07 +0200 Subject: [PATCH 639/791] [openexr] Update from 2 to 3.1.5, patch all consuming ports (#26862) * Update to 3.1.5 * Add feature 'tools' * ilmbase is now imath * [theia] Use openimageio cmake config * [freeimage] Use OpenEXR 3 and Imath * [opencv4] Use upstream's OpenEXR 3 support * [opencv3] Use upstream's OpenEXR 3 support * [opencv2] Use OpenEXR 3 and Imath * [osg] Use OpenEXR 3 * [openvdb] Use Imath, enable OpenEXR * [pangolin] Use OpenEXR 3 * [directxtex] Use OpenEXR 3 * [uvatlas] Disable /guard:ehcont when directxtex uses openexr * Update versions Co-authored-by: chausner --- ports/directxtex/enable_openexr_support.patch | 65 +++++++++++++++++ ports/directxtex/vcpkg.json | 1 + ports/freeimage/CMakeLists.txt | 4 +- ports/freeimage/use-external-openexr.patch | 32 ++++++++- ports/freeimage/vcpkg.json | 4 +- ports/ilmbase/vcpkg.json | 7 +- .../0003-force-package-requirements.patch | 9 --- ports/opencv2/0019-fix-openexr.patch | 30 ++++++++ ports/opencv2/portfile.cmake | 5 +- ports/opencv2/vcpkg.json | 3 +- .../0003-force-package-requirements.patch | 9 --- ports/opencv3/portfile.cmake | 2 + ports/opencv3/vcpkg.json | 2 +- .../0003-force-package-requirements.patch | 9 --- ports/opencv4/portfile.cmake | 2 + ports/opencv4/vcpkg.json | 2 +- .../0001-remove_find_package_macro.patch | 38 ---------- .../0002-fixup_cmake_exports_path.patch | 69 ------------------- ...003-fix-arm-intrin-detection-pr-1216.patch | 13 ---- ports/openexr/portfile.cmake | 65 ++++++++--------- ports/openexr/usage | 4 ++ ports/openexr/vcpkg-cmake-wrapper.cmake | 38 ---------- ports/openexr/vcpkg.json | 11 ++- ports/openvdb/portfile.cmake | 2 + ports/openvdb/vcpkg.json | 3 +- ports/osg/openexr3.patch | 46 +++++++++++++ ports/osg/portfile.cmake | 2 +- ports/osg/use-openexr-config.patch | 20 ------ ports/osg/vcpkg.json | 2 +- ports/pangolin/fix-dependencies.patch | 36 +++++++++- ports/pangolin/vcpkg.json | 2 +- ports/theia/fix-external-dependencies.patch | 3 +- ports/theia/portfile.cmake | 1 + ports/theia/vcpkg.json | 5 +- ports/uvatlas/openexr.patch | 12 ++++ ports/uvatlas/portfile.cmake | 2 + ports/uvatlas/vcpkg.json | 1 + versions/baseline.json | 28 ++++---- versions/d-/directxtex.json | 5 ++ versions/f-/freeimage.json | 5 ++ versions/i-/ilmbase.json | 5 ++ versions/o-/opencv2.json | 5 ++ versions/o-/opencv3.json | 5 ++ versions/o-/opencv4.json | 5 ++ versions/o-/openexr.json | 5 ++ versions/o-/openvdb.json | 5 ++ versions/o-/osg.json | 5 ++ versions/p-/pangolin.json | 5 ++ versions/t-/theia.json | 5 ++ versions/u-/uvatlas.json | 5 ++ 50 files changed, 373 insertions(+), 276 deletions(-) create mode 100644 ports/opencv2/0019-fix-openexr.patch delete mode 100644 ports/openexr/0001-remove_find_package_macro.patch delete mode 100644 ports/openexr/0002-fixup_cmake_exports_path.patch delete mode 100644 ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch create mode 100644 ports/openexr/usage delete mode 100644 ports/openexr/vcpkg-cmake-wrapper.cmake create mode 100644 ports/osg/openexr3.patch delete mode 100644 ports/osg/use-openexr-config.patch create mode 100644 ports/uvatlas/openexr.patch diff --git a/ports/directxtex/enable_openexr_support.patch b/ports/directxtex/enable_openexr_support.patch index 2a7141371152a5..97c067c0882c04 100644 --- a/ports/directxtex/enable_openexr_support.patch +++ b/ports/directxtex/enable_openexr_support.patch @@ -1,3 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fc0a3e8..7447741 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -156,7 +156,7 @@ target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) + + if(ENABLE_OPENEXR_SUPPORT) + find_package(OpenEXR REQUIRED) +- target_include_directories(${PROJECT_NAME} PRIVATE ${OPENEXR_INCLUDE_DIRS}/OpenEXR) ++ target_link_libraries(${PROJECT_NAME} PRIVATE OpenEXR::OpenEXR) + endif() + + if ((${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16") AND (NOT MINGW)) +@@ -299,6 +299,7 @@ if(MSVC) + endif() + + if((MSVC_VERSION GREATER_EQUAL 1928) AND (CMAKE_SIZEOF_VOID_P EQUAL 8) ++ AND NOT ENABLE_OPENEXR_SUPPORT + AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0))) + foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) + target_compile_options(${t} PRIVATE "$<$>:/guard:ehcont>") diff --git a/DirectXTexEXR.cpp b/DirectXTexEXR.cpp index 17bd171..825cfe4 100644 --- a/DirectXTex/DirectXTexEXR.cpp @@ -20,3 +41,47 @@ index 17bd171..825cfe4 100644 namespace { struct handle_closer { void operator()(HANDLE h) noexcept { assert(h != INVALID_HANDLE_VALUE); if (h) CloseHandle(h); } }; +@@ -161,7 +161,7 @@ namespace + return result.QuadPart >= m_EOF; + } + +- Imf::Int64 tellg() override ++ uint64_t tellg() override + { + const LARGE_INTEGER dist = {}; + LARGE_INTEGER result; +@@ -169,10 +169,10 @@ namespace + { + throw com_exception(HRESULT_FROM_WIN32(GetLastError())); + } +- return static_cast(result.QuadPart); ++ return static_cast(result.QuadPart); + } + +- void seekg(Imf::Int64 pos) override ++ void seekg(uint64_t pos) override + { + LARGE_INTEGER dist; + dist.QuadPart = static_cast(pos); +@@ -213,7 +213,7 @@ namespace + } + } + +- Imf::Int64 tellp() override ++ uint64_t tellp() override + { + const LARGE_INTEGER dist = {}; + LARGE_INTEGER result; +@@ -221,10 +221,10 @@ namespace + { + throw com_exception(HRESULT_FROM_WIN32(GetLastError())); + } +- return static_cast(result.QuadPart); ++ return static_cast(result.QuadPart); + } + +- void seekp(Imf::Int64 pos) override ++ void seekp(uint64_t pos) override + { + LARGE_INTEGER dist; + dist.QuadPart = static_cast(pos); diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index cee0f698309dc1..0ede01f7f26641 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,7 @@ { "name": "directxtex", "version-date": "2022-07-29", + "port-version": 1, "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index d31c8aa05149ca..60f9783acbd525 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -107,7 +107,8 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES} WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder ${JXR_LIBRARIES} ${LibRaw_LIBRARIES} - OpenEXR::IlmImf) + OpenEXR::OpenEXR + Imath::Imath) target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS}) @@ -153,6 +154,7 @@ find_dependency(WebP CONFIG) find_dependency(JXR) find_dependency(LibRaw) find_dependency(OpenEXR) +find_dependency(Imath) include(\"\${CMAKE_CURRENT_LIST_DIR}/freeimage-targets.cmake\") ") diff --git a/ports/freeimage/use-external-openexr.patch b/ports/freeimage/use-external-openexr.patch index 08915da7268073..4f02f71329fa48 100644 --- a/ports/freeimage/use-external-openexr.patch +++ b/ports/freeimage/use-external-openexr.patch @@ -25,10 +25,38 @@ index b286430..82b3b72 100644 +#include +#include +#include -+#include ++#include // ========================================================== +@@ -66,11 +66,11 @@ public: + return ((unsigned)n != _io->read_proc(c, 1, n, _handle)); + } + +- virtual Imath::Int64 tellg() { ++ virtual uint64_t tellg() { + return _io->tell_proc(_handle); + } + +- virtual void seekg(Imath::Int64 pos) { ++ virtual void seekg(uint64_t pos) { + _io->seek_proc(_handle, (unsigned)pos, SEEK_SET); + } + +@@ -100,11 +100,11 @@ public: + } + } + +- virtual Imath::Int64 tellp() { ++ virtual uint64_t tellp() { + return _io->tell_proc(_handle); + } + +- virtual void seekp(Imath::Int64 pos) { ++ virtual void seekp(uint64_t pos) { + _io->seek_proc(_handle, (unsigned)pos, SEEK_SET); + } + }; diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp index 562fdd7..ce12649 100644 --- a/Source/FreeImage/PluginTIFF.cpp @@ -38,7 +66,7 @@ index 562fdd7..ce12649 100644 #include #include "../Metadata/FreeImageTag.h" -#include "../OpenEXR/Half/half.h" -+#include ++#include #include "FreeImageIO.h" #include "PSDParser.h" diff --git a/ports/freeimage/vcpkg.json b/ports/freeimage/vcpkg.json index a01645f282eed8..50ea53140eada4 100644 --- a/ports/freeimage/vcpkg.json +++ b/ports/freeimage/vcpkg.json @@ -1,10 +1,12 @@ { "name": "freeimage", "version": "3.18.0", - "port-version": 23, + "port-version": 24, "description": "Support library for graphics image formats", "homepage": "https://sourceforge.net/projects/freeimage/", + "license": "GPL-2.0-only OR GPL-3.0-only OR FreeImage", "dependencies": [ + "imath", "jxrlib", "libjpeg-turbo", "libpng", diff --git a/ports/ilmbase/vcpkg.json b/ports/ilmbase/vcpkg.json index 9b09a3c7b6d375..a32e6100d16fe9 100644 --- a/ports/ilmbase/vcpkg.json +++ b/ports/ilmbase/vcpkg.json @@ -1,9 +1,8 @@ { "name": "ilmbase", - "version-string": "2.3.0", - "port-version": 1, - "description": "empty package, linking to newer one", + "version": "3", + "description": "Obsolete, use port imath instead", "dependencies": [ - "openexr" + "imath" ] } diff --git a/ports/opencv2/0003-force-package-requirements.patch b/ports/opencv2/0003-force-package-requirements.patch index 8345cd7fbf1859..335aed4a181c59 100644 --- a/ports/opencv2/0003-force-package-requirements.patch +++ b/ports/opencv2/0003-force-package-requirements.patch @@ -45,12 +45,3 @@ if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -151,7 +151,7 @@ if(WITH_OPENEXR) - if(BUILD_OPENEXR) - ocv_clear_vars(OPENEXR_FOUND) - else() -- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") -+ find_package(OpenEXR REQUIRED) - endif() - - if(NOT OPENEXR_FOUND) diff --git a/ports/opencv2/0019-fix-openexr.patch b/ports/opencv2/0019-fix-openexr.patch new file mode 100644 index 00000000000000..5702bb54706211 --- /dev/null +++ b/ports/opencv2/0019-fix-openexr.patch @@ -0,0 +1,30 @@ +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 9b43066..c1cc11f 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -151,7 +151,12 @@ if(WITH_OPENEXR) + if(BUILD_OPENEXR) + ocv_clear_vars(OPENEXR_FOUND) + else() +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") ++ find_package(Imath CONFIG REQUIRED) ++ find_package(OpenEXR CONFIG REQUIRED) ++ set(OPENEXR_LIBRARIES Imath::Imath OpenEXR::OpenEXR) ++ set(OPENEXR_INCLUDE_PATHS "") ++ set(OPENEXR_VERSION "${OpenEXR_VERSION}") ++ set(OPENEXR_FOUND 1) + endif() + + if(NOT OPENEXR_FOUND) +diff --git a/modules/highgui/src/grfmt_exr.cpp b/modules/highgui/src/grfmt_exr.cpp +index 399e586..b8cd270 100644 +--- a/modules/highgui/src/grfmt_exr.cpp ++++ b/modules/highgui/src/grfmt_exr.cpp +@@ -57,6 +57,7 @@ + #include + #include + #include ++#include + #include + #include "grfmt_exr.hpp" + diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index bf88009cfced53..2c244a23c51355 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -15,7 +15,10 @@ vcpkg_from_github( 0005-fix-cuda.patch 0006-fix-jasper.patch 0007-fix-config.patch + 0019-fix-openexr.patch ) +# Disallow accidental build of vendored copies +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake") file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA") @@ -126,7 +129,7 @@ find_dependency(Threads)") string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") endif() if("openexr" IN_LIST FEATURES) - string(APPEND DEPS_STRING "\nfind_dependency(OpenEXR CONFIG)") + string(APPEND DEPS_STRING "\nfind_dependency(Imath CONFIG)\nfind_dependency(OpenEXR CONFIG)") endif() if("png" IN_LIST FEATURES) string(APPEND DEPS_STRING "\nfind_dependency(PNG)") diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index 61e2659129b12e..070c96f85adb88 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 14, + "port-version": 15, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", @@ -102,6 +102,7 @@ "openexr": { "description": "OpenEXR support for opencv", "dependencies": [ + "imath", "openexr" ] }, diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index 372811aa8845d9..d7990dfcf7345a 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -54,15 +54,6 @@ if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -229,7 +229,7 @@ if(WITH_OPENEXR) - ocv_clear_vars(HAVE_OPENEXR) - if(NOT BUILD_OPENEXR) - ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) -- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") -+ find_package(OpenEXR REQUIRED) - endif() - - if(OPENEXR_FOUND) @@ -247,7 +247,7 @@ endif() # --- GDAL (optional) --- diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 568b1fb752d759..d80e65b80aef81 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -22,6 +22,8 @@ vcpkg_from_github( 0011-remove-python2.patch 0012-fix-zlib.patch ) +# Disallow accidental build of vendored copies +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(TARGET_IS_AARCH64 1) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index b6787027ed8052..64c23afe868911 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.18", - "port-version": 1, + "port-version": 2, "description": "Open Source Computer Vision Library", "homepage": "https://github.com/opencv/opencv", "license": "BSD-3-Clause", diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index 6990dd96388aec..64bba84629caed 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -63,15 +63,6 @@ if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -257,7 +257,7 @@ if(WITH_OPENEXR) - ocv_clear_vars(HAVE_OPENEXR) - if(NOT BUILD_OPENEXR) - ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) -- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") -+ find_package(OpenEXR REQUIRED) - endif() - - if(OPENEXR_FOUND) @@ -275,7 +275,7 @@ endif() # --- GDAL (optional) --- diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 5694c5c53e55c4..10df2800576797 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -25,6 +25,8 @@ vcpkg_from_github( 0015-fix-freetype.patch 0017-mingw-strsafe-no-deprecate.patch ) +# Disallow accidental build of vendored copies +file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") set(TARGET_IS_AARCH64 1) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 6d331766f8fb8b..2ad60dcaca2c5d 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.6.0", - "port-version": 4, + "port-version": 5, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/openexr/0001-remove_find_package_macro.patch b/ports/openexr/0001-remove_find_package_macro.patch deleted file mode 100644 index fb7d331c7c8e82..00000000000000 --- a/ports/openexr/0001-remove_find_package_macro.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake -index 5116726..34c7c87 100644 ---- a/OpenEXR/config/OpenEXRSetup.cmake -+++ b/OpenEXR/config/OpenEXRSetup.cmake -@@ -33,7 +33,7 @@ endif() - # Whether to build & install the various command line utility programs - option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON) - --# This is a variable here for use in controlling where include files are -+# This is a variable here for use in controlling where include files are - # installed. Care must be taken when changing this, as many things - # probably assume this is OpenEXR - set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install") -diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt -index 5efa353..5246fa7 100644 ---- a/OpenEXR_Viewers/CMakeLists.txt -+++ b/OpenEXR_Viewers/CMakeLists.txt -@@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION}) - ####################################### - include(config/OpenEXRViewersSetup.cmake) - --find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) --find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) - - # This is for newer cmake versions who know about vendor versions - set(OpenGL_GL_PREFERENCE GLVND) -diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt -index 291b96e..7d5074f 100644 ---- a/PyIlmBase/CMakeLists.txt -+++ b/PyIlmBase/CMakeLists.txt -@@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX) - include(config/PyIlmBaseSetup.cmake) - - # we have a strong dependence on IlmBase being an exact match --find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG) - - # we are building a python extension, so of course we depend on - # python as well. Except we don't know which version... diff --git a/ports/openexr/0002-fixup_cmake_exports_path.patch b/ports/openexr/0002-fixup_cmake_exports_path.patch deleted file mode 100644 index 07c0991a4fc583..00000000000000 --- a/ports/openexr/0002-fixup_cmake_exports_path.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt -index d9c5ae4..45ee6cc 100644 ---- a/IlmBase/config/CMakeLists.txt -+++ b/IlmBase/config/CMakeLists.txt -@@ -105,7 +105,7 @@ endif() - include(CMakePackageConfigHelpers) - configure_package_config_file(IlmBaseConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION share/ilmbase - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${ILMBASE_VERSION} -@@ -113,10 +113,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/ilmbase - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/ilmbase - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt -index b52ad0d..3dc6d22 100644 ---- a/OpenEXR/config/CMakeLists.txt -+++ b/OpenEXR/config/CMakeLists.txt -@@ -100,7 +100,7 @@ endif() - include(CMakePackageConfigHelpers) - configure_package_config_file(OpenEXRConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION share/openexr - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${OPENEXR_VERSION} -@@ -108,10 +108,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/openexr - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/openexr - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt -index 1872c89..bc61f43 100644 ---- a/PyIlmBase/config/CMakeLists.txt -+++ b/PyIlmBase/config/CMakeLists.txt -@@ -39,10 +39,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - COMPATIBILITY SameMajorVersion - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/pyilmbase - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/pyilmbase - FILE ${PROJECT_NAME}Config.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES diff --git a/ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch b/ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch deleted file mode 100644 index f018ab44248647..00000000000000 --- a/ports/openexr/0003-fix-arm-intrin-detection-pr-1216.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib/OpenEXR/ImfSimd.h b/src/lib/OpenEXR/ImfSimd.h -index 810e7ccc3..9bb4e11ae 100644 ---- a/OpenEXR/IlmImf/ImfSimd.h -+++ b/OpenEXR/IlmImf/ImfSimd.h -@@ -14,7 +14,7 @@ - - - // GCC and Visual Studio SSE2 compiler flags --#if defined __SSE2__ || (_MSC_VER >= 1300 && !_M_CEE_PURE) -+#if defined __SSE2__ || (_MSC_VER >= 1300 && (_M_IX86 || _M_X64)) - #define IMF_HAVE_SSE2 1 - #endif - diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index bddacbd57b874b..d9c5585d37a619 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -1,43 +1,44 @@ -if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "UWP build not supported") -endif() - vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO openexr/openexr - REF 918b8f543e81b5a1e1aca494ab7352ca280afc9e # v2.5.8 - SHA512 7c4a22779718cb1a8962d53d0817a0b3cba90fc9ad4c6469e845bdfbf9ae8be8e43905ad8672955838976caeffd7dabcc6ea9c1f00babef0d5dfc8b5e058cce9 - HEAD_REF master - PATCHES - 0001-remove_find_package_macro.patch - 0002-fixup_cmake_exports_path.patch - 0003-fix-arm-intrin-detection-pr-1216.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/openexr + REF v3.1.5 + SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c + HEAD_REF master ) -vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DCMAKE_DEBUG_POSTFIX=_d - -DPYILMBASE_ENABLE=FALSE +vcpkg_check_features(OUT_FEATURE_OPTIONS OPTIONS + FEATURES + tools OPENEXR_BUILD_TOOLS + tools OPENEXR_INSTALL_TOOLS +) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} + -DBUILD_TESTING=OFF + -DOPENEXR_INSTALL_EXAMPLES=OFF + -DDOCS=OFF + OPTIONS_DEBUG + -DOPENEXR_BUILD_TOOLS=OFF + -DOPENEXR_INSTALL_TOOLS=OFF ) - vcpkg_cmake_install() +vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup() -vcpkg_cmake_config_fixup(PACKAGE_NAME ilmbase CONFIG_PATH share/ilmbase) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenEXR) vcpkg_fixup_pkgconfig() -vcpkg_copy_tools( - TOOL_NAMES exrenvmap exrheader exrmakepreview exrmaketiled exrmultipart exrmultiview exrstdattr exr2aces - AUTO_CLEAN -) -vcpkg_copy_pdbs() - -if (VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if(OPENEXR_INSTALL_TOOLS) + vcpkg_copy_tools( + TOOL_NAMES exrenvmap exrheader exrinfo exrmakepreview exrmaketiled exrmultipart exrmultiview exrstdattr exr2aces + AUTO_CLEAN + ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openexr/usage b/ports/openexr/usage new file mode 100644 index 00000000000000..6b09d9db5fc41c --- /dev/null +++ b/ports/openexr/usage @@ -0,0 +1,4 @@ +openexr provides CMake targets: + + find_package(OpenEXR CONFIG REQUIRED) + target_link_libraries(main PRIVATE OpenEXR::OpenEXR) diff --git a/ports/openexr/vcpkg-cmake-wrapper.cmake b/ports/openexr/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 479cd302782d11..00000000000000 --- a/ports/openexr/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,38 +0,0 @@ -_find_package(${ARGS}) - -if(TARGET OpenEXR::IlmImf AND NOT OPENEXR_LIBRARIES AND NOT OPENEXR_FOUND) - set(OPENEXR_FOUND TRUE CACHE BOOL "") - set(OpenEXR_FOUND TRUE CACHE BOOL "") - set(OPENEXR_VERSION "2.5.0" CACHE STRING "") - set(OpenEXR_VERSION "2.5.0" CACHE STRING "") - get_target_property(OpenEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(OPENEXR_INCLUDE_PATHS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(OPENEXR_INCLUDE_DIRS OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::IlmImf INTERFACE_INCLUDE_DIRECTORIES) - set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIRS} CACHE STRING "") - set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATHS} CACHE STRING "") - set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIRS} CACHE STRING "") - set(OPENEXR_INCLUDE_DIR ${OPENEXR_INCLUDE_DIR} CACHE STRING "") - set(OPENEXR_ILMIMF_LIBRARY "OpenEXR::IlmImf" CACHE STRING "") - set(OPENEXR_ILMIMFUTIL_LIBRARY "OpenEXR::IlmImfUtil" CACHE STRING "") - set(OPENEXR_LIBRARIES ${OPENEXR_ILMIMFUTIL_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} CACHE STRING "") -endif() - -if(TARGET IlmBase::Half AND NOT ILMBASE_LIBRARIES AND NOT ILMBASE_FOUND) - set(ILMBASE_FOUND TRUE CACHE BOOL "") - set(IlmBASE_FOUND TRUE CACHE BOOL "") - set(ILMBASE_VERSION "2.5.0" CACHE STRING "") - set(IlmBASE_VERSION "2.5.0" CACHE STRING "") - get_target_property(ILMBASE_INCLUDE_DIR IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(ILMBASE_INCLUDE_DIRS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(ILMBASE_INCLUDE_PATHS IlmBase::Half INTERFACE_INCLUDE_DIRECTORIES) - set(ILMBASE_INCLUDE_DIR ${ILMBASE_INCLUDE_DIR} CACHE STRING "") - set(ILMBASE_INCLUDE_DIRS ${ILMBASE_INCLUDE_DIRS} CACHE STRING "") - set(ILMBASE_INCLUDE_PATHS ${ILMBASE_INCLUDE_PATHS} CACHE STRING "") - set(OPENEXR_HALF_LIBRARY "IlmBase::Half" CACHE STRING "") - set(OPENEXR_IEX_LIBRARY "IlmBase::Iex" CACHE STRING "") - set(OPENEXR_IEXMATH_LIBRARY "IlmBase::IexMath" CACHE STRING "") - set(OPENEXR_ILMTHREAD_LIBRARY "IlmBase::IlmThread" CACHE STRING "") - set(OPENEXR_IMATH_LIBRARY "IlmBase::Imath" CACHE STRING "") - set(ILMBASE_LIBRARIES ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_HALF_LIBRARY} CACHE STRING "") -endif() diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index ea43e1b687ff23..a34d07342ee74b 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,12 +1,12 @@ { "name": "openexr", - "version": "2.5.8", - "port-version": 1, + "version": "3.1.5", "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "license": "BSD-3-Clause", "supports": "!uwp", "dependencies": [ + "imath", { "name": "vcpkg-cmake", "host": true @@ -16,5 +16,10 @@ "host": true }, "zlib" - ] + ], + "features": { + "tools": { + "description": "Build tools" + } + } } diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 6016632fa1b59b..25ede899335cad 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -39,7 +39,9 @@ vcpkg_cmake_configure( -DOPENVDB_BUILD_UNITTESTS=OFF -DOPENVDB_BUILD_PYTHON_MODULE=OFF -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF + -DUSE_EXR=ON -DUSE_GLFW3=ON + -DUSE_IMATH_HALF=ON -DOPENVDB_CORE_STATIC=${OPENVDB_STATIC} -DOPENVDB_CORE_SHARED=${OPENVDB_SHARED} -DOPENVDB_BUILD_VDB_PRINT=${OPENVDB_BUILD_TOOLS} diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index 7acb002f72a632..2b571ace7281ea 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openvdb", "version": "9.0.0", + "port-version": 1, "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "license": "MPL-2.0", @@ -14,7 +15,7 @@ "boost-system", "boost-thread", "boost-uuid", - "ilmbase", + "imath", "openexr", "tbb", { diff --git a/ports/osg/openexr3.patch b/ports/osg/openexr3.patch new file mode 100644 index 00000000000000..9d525008fe2315 --- /dev/null +++ b/ports/osg/openexr3.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7de889..2a58f19 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -743,6 +743,9 @@ ELSE() + FIND_PACKAGE(Inventor) + FIND_PACKAGE(Jasper) + FIND_PACKAGE(OpenEXR) ++ set(OPENEXR_FOUND "${OpenEXR_FOUND}") ++ set(OPENEXR_LIBRARIES OpenEXR::OpenEXR) ++ set(OPENEXR_LIBRARIES_VARS OPENEXR_LIBRARIES) + FIND_PACKAGE(OpenCascade) + FIND_PACKAGE(COLLADA) + FIND_PACKAGE(FBX) +diff --git a/src/osgPlugins/exr/ReaderWriterEXR.cpp b/src/osgPlugins/exr/ReaderWriterEXR.cpp +index 7132e97..bea1483 100644 +--- a/src/osgPlugins/exr/ReaderWriterEXR.cpp ++++ b/src/osgPlugins/exr/ReaderWriterEXR.cpp +@@ -41,11 +41,11 @@ public: + { + return _inStream->read(c,n).good(); + }; +- virtual Int64 tellg () ++ virtual uint64_t tellg () + { + return _inStream->tellg(); + }; +- virtual void seekg (Int64 pos) ++ virtual void seekg (uint64_t pos) + { + _inStream->seekg(pos); + }; +@@ -69,11 +69,11 @@ public: + { + _outStream->write(c,n); + }; +- virtual Int64 tellp () ++ virtual uint64_t tellp () + { + return _outStream->tellp(); + }; +- virtual void seekp (Int64 pos) ++ virtual void seekp (uint64_t pos) + { + _outStream->seekp(pos); + }; diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index c533d26f05893a..701b470b850512 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_from_github( plugin-pdb-install.patch use-boost-asio.patch osgdb_zip_nozip.patch # This is fix symbol clashes with other libs when built in static-lib mode - use-openexr-config.patch + openexr3.patch unofficial-export.patch ) diff --git a/ports/osg/use-openexr-config.patch b/ports/osg/use-openexr-config.patch deleted file mode 100644 index 903e1b6826fc03..00000000000000 --- a/ports/osg/use-openexr-config.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3363305..8516539 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -739,10 +739,13 @@ IF(ANDROID) - ELSE() - # Common to all platforms except android: - FIND_PACKAGE(Freetype) -- FIND_PACKAGE(ilmbase) - FIND_PACKAGE(Inventor) - FIND_PACKAGE(Jasper) -- FIND_PACKAGE(OpenEXR) -+ FIND_PACKAGE(OpenEXR CONFIG) -+ set(OPENEXR_LIBRARY OpenEXR::IlmImf) -+ set(OPENEXR_LIBRARIES_VARS OPENEXR_LIBRARY) -+ set(OPENEXR_INCLUDE_DIR "${OpenEXR_DIR}/../../include") -+ set(ILMBASE_INCLUDE_DIR "${OpenEXR_DIR}/../../include") - FIND_PACKAGE(OpenCascade) - FIND_PACKAGE(COLLADA) - FIND_PACKAGE(FBX) diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 9d002b776311d7..a72f9314b7c6e0 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 16, + "port-version": 17, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, diff --git a/ports/pangolin/fix-dependencies.patch b/ports/pangolin/fix-dependencies.patch index e3ced434ea2b4b..9aef488026dfd0 100644 --- a/ports/pangolin/fix-dependencies.patch +++ b/ports/pangolin/fix-dependencies.patch @@ -52,7 +52,7 @@ index ddeb144..ee27d57 100644 list(APPEND HEADERS ${INCDIR}/video/drivers/uvc.h ) list(APPEND SOURCES video/drivers/uvc.cpp) list(APPEND VIDEO_FACTORY_REG RegisterUvcVideoFactory ) -@@ -584,11 +590,10 @@ endif() +@@ -584,11 +590,14 @@ endif() option(BUILD_PANGOLIN_LIBOPENEXR "Build support for libopenexr image input" ON) if(BUILD_PANGOLIN_LIBOPENEXR) @@ -62,7 +62,11 @@ index ddeb144..ee27d57 100644 set(HAVE_OPENEXR 1) - list(APPEND INTERNAL_INC ${OpenEXR_INCLUDE_DIR} ) - list(APPEND LINK_LIBS ${OpenEXR_LIBRARY} ) -+ list(APPEND LINK_LIBS OpenEXR::IlmImf OpenEXR::IlmImfUtil OpenEXR::IlmImfConfig ) ++ list(APPEND LINK_LIBS OpenEXR::OpenEXR) ++ string(APPEND ExternConfig " ++ include(CMakeFindDependencyMacro) ++ find_dependency(OpenEXR CONFIG) ++") message(STATUS "libopenexr Found and Enabled") endif() endif() @@ -95,3 +99,31 @@ index ddeb144..ee27d57 100644 target_link_libraries(pypangolin PRIVATE ${LIBRARY_NAME}) target_include_directories(pypangolin PRIVATE "${USER_INC}") endif() +diff --git a/src/image/image_io_exr.cpp b/src/image/image_io_exr.cpp +index 52c0078..1bd6c55 100644 +--- a/src/image/image_io_exr.cpp ++++ b/src/image/image_io_exr.cpp +@@ -4,6 +4,8 @@ + #include + + #ifdef HAVE_OPENEXR ++#include ++#include + #include + #include + #include +@@ -54,12 +56,12 @@ class StdIStream: public Imf::IStream + return true; + } + +- virtual Imf::Int64 tellg () ++ virtual uint64_t tellg () + { + return std::streamoff (_is->tellg()); + } + +- virtual void seekg (Imf::Int64 pos) ++ virtual void seekg (uint64_t pos) + { + _is->seekg (pos); + } diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json index f4461447381b05..5bf49539bce325 100644 --- a/ports/pangolin/vcpkg.json +++ b/ports/pangolin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pangolin", "version": "0.6", - "port-version": 2, + "port-version": 3, "description": "Lightweight GUI Library", "homepage": "https://github.com/stevenlovegrove/Pangolin", "supports": "!uwp", diff --git a/ports/theia/fix-external-dependencies.patch b/ports/theia/fix-external-dependencies.patch index fc6e540f31e227..812aad4319350b 100644 --- a/ports/theia/fix-external-dependencies.patch +++ b/ports/theia/fix-external-dependencies.patch @@ -158,7 +158,7 @@ index 9c1b150..1adbfed 100644 # This "exports" all targets which have been put into the export set # "TheiaExport". This means that CMake generates a file with the given -@@ -319,9 +270,5 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" +@@ -319,9 +270,4 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/TheiaConfigVersion.cmake.in" # in the public API of Theia and should thus be present in THEIA_INCLUDE_DIRS. install(FILES "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/TheiaConfigVersion.cmake" @@ -167,7 +167,6 @@ index 9c1b150..1adbfed 100644 - "${CMAKE_SOURCE_DIR}/cmake/FindGflags.cmake" - "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" - "${CMAKE_SOURCE_DIR}/cmake/FindSuiteSparse.cmake" -+ "${CMAKE_SOURCE_DIR}/cmake/FindOpenImageIO.cmake" DESTINATION ${CMAKECONFIG_INSTALL_DIR}) diff --git a/cmake/TheiaConfig.cmake.in b/cmake/TheiaConfig.cmake.in index a3ea187..7e9d912 100644 diff --git a/ports/theia/portfile.cmake b/ports/theia/portfile.cmake index c68a4a685821f7..07f96f050759ba 100644 --- a/ports/theia/portfile.cmake +++ b/ports/theia/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( ) file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) +file(REMOVE ${SOURCE_PATH}/cmake/FindOpenImageIO.cmake) file(REMOVE ${SOURCE_PATH}/cmake/FindGflags.cmake) file(REMOVE ${SOURCE_PATH}/cmake/FindGlog.cmake) file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake) diff --git a/ports/theia/vcpkg.json b/ports/theia/vcpkg.json index c02f1aecd22985..a5105373cc6d52 100644 --- a/ports/theia/vcpkg.json +++ b/ports/theia/vcpkg.json @@ -1,9 +1,10 @@ { "name": "theia", - "version-string": "0.8", - "port-version": 6, + "version": "0.8", + "port-version": 7, "description": "An open source library for multiview geometry and structure from motion", "homepage": "https://github.com/sweeneychris/TheiaSfM", + "license": "BSD-3-Clause", "dependencies": [ "cereal", { diff --git a/ports/uvatlas/openexr.patch b/ports/uvatlas/openexr.patch new file mode 100644 index 00000000000000..ab1e790927ed4c --- /dev/null +++ b/ports/uvatlas/openexr.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e9c3d37..52c6f93 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -228,6 +228,7 @@ if(MSVC) + endif() + + if((MSVC_VERSION GREATER_EQUAL 1928) AND (CMAKE_SIZEOF_VOID_P EQUAL 8) ++ AND NOT TARGET OpenEXR::OpenEXR # as dependency of package directxtex + AND ((NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13.0))) + foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME}) + target_compile_options(${t} PRIVATE "$<$>:/guard:ehcont>") diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index 266b4197013735..84c1e5cc81368e 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF jul2022 SHA512 fe857766d598c73badba6eda3128775f9195d0a1a7658e9b48a77dd631da4bbd31ab946bc98f8e9b229a6bc99a785ac3da693cb655be0f6a1393ad176e26b688 HEAD_REF main + PATCHES + openexr.patch ) if (VCPKG_HOST_IS_LINUX) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 7af982f77ffe3f..4bdbb8d40e2770 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,7 @@ { "name": "uvatlas", "version-date": "2022-07-30", + "port-version": 1, "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index e89b978e47e636..912414dac1d90e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1930,7 +1930,7 @@ }, "directxtex": { "baseline": "2022-07-29", - "port-version": 0 + "port-version": 1 }, "directxtk": { "baseline": "2022-07-29", @@ -2410,7 +2410,7 @@ }, "freeimage": { "baseline": "3.18.0", - "port-version": 23 + "port-version": 24 }, "freeopcua": { "baseline": "20190125", @@ -3021,8 +3021,8 @@ "port-version": 0 }, "ilmbase": { - "baseline": "2.3.0", - "port-version": 1 + "baseline": "3", + "port-version": 0 }, "imath": { "baseline": "3.1.5", @@ -5322,23 +5322,23 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 14 + "port-version": 15 }, "opencv3": { "baseline": "3.4.18", - "port-version": 1 + "port-version": 2 }, "opencv4": { "baseline": "4.6.0", - "port-version": 4 + "port-version": 5 }, "opendnp3": { "baseline": "3.1.1", "port-version": 1 }, "openexr": { - "baseline": "2.5.8", - "port-version": 1 + "baseline": "3.1.5", + "port-version": 0 }, "openfbx": { "baseline": "2022-07-18", @@ -5430,7 +5430,7 @@ }, "openvdb": { "baseline": "9.0.0", - "port-version": 0 + "port-version": 1 }, "openvpn3": { "baseline": "3.7.0", @@ -5474,7 +5474,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 16 + "port-version": 17 }, "osg-qt": { "baseline": "Qt5", @@ -5526,7 +5526,7 @@ }, "pangolin": { "baseline": "0.6", - "port-version": 2 + "port-version": 3 }, "pangomm": { "baseline": "2.50.0", @@ -7214,7 +7214,7 @@ }, "theia": { "baseline": "0.8", - "port-version": 6 + "port-version": 7 }, "think-cell-range": { "baseline": "498839d", @@ -7558,7 +7558,7 @@ }, "uvatlas": { "baseline": "2022-07-30", - "port-version": 0 + "port-version": 1 }, "uvw": { "baseline": "2.12.1", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index a9d74afe5f1dac..1d95320708aa16 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b72dbe4138eac6fea28e42828e2fc2a7ed99259b", + "version-date": "2022-07-29", + "port-version": 1 + }, { "git-tree": "e383685c947595287b5fbc51436378981c248793", "version-date": "2022-07-29", diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json index b4b5583d515087..70accbea1ad04d 100644 --- a/versions/f-/freeimage.json +++ b/versions/f-/freeimage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b72eaa94f12facf42b2180bf49ff9121d9477eaa", + "version": "3.18.0", + "port-version": 24 + }, { "git-tree": "748b7f37d074522ba08e6c4d6e6cf3afb3107da6", "version": "3.18.0", diff --git a/versions/i-/ilmbase.json b/versions/i-/ilmbase.json index 8c7c55b5616e1b..97b9956ec3d5f2 100644 --- a/versions/i-/ilmbase.json +++ b/versions/i-/ilmbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6926b258aab64f6946a04ba1f8f23592bfaf44ec", + "version": "3", + "port-version": 0 + }, { "git-tree": "7d1a248f37b30f491ebf4430ee294e1e9018ec44", "version-string": "2.3.0", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index b052f97f415952..fcc2b51edf1af0 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c74bb03ea3451c670c4ec82b3a1acda11baeaf6", + "version": "2.4.13.7", + "port-version": 15 + }, { "git-tree": "5161f9b494cb04f39503980cdca10bdac6e7ee53", "version": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 7febef4608ffc4..1789c67f26cb80 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab004823dbf456854654e2e0851be69ee4e5c5c5", + "version": "3.4.18", + "port-version": 2 + }, { "git-tree": "6f45f46b8a492b795cce92786a3d2048ef24ef38", "version": "3.4.18", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 60a076d77076a5..26b60a57049357 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdfecadf1577e25595f58dbe2d6c26bd2cb99296", + "version": "4.6.0", + "port-version": 5 + }, { "git-tree": "970c048b2d380fe84e110c02a99dc099f8b877d0", "version": "4.6.0", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index f557cf9e4b12dc..e1948512584f85 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1426fa9af15b03db5bacc50dcdd4569da1c18bde", + "version": "3.1.5", + "port-version": 0 + }, { "git-tree": "447c9eae823d9570dfc549995efba4f623ddaae2", "version": "2.5.8", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 75ee6fac0e3f01..a5baec8296f8f3 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd83349668c7c8ec38e4850437ec678b44e038f5", + "version": "9.0.0", + "port-version": 1 + }, { "git-tree": "a026562abe75e40d4b60d97108ef057b2e28629a", "version": "9.0.0", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index a15cdd2e771176..a4264c3c4a912e 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e29f8e57a49cb782817b890b77b3f0ec06afe3c0", + "version": "3.6.5", + "port-version": 17 + }, { "git-tree": "9b4ddf02fe84124b58b1ea60dcc9a4f553f32704", "version": "3.6.5", diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json index b8e8ef5329e18f..d30f7c7319210e 100644 --- a/versions/p-/pangolin.json +++ b/versions/p-/pangolin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d47198a68cd0a92fd6e74d50262dd657d027e217", + "version": "0.6", + "port-version": 3 + }, { "git-tree": "1515f75cbc480addcd0ca12c49c0435a0c9e158c", "version": "0.6", diff --git a/versions/t-/theia.json b/versions/t-/theia.json index 4ce29911e182ea..6d0fcd41f5c09b 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8a6f763efb9bd7657a6be700493a95ab32d1cb6", + "version": "0.8", + "port-version": 7 + }, { "git-tree": "f19561fe41ab71864fbf9640e491cc6a567c06b8", "version-string": "0.8", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index 532ecadd7d7412..c8df6e2b0e1151 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8e6b720b8515e7b966c76785e54d31f97d32261", + "version-date": "2022-07-30", + "port-version": 1 + }, { "git-tree": "bb57b16dfc29cefbae6f35fd3e09376e0291b2bd", "version-date": "2022-07-30", From 92ed6f9839a783cfb3a11497e3f1074d02ed5d6c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 26 Sep 2022 08:55:50 +0200 Subject: [PATCH 640/791] [drlibs] Update to 2022-09-26 (#26982) * Update drlibs to 2022-09-26 * Update CI baseline Co-authored-by: chausner --- ports/drlibs/portfile.cmake | 4 ++-- ports/drlibs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/drlibs.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/drlibs/portfile.cmake b/ports/drlibs/portfile.cmake index 9919d67a6376f0..e3ee273a9f4ae5 100644 --- a/ports/drlibs/portfile.cmake +++ b/ports/drlibs/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mackron/dr_libs - REF c729134b41cf09542542b5da841ac2f933b36cba - SHA512 3760a5921d120db21c9351e7edf1877b7052783e20dd7f6ab673992db0f6e4014c07c559f993f7870f6e7fe021b5e47b10b27ea0ed3895d07077b0eea8e13078 + REF dd762b861ecadf5ddd5fb03e9ca1db6707b54fbb + SHA512 4ec10ea1d9622879b5bdb61a11768e36b56a558d32aac6f8c8a52168ab401f9d53db0eeba074fe56de39f3809fb0bd73e2e6c5ef4ea8fd158abeb45e18285f08 HEAD_REF master ) diff --git a/ports/drlibs/vcpkg.json b/ports/drlibs/vcpkg.json index db59c2fe4c02f3..27214d90218452 100644 --- a/ports/drlibs/vcpkg.json +++ b/ports/drlibs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drlibs", - "version-date": "2022-04-03", + "version-date": "2022-09-26", "description": "Single-file audio decoding libraries for C/C++", "homepage": "https://github.com/mackron/dr_libs", "license": "Unlicense OR MIT-0" diff --git a/versions/baseline.json b/versions/baseline.json index 912414dac1d90e..7a01b7c7cec13d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2005,7 +2005,7 @@ "port-version": 0 }, "drlibs": { - "baseline": "2022-04-03", + "baseline": "2022-09-26", "port-version": 0 }, "drogon": { diff --git a/versions/d-/drlibs.json b/versions/d-/drlibs.json index 79c361f3d11d37..4862bb458f785f 100644 --- a/versions/d-/drlibs.json +++ b/versions/d-/drlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b4bfd32103ed7afb27e12281caf95c81930c955", + "version-date": "2022-09-26", + "port-version": 0 + }, { "git-tree": "4fbb06000e3d4c3699920debbc828cc279362d91", "version-date": "2022-04-03", From 889e650b7772f35cb77f1bcd46edb332f2246678 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Mon, 26 Sep 2022 02:56:12 -0400 Subject: [PATCH 641/791] [DiscordCoreAPI] Updating to version 2012-09-25 (#26975) * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Updating version info. * Update versions/d-/discordcoreapi.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update versions/d-/discordcoreapi.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/discordcoreapi/portfile.cmake | 4 ++-- ports/discordcoreapi/vcpkg.json | 6 +++--- versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index 29820ca10a6e23..d8537e22818a5f 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF c54811cbf735edb3661470aa0b487b94f715a929 - SHA512 52b2a66efa8b1d54c8a72caefd3d9e88515fce29726401216c36343e83f594035c424ae2b4293fb6b7b9d610cf8a3550a666f32b62105c73f30b6702673c66fb + REF 057df9c13edce1939e48abb0ecbf737bd8349bd2 + SHA512 81ec37163c7667e3f87b91db95f71f52d3a9301200131626e67fae1d23a774edf6e0597d987a7a7cc4128419a147da0766186e9ee5a14efafc5751c8de31ca27 HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index 8ee3856063da13..de1857c5573f0f 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,16 +1,16 @@ { "name": "discordcoreapi", - "version-date": "2022-08-07", + "version-date": "2022-09-25", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", - "license": "AGPL-3.0-or-later", + "license": "LGPL-2.1-or-later", "supports": "(windows & x64 & !static) | (linux & x64)", "dependencies": [ "ffmpeg", "libsodium", - "nlohmann-json", "openssl", "opus", + "simdjson", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index 7a01b7c7cec13d..77b10a1fb09965 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1953,7 +1953,7 @@ "port-version": 1 }, "discordcoreapi": { - "baseline": "2022-08-07", + "baseline": "2022-09-25", "port-version": 0 }, "discount": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 6ca382cc52a200..3e092b871c3891 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d2e0511274658095bc45584a95d7964017f0f9a", + "version-date": "2022-09-25", + "port-version": 0 + }, { "git-tree": "d3519d6dd1dc6918b16f9c9679c23a12ae673456", "version-date": "2022-08-07", From a685b28593d48930e3b78abe91bcf230f327167d Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 26 Sep 2022 08:57:23 +0200 Subject: [PATCH 642/791] [vcpkg baseline][grppi] Manually control use of tbb (#26966) * [grppi] Manually control use of tbb * version * Fix typo * version --- ports/grppi/portfile.cmake | 29 +++++++++++++++++++---------- ports/grppi/tbb.patch | 24 ++++++++++++++++++++++++ ports/grppi/vcpkg.json | 21 ++++++++++++++++++--- versions/baseline.json | 2 +- versions/g-/grppi.json | 5 +++++ 5 files changed, 67 insertions(+), 14 deletions(-) create mode 100644 ports/grppi/tbb.patch diff --git a/ports/grppi/portfile.cmake b/ports/grppi/portfile.cmake index 058f39fd0a55ba..11543d49b86d9a 100644 --- a/ports/grppi/portfile.cmake +++ b/ports/grppi/portfile.cmake @@ -1,25 +1,34 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arcosuc3m/grppi - REF v0.4.0 + REF v0.4.0 SHA512 f8235af6832958de420a68d4465a6c63701ab4385f3430d32f77c1d5e8212001262aad1a8aae04261ba889d592798cd3963843b190d325bddc1fe7dcc4aebd7d HEAD_REF master PATCHES fix-build-error.patch fix-support-other-compilers.patch + tbb.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +file(REMOVE "${SOURCE_PATH}/cmake.modules/FindTBB.cmake") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tbb GRPPI_TBB_ENABLE +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DGRPPI_DOXY_ENABLE=OFF - -DGRPPI_EXAMPLE_APPLICATIONS_ENABLE=OFF - -DGRPPI_UNIT_TEST_ENABLE=OFF + ${FEATURE_OPTIONS} + -DGRPPI_DOXY_ENABLE=OFF + -DGRPPI_EXAMPLE_APPLICATIONS_ENABLE=OFF + -DGRPPI_UNIT_TEST_ENABLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/grppi/tbb.patch b/ports/grppi/tbb.patch new file mode 100644 index 00000000000000..8d17ee35fb7769 --- /dev/null +++ b/ports/grppi/tbb.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09f1f9b..d58b972 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,15 +53,10 @@ endif() + include_directories("${CMAKE_SOURCE_DIR}/include") + + # TBB Library +-find_package( TBB ) +-if( TBB_FOUND ) +- option(GRPPI_TBB_ENABLE "Require TBB library" ON) +- message(STATUS "TBB found") +-else( TBB_FOUND ) +- option(GRPPI_TBB_ENABLE "Require TBB library" OFF ) +- set(GRPPI_TBB_ENABLE OFF CACHE BOOL "Require TBB library" FORCE) +- message(STATUS "TBB not found") +-endif( TBB_FOUND ) ++option(GRPPI_TBB_ENABLE "Enable TBB backend" OFF) ++if(GRPPI_TBB_ENABLE) ++ find_package(TBB CONFIG REQUIRED) ++endif() + + message( STATUS "TBB: " ${GRPPI_TBB_ENABLE} ) + if( GRPPI_TBB_ENABLE ) diff --git a/ports/grppi/vcpkg.json b/ports/grppi/vcpkg.json index 1cc832ab3ed7e1..126b90f7cf7ac6 100644 --- a/ports/grppi/vcpkg.json +++ b/ports/grppi/vcpkg.json @@ -1,7 +1,22 @@ { "name": "grppi", - "version-string": "0.4.0", - "port-version": 1, + "version": "0.4.0", + "port-version": 2, "description": "GrPPI is an open source generic and reusable parallel pattern programming interface developed at University Carlos III of Madrid.", - "homepage": "https://github.com/arcosuc3m/grppi" + "homepage": "https://github.com/arcosuc3m/grppi", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tbb": { + "description": "Enable tbb backend", + "dependencies": [ + "tbb" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 77b10a1fb09965..ee839cb655eefd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2746,7 +2746,7 @@ }, "grppi": { "baseline": "0.4.0", - "port-version": 1 + "port-version": 2 }, "gsl": { "baseline": "2.7.1", diff --git a/versions/g-/grppi.json b/versions/g-/grppi.json index 4b198a1769376e..fa94a3293794dc 100644 --- a/versions/g-/grppi.json +++ b/versions/g-/grppi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4f8344f7b0d97a42dfe8e95fe94f3af6b1bbe06", + "version": "0.4.0", + "port-version": 2 + }, { "git-tree": "4149700fba5f680c7efae07383dc7d6cf6cfcef9", "version-string": "0.4.0", From c3802777e8111fd6f9a84cad312b5118c6f0c6d4 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 26 Sep 2022 08:57:58 +0200 Subject: [PATCH 643/791] [sciplot] Disable examples and docs (#26962) * [sciplot] Disable examples and docs * version --- ports/sciplot/portfile.cmake | 6 +++--- ports/sciplot/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sciplot.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/sciplot/portfile.cmake b/ports/sciplot/portfile.cmake index 6ebd09ed310d08..c2f57f0c9af1f3 100644 --- a/ports/sciplot/portfile.cmake +++ b/ports/sciplot/portfile.cmake @@ -9,15 +9,15 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DSCIPLOT_BUILD_EXAMPLES=OFF -DSCIPLOT_BUILD_TESTS=OFF + -DSCIPLOT_BUILD_DOCS=OFF ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH share/sciplot) -vcpkg_copy_pdbs() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sciplot/vcpkg.json b/ports/sciplot/vcpkg.json index e0c1fd8d195d15..bbe5ec72b9b68d 100644 --- a/ports/sciplot/vcpkg.json +++ b/ports/sciplot/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sciplot", "version": "0.3.1", + "port-version": 1, "description": "A modern c++ scientific plotting library powered by gnuplot", "homepage": "https://github.com/sciplot/sciplot", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ee839cb655eefd..ca6c65163cbdcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6602,7 +6602,7 @@ }, "sciplot": { "baseline": "0.3.1", - "port-version": 0 + "port-version": 1 }, "sciter": { "baseline": "0", diff --git a/versions/s-/sciplot.json b/versions/s-/sciplot.json index 803b42af6ddbdf..68f4f46e26811f 100644 --- a/versions/s-/sciplot.json +++ b/versions/s-/sciplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4069ab412d4fc194df6d704213a41b1faa310ab7", + "version": "0.3.1", + "port-version": 1 + }, { "git-tree": "aac1c6064d43d5166bfe8bb2f65864fb9261c417", "version": "0.3.1", From 8e8a3d7c1a6f7f587b486663b1e814911e6f2342 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 26 Sep 2022 02:58:37 -0400 Subject: [PATCH 644/791] [dbus] disable doxygen (#26961) --- ports/dbus/portfile.cmake | 1 + ports/dbus/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/d-/dbus.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake index a4be54ff661fb3..6216aa90f785ea 100644 --- a/ports/dbus/portfile.cmake +++ b/ports/dbus/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_cmake_configure( OPTIONS -DDBUS_BUILD_TESTS=OFF -DDBUS_ENABLE_XML_DOCS=OFF + -DDBUS_ENABLE_DOXYGEN_DOCS=OFF -DDBUS_INSTALL_SYSTEM_LIBS=OFF -DDBUS_ENABLE_PKGCONFIG=ON #-DDBUS_SERVICE=ON diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json index 97c67d4c46d9f0..19988447ab91a2 100644 --- a/ports/dbus/vcpkg.json +++ b/ports/dbus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dbus", "version": "1.13.18", + "port-version": 1, "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon", "homepage": "https://gitlab.freedesktop.org/dbus/dbus", "license": "AFL-2.1 OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index ca6c65163cbdcd..375a56249d97f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1878,7 +1878,7 @@ }, "dbus": { "baseline": "1.13.18", - "port-version": 0 + "port-version": 1 }, "dcmtk": { "baseline": "3.6.7", diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json index 4e7b50aa84ba80..957653d5ec28b9 100644 --- a/versions/d-/dbus.json +++ b/versions/d-/dbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18e1551271c49540ec2170dcd0d770395717c7c3", + "version": "1.13.18", + "port-version": 1 + }, { "git-tree": "dc3215916b8e610dcf6c0777b5ae7a04ed78873b", "version": "1.13.18", From 9d0351aed2014407b890b15e4106c79785d5661e Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Mon, 26 Sep 2022 18:10:37 +0100 Subject: [PATCH 645/791] [DPP] Bump to version 10.0.19 (#26960) * [bot] Update DPP to v10.0.19 * Fix type error * fix hash --- ports/dpp/portfile.cmake | 4 ++-- ports/dpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index 7e8b7744cc157c..614233532490eb 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP - REF 6832533388ae7437aca481420a40ef1a9b157b89 - SHA512 472ec3379a4c33972dd47624ee492cc144c9c8638c6150bf0fa1e5992ae787a830bb84e41a16134ea3d59ca4f6cdab3b99113e22903287997aafe808bb676c90 + REF d7f92689381e66decf7ec7e247570690534206a4 + SHA512 994d5ea58b7d95aa28f831864017018dacfeb0f52fd86ab2fc58a913ac041b0097dbef04d4c62ba4a4726c8b7a24e3360c06300fae5d5a79a8f2ab855e701b72 HEAD_REF master PATCHES make-pkgconfig-required.patch diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 3d765ed2e03b8d..52123767d7e615 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.18", + "version": "10.0.19", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 375a56249d97f1..a2f581c45ce6bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1997,7 +1997,7 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.18", + "baseline": "10.0.19", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index a654bad64a3148..3cca2b75d19d7d 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0f56da8e2b3026a15bbf3856d1c601a635065e6", + "version": "10.0.19", + "port-version": 0 + }, { "git-tree": "7e80b88acd9bc75ce2b9bcaeae729f758ca2fcde", "version": "10.0.18", From e3ba2df6fa58c65263c1f4159c7be8179b94a177 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 26 Sep 2022 20:25:11 +0200 Subject: [PATCH 646/791] [utfcpp] Modernize, fix mingw (#26954) * Modernize portfile * Fix mingw * Update versions --- ports/utfcpp/portfile.cmake | 17 ++++++++--------- ports/utfcpp/vcpkg.json | 14 +++++++++++++- versions/baseline.json | 2 +- versions/u-/utfcpp.json | 5 +++++ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/ports/utfcpp/portfile.cmake b/ports/utfcpp/portfile.cmake index 7eb0f624237aa0..6342ff583dc3cc 100644 --- a/ports/utfcpp/portfile.cmake +++ b/ports/utfcpp/portfile.cmake @@ -6,24 +6,23 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUTF8_INSTALL=ON -DUTF8_SAMPLES=OFF -DUTF8_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/utf8cpp) +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/utf8cpp TARGET_PATH share/utf8cpp) + vcpkg_cmake_config_fixup(PACKAGE_NAME utf8cpp CONFIG_PATH lib/cmake/utf8cpp) endif() # Header only -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/utfcpp/vcpkg.json b/ports/utfcpp/vcpkg.json index d7f0c4639c0cee..b8c6a1dca80cd9 100644 --- a/ports/utfcpp/vcpkg.json +++ b/ports/utfcpp/vcpkg.json @@ -1,6 +1,18 @@ { "name": "utfcpp", "version": "3.2.1", + "port-version": 1, "description": "UTF-8 with C++ in a Portable Way", - "homepage": "https://github.com/nemtrif/utfcpp" + "homepage": "https://github.com/nemtrif/utfcpp", + "license": "BSL-1.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a2f581c45ce6bc..b380e127216db9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7542,7 +7542,7 @@ }, "utfcpp": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "utfz": { "baseline": "1.2", diff --git a/versions/u-/utfcpp.json b/versions/u-/utfcpp.json index dc7b6b2ef09ce0..15a53abd54e8b1 100644 --- a/versions/u-/utfcpp.json +++ b/versions/u-/utfcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c47a0911020f386e46e4f920a55fec656976d2ef", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "27a1e587de353ed0d9559d5e4627ed2811960c07", "version": "3.2.1", From 5bc980361a81fd5276ee411a7d7af423a4d24363 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Mon, 26 Sep 2022 20:35:51 +0200 Subject: [PATCH 647/791] [jsonnet, opentelemetry-cpp] Remove `!(windows & !static)` (#26953) * jsonnet * opentelemetry-cpp * version * [mfl] Disable tests * version * Restore version db * mfl * version * simplify * CR * version * Fix deprecated functions * wrong pr * version * revert --- ports/jsonnet/portfile.cmake | 9 ++------- ports/jsonnet/vcpkg.json | 2 +- ports/opentelemetry-cpp/portfile.cmake | 14 ++++---------- ports/opentelemetry-cpp/vcpkg.json | 5 +++-- versions/baseline.json | 4 ++-- versions/j-/jsonnet.json | 5 +++++ versions/o-/opentelemetry-cpp.json | 5 +++++ 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 363a5a38748483..d6b69831dd8c88 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -32,13 +32,8 @@ else() ) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(BUILD_SHARED ON) - set(BUILD_STATIC OFF) -else() - set(BUILD_SHARED OFF) - set(BUILD_STATIC ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/jsonnet/vcpkg.json b/ports/jsonnet/vcpkg.json index 427e4eb202f9de..d223594965bfab 100644 --- a/ports/jsonnet/vcpkg.json +++ b/ports/jsonnet/vcpkg.json @@ -1,10 +1,10 @@ { "name": "jsonnet", "version": "0.18.0", + "port-version": 1, "description": "Jsonnet - The data templating language", "homepage": "https://github.com/google/jsonnet", "license": "Apache-2.0", - "supports": "!(windows & !static)", "dependencies": [ "nlohmann-json", "ryml", diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 57ad6a593da4cc..1f161405109706 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -2,12 +2,6 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) endif() -if ("etw" IN_LIST FEATURES) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "linux" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "OSX") - message(FATAL_ERROR "Feature 'ewt' does not support 'linux & osx'") - endif() -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp @@ -36,9 +30,9 @@ if(WITH_OTLP) SHA512 b61d7fe7d6e1b5943d45ab9d17c22fe36c0f7a8312f668aea2b6685aa0f5c98aaa41e76659057310ec1f061d36ad9e66993be177039121f62f73858a6749d3d9 ) - vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party) - file(REMOVE_RECURSE ${SOURCE_PATH}/third_party/opentelemetry-proto) - file(RENAME ${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION} ${SOURCE_PATH}/third_party/opentelemetry-proto) + vcpkg_extract_source_archive("${ARCHIVE}" "${SOURCE_PATH}/third_party") + file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto") + file(RENAME "${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION}" "${SOURCE_PATH}/third_party/opentelemetry-proto") endif() vcpkg_cmake_configure( @@ -52,7 +46,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opentelemetry-cpp) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 7ebd51d501441a..f34c950a124d54 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,13 +2,13 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", "version-semver": "1.5.0", + "port-version": 1, "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." ], "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", "license": "Apache-2.0", - "supports": "!(windows & !static)", "dependencies": [ "curl", "nlohmann-json", @@ -26,7 +26,8 @@ "description": "Whether to include the Elasticsearch Client in the SDK" }, "etw": { - "description": "Whether to include the ETW Exporter in the SDK" + "description": "Whether to include the ETW Exporter in the SDK", + "supports": "windows" }, "jaeger": { "description": "Whether to include the Jaeger exporter", diff --git a/versions/baseline.json b/versions/baseline.json index b380e127216db9..3d47c8b65a9558 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3190,7 +3190,7 @@ }, "jsonnet": { "baseline": "0.18.0", - "port-version": 0 + "port-version": 1 }, "jwt-cpp": { "baseline": "0.6.0", @@ -5422,7 +5422,7 @@ }, "opentelemetry-cpp": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index 601aef6586e119..2eb4d1b35f74b0 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d44312d784436a66ae779d4b644aa29e3ebe23e8", + "version": "0.18.0", + "port-version": 1 + }, { "git-tree": "1ac55d2bf1f121bd14e748bbf55569a49a9015d9", "version": "0.18.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index df2872028a97d8..d721e8038f983e 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49b229180a92d7c0148fd1c28a691a76c59aea51", + "version-semver": "1.5.0", + "port-version": 1 + }, { "git-tree": "6ec3fad654735c88e146be395fd84629c209de6e", "version-semver": "1.5.0", From 86cab7438f79f6b0f60fc83f421993534ad333ee Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 26 Sep 2022 12:36:42 -0700 Subject: [PATCH 648/791] VM Update September 2022 (#26895) * Revert Linux to Ubuntu 20.04. * Cherry-pick intel-mkl from https://github.com/microsoft/vcpkg/pull/15233/ * Update pwsh to 7.2.6. * Temporarily remove ci.baseline.txt skips for ICEs. * Fix ICU version for Ubuntu version change. * Update pools. * Merge apt installs and fix WSL CUDA bindings. * Fix WSL detection. * Remove WSL specific nvidia because it misses nccl and cudnn. * Add python-yaml for duktape. * [shogun] Force use of OpenBLAS as the Lapack implementation. Shogun declares a dependency on blas, which we have set to openblas. Installing Intel MKL on the VMs caused build of Shogun to fail because it tried to use MKL and that build is broken. * Put colmap, graphicsmagick, and mfl skips back, as they are clearly not fixed. * PASSING, REMOVE FROM FAIL LIST: jemalloc:x64-osx (/Users/vagrant/Data/work/2/s/scripts/azure-pipelines/../ci.baseline.txt). * Update pool. * Revert the intel-mkl changes until the BLAS/LAPACK vendoring problem is fixed. * Update pool. * Explicitly add bison, needed by gettext. * Update pools --- scripts/azure-pipelines/azure-pipelines.yml | 4 +- .../azure-pipelines/linux/create-image.ps1 | 4 +- .../azure-pipelines/linux/provision-image.sh | 89 ++++++++++--------- .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- scripts/ci.baseline.txt | 2 - scripts/vcpkgTools.xml | 8 +- 6 files changed, 58 insertions(+), 51 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index d1db6ebf5bafde..87b5f3b61b6253 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-08-10' - linux-pool: 'PrLin-2022-07-14' + windows-pool: 'PrWin-2022-09-20' + linux-pool: 'PrLin-2022-09-25' osx-pool: 'PrOsx-2022-02-04' parameters: diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 index a1690ee9ec05ea..932d25aecde22b 100644 --- a/scripts/azure-pipelines/linux/create-image.ps1 +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -88,8 +88,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id $VM = Set-AzVMSourceImage ` -VM $VM ` -PublisherName 'Canonical' ` - -Offer '0001-com-ubuntu-server-jammy' ` - -Skus '22_04-lts' ` + -Offer '0001-com-ubuntu-server-focal' ` + -Skus '20_04-lts' ` -Version latest $VM = Set-AzVMBootDiagnostic -VM $VM -Disable diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index ce25aa10d7a65c..e3c6732e93c4e7 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -5,91 +5,100 @@ export DEBIAN_FRONTEND=noninteractive +# Add apt repos + +## CUDA +apt-key del 7fa2af80 +wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin +mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 +apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub +add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" + +## PowerShell +wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb +dpkg -i packages-microsoft-prod.deb +rm -f packages-microsoft-prod.deb +add-apt-repository universe + apt-get -y update apt-get -y dist-upgrade -# Install vcpkg prerequisites +# Add apt packages + +## vcpkg prerequisites APT_PACKAGES="git curl zip unzip tar" -# Install common build dependencies +## common build dependencies APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ libxcursor-dev yasm libnuma1 libnuma-dev \ - flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ + flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ pkg-config meson nasm cmake ninja-build" -# CUDA tooling -APT_PACKAGES="$APT_PACKAGES nvidia-cudnn nvidia-cuda-toolkit" - -# Additionally required by qt5-base +## required by qt5-base APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \ libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxcb-util0-dev" -# Additionally required by qt5-base for qt5-x11extras +## required by qt5-base for qt5-x11extras APT_PACKAGES="$APT_PACKAGES libxkbcommon-dev libxcb-keysyms1-dev \ libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev \ libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \ libxcb-render-util0-dev libxcb-xinerama0-dev libxcb-xkb-dev libxcb-xinput-dev" -# Additionally required by libhdfs3 +## required by libhdfs3 APT_PACKAGES="$APT_PACKAGES libkrb5-dev" -# Additionally required by kf5windowsystem +## required by kf5windowsystem APT_PACKAGES="$APT_PACKAGES libxcb-res0-dev" -# Additionally required by mesa +## required by mesa APT_PACKAGES="$APT_PACKAGES python3-setuptools python3-mako" -# Additionally required by some packages to install additional python packages +## required by some packages to install additional python packages APT_PACKAGES="$APT_PACKAGES python3-pip python3-venv" -# Additionally required by qtwebengine +## required by qtwebengine APT_PACKAGES="$APT_PACKAGES nodejs" -# Additionally required by qtwayland +## required by qtwayland APT_PACKAGES="$APT_PACKAGES libwayland-dev" -# Additionally required by all GN projects +## required by all GN projects APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" -# Additionally required by libctl +## required by libctl APT_PACKAGES="$APT_PACKAGES guile-2.2-dev" -# Additionally required by gtk +## required by gtk APT_PACKAGES="$APT_PACKAGES libxdamage-dev" -# Additionally required by gtk3 and at-spi2-atk +## required by gtk3 and at-spi2-atk APT_PACKAGES="$APT_PACKAGES libdbus-1-dev" -# Additionally required by at-spi2-atk +## required by at-spi2-atk APT_PACKAGES="$APT_PACKAGES libxtst-dev" -# Additionally required by bond +## required by bond APT_PACKAGES="$APT_PACKAGES haskell-stack" -# Additionally required/installed by Azure DevOps Scale Set Agents -APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu70" +## required by duktape +APT_PACKAGES="$APT_PACKAGES python-yaml" -apt-get -y install $APT_PACKAGES +## CUDA +APT_PACKAGES="$APT_PACKAGES cuda-compiler-11-6 cuda-libraries-dev-11-6 cuda-driver-dev-11-6 \ + cuda-cudart-dev-11-6 libcublas-11-6 libcurand-dev-11-6 cuda-nvml-dev-11-6 libcudnn8-dev libnccl2 \ + libnccl-dev" -# Start up cudnn -update-nvidia-cudnn -d -update-nvidia-cudnn -u +## PowerShell +APT_PACKAGES="$APT_PACKAGES powershell" -# Install nccl -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-ubuntu2204.pin -mv cuda-ubuntu2204.pin /etc/apt/preferences.d/cuda-repository-pin-600 -apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub -add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /" -apt-get -y update -apt-get install --no-install-recommends libnccl2 libnccl-dev +## Additionally required/installed by Azure DevOps Scale Set Agents, skip on WSL +if [[ $(grep microsoft /proc/version) ]]; then +echo "Skipping install of ADO prerequisites on WSL." +else +APT_PACKAGES="$APT_PACKAGES libkrb5-3 zlib1g libicu66" +fi -# Install PowerShell -wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -dpkg -i packages-microsoft-prod.deb -rm -f packages-microsoft-prod.deb -apt-get update -add-apt-repository universe -apt-get install -y powershell +apt-get -y --no-install-recommends install $APT_PACKAGES diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index e0577d20a474cd..9eb60f09416014 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4827d11b08dd41..752dd0df30c282 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -381,8 +381,6 @@ irrlicht:arm-uwp=fail irrlicht:x64-uwp=fail jemalloc:arm64-windows=fail jemalloc:arm-uwp=fail -jemalloc:x64-osx=fail -jemalloc:arm64-osx=fail jemalloc:x64-uwp=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index e5cc7d15481cb1..39863e6c97fdca 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -194,11 +194,11 @@ ninja-freebsd-1.8.2.zip - 7.2.5 + 7.2.6 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/PowerShell-7.2.5-win-x86.zip - 75b549db2500a5510eae3ec595540b42726c1b049f382c7683b6f0ed26dddd219e2ac67e9902358615f96c7884eda63ec3d0ca558b7b92f4604fdc61322ca4dd - PowerShell-7.2.5-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.2.6/PowerShell-7.2.6-win-x86.zip + 4b444e0d5de22380e47701c190cb8ec9464a14a7ca566bcb8a936f723d58571af537d0d872f788dac99e67b27a047ce53de3fe1a986967799c10ea6784dbd6b2 + PowerShell-7.2.6-win-x86.zip 16.15.1 From 143bc76cc7436b02f37f77cea0670cd0141d165b Mon Sep 17 00:00:00 2001 From: Faaux Date: Mon, 26 Sep 2022 23:46:54 +0200 Subject: [PATCH 649/791] [zlib] Fix CVE-2022-37434 (#26792) * [zlib] Fix CVE-2022-37434 * [zlib] Merge actual patch * Update ports/zlib/CVE-2022-37434.patch Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * [zlib] Update version SHA Co-authored-by: Chris Brammer Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> --- ports/zlib/CVE-2022-37434.patch | 17 +++++++++++++++++ ports/zlib/portfile.cmake | 1 + ports/zlib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zlib.json | 5 +++++ 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 ports/zlib/CVE-2022-37434.patch diff --git a/ports/zlib/CVE-2022-37434.patch b/ports/zlib/CVE-2022-37434.patch new file mode 100644 index 00000000000000..65cab9519b8ecd --- /dev/null +++ b/ports/zlib/CVE-2022-37434.patch @@ -0,0 +1,17 @@ +diff --git a/inflate.c b/inflate.c +index 7be8c6366..7a7289749 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -763,9 +763,10 @@ int flush; + copy = state->length; + if (copy > have) copy = have; + if (copy) { + if (state->head != Z_NULL && +- state->head->extra != Z_NULL) { +- len = state->head->extra_len - state->length; ++ state->head->extra != Z_NULL && ++ (len = state->head->extra_len - state->length) < ++ state->head->extra_max) { + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 66398f322426d2..4e48b9ec7c4a68 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( 0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch debug-postfix-mingw.patch 0002-android-build-mingw.patch + CVE-2022-37434.patch ) # This is generated during the cmake build diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index 078669f294b6f2..8dccdf32db8954 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zlib", "version": "1.2.12", - "port-version": 1, + "port-version": 2, "description": "A compression library", "homepage": "https://www.zlib.net/", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 3d47c8b65a9558..9983f550a07ddc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8054,7 +8054,7 @@ }, "zlib": { "baseline": "1.2.12", - "port-version": 1 + "port-version": 2 }, "zlib-ng": { "baseline": "2.0.6", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 523f7374adddea..8d4707112548cd 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d40d86865ecbcc5b54d21f840dd2212556aeadd5", + "version": "1.2.12", + "port-version": 2 + }, { "git-tree": "ecc4c064d4911faf12d8bf5fd6bcd5c556d89774", "version": "1.2.12", From 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 26 Sep 2022 23:50:08 +0200 Subject: [PATCH 650/791] [libpq] Fix ios build (#26906) --- ports/libpq/portfile.cmake | 6 ++++-- ports/libpq/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index ceb44d57cf654c..bd0e708a7b8aa0 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -287,8 +287,10 @@ else() if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) endif() - if(VCPKG_OSX_SYSROOT) - list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}") + vcpkg_cmake_get_vars(cmake_vars_file) + include("${cmake_vars_file}") + if(VCPKG_DETECTED_CMAKE_OSX_SYSROOT) + list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") endif() vcpkg_configure_make( AUTOCONFIG diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index d8f59322b94d69..4f3ed6375d4013 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libpq", "version": "14.4", + "port-version": 1, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", diff --git a/versions/baseline.json b/versions/baseline.json index 9983f550a07ddc..297dc1338ec56c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4034,7 +4034,7 @@ }, "libpq": { "baseline": "14.4", - "port-version": 0 + "port-version": 1 }, "libpqxx": { "baseline": "7.7.3", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index f01f4c4651b0c0..319cc73f919aed 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdf23f137f7f72e57555542fc392a8ec8e0ebd28", + "version": "14.4", + "port-version": 1 + }, { "git-tree": "2b3456bfb8b04525c44007f3c8a04b7e208d639d", "version": "14.4", From a71c7421e2cc9b643250b222c01d37b164b61efa Mon Sep 17 00:00:00 2001 From: "Joshua T. Fisher" Date: Tue, 27 Sep 2022 15:49:44 -0700 Subject: [PATCH 651/791] Add elseifs to attempt to see if cmake has selected to target arm64. (#26878) --- scripts/buildsystems/vcpkg.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 73588faa908c80..db422b034920a8 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -260,8 +260,12 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH arm) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 15 2017") set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019" AND CMAKE_VS_PLATFORM_NAME_DEFAULT STREQUAL "ARM64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 16 2019") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022" AND CMAKE_VS_PLATFORM_NAME_DEFAULT STREQUAL "ARM64") + set(Z_VCPKG_TARGET_TRIPLET_ARCH arm64) elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 17 2022") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) else() From e1ebdb654a8de452fc65958bbff227f0e0a43c4f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 28 Sep 2022 00:51:05 +0200 Subject: [PATCH 652/791] [boost-fiber] Enable x64-osx (#26918) * [boost-fiber] Enable osx * Update versions * Update boost generator * Update boost generator --- ports/boost-fiber/vcpkg.json | 3 ++- scripts/boost/generate-ports.ps1 | 3 ++- scripts/ci.baseline.txt | 1 + versions/b-/boost-fiber.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index d814be69d75555..74fa9ab72d18ee 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,10 +1,11 @@ { "name": "boost-fiber", "version": "1.80.0", + "port-version": 1, "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "license": "BSL-1.0", - "supports": "!osx & !uwp & !arm & !emscripten", + "supports": "!uwp & !arm & !emscripten", "dependencies": [ "boost-algorithm", "boost-assert", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 1f9242c65271f7..0c6fae9ec6404c 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/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-fiber" = 1; } $portData = @{ @@ -45,7 +46,7 @@ $portData = @{ }; "boost-beast" = @{ "supports" = "!emscripten" }; "boost-fiber" = @{ - "supports" = "!osx & !uwp & !arm & !emscripten"; + "supports" = "!uwp & !arm & !emscripten"; "features" = @{ "numa" = @{ "description" = "Enable NUMA support"; diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 752dd0df30c282..4afd8d1cca24ef 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1264,6 +1264,7 @@ vcpkg-ci-arrow:x64-windows-static-md=pass vcpkg-ci-arrow:x64-osx=pass vcpkg-ci-arrow:x64-linux=pass vcpkg-ci-boost:x64-linux=pass +vcpkg-ci-boost:x64-osx=pass vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass vcpkg-ci-boost:x64-windows=pass diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index 78f9341414edb1..4cfd8d9f4c344a 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f4c9240d299fe5785433544a022cf4521fe942e", + "version": "1.80.0", + "port-version": 1 + }, { "git-tree": "624a28b01820a368ad83f7e3bb6442706e1dfcb6", "version": "1.80.0", diff --git a/versions/baseline.json b/versions/baseline.json index 297dc1338ec56c..8b59965ed26515 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -706,7 +706,7 @@ }, "boost-fiber": { "baseline": "1.80.0", - "port-version": 0 + "port-version": 1 }, "boost-filesystem": { "baseline": "1.80.0", From c954a0516404f5e90392ca7f0068b56e7155a24c Mon Sep 17 00:00:00 2001 From: Gregory Popovitch Date: Tue, 27 Sep 2022 18:52:04 -0400 Subject: [PATCH 653/791] [parallel-hashmap] Update to version 1.36 (#26932) * [parallel-hashmap] bump version to 1.36 * [parallel-hashmap] bump version to 1.36 * disable building test and example projects in vcpkg install * update SHA --- ports/parallel-hashmap/portfile.cmake | 7 +++++-- ports/parallel-hashmap/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/parallel-hashmap.json | 5 +++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index 044226d8bf2f6c..324d2d23e4ae61 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -3,14 +3,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.34 - SHA512 3747422e80406aa77b009adee3c16325640dd1044560882fb881dac5ef4109f7d165d26ed7e64002c9285275f95962725ce20c918da12c0c113999c8ca3c7429 + REF 1.36 + SHA512 c5f7eea4cda698b8a2cc405d061fa1f4746354d5b0d3edd4db2e571fed757ffffe21c5ad4ec45feaa72db0dd092c7d220505f378340caeb176685900a57bc24c HEAD_REF master ) # Use greg7mdp/parallel-hashmap's own build process, skipping examples and tests vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPHMAP_BUILD_TESTS=OFF + -DPHMAP_BUILD_EXAMPLES=OFF ) vcpkg_cmake_install() diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index 8393345a885e6b..19fe2412992589 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "parallel-hashmap", - "version": "1.34", + "version": "1.36", "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", "license": "Apache-2.0", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8b59965ed26515..83d936726f97f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5533,7 +5533,7 @@ "port-version": 2 }, "parallel-hashmap": { - "baseline": "1.34", + "baseline": "1.36", "port-version": 0 }, "parallelstl": { diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index eadbb281397c44..212f7468e4dbec 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80dc90f1c5acfd71797d79ecc2e976e0d1185afc", + "version": "1.36", + "port-version": 0 + }, { "git-tree": "f72efb2dae42b2f746be8e239b00b707b3a61449", "version": "1.34", From d75220464643b36f5797045b1c69f3b206751971 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Tue, 27 Sep 2022 15:55:42 -0700 Subject: [PATCH 654/791] [opensubdiv] Add feature opengl (#26940) * [opensubdiv] Add feature opengl * modify port-version * x-add-version --- ports/opensubdiv/portfile.cmake | 2 +- ports/opensubdiv/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/o-/opensubdiv.json | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index cb218ab17389d8..88cc74428c7bf9 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -57,6 +57,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "ptex" NO_PTEX "tbb" NO_TBB "tutorials" NO_TUTORIALS + "opengl" NO_OPENGL ) set(OSD_EXTRA_OPTS) @@ -84,7 +85,6 @@ vcpkg_cmake_configure( -DNO_GLTESTS=ON -DNO_CLEW=ON -DNO_METAL=ON - -DNO_OPENGL=ON # missing glloader ${FEATURE_OPTIONS} ${OSD_EXTRA_OPTS} MAYBE_UNUSED_VARIABLES diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index a94a9ea3465dcd..72a8f44305cafa 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,9 +1,10 @@ { "name": "opensubdiv", "version-semver": "3.4.3", - "port-version": 4, + "port-version": 5, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", + "license": "Apache-2.0", "supports": "!arm & !uwp", "dependencies": [ { @@ -53,6 +54,9 @@ "opencl" ] }, + "opengl": { + "description": "Enable OpenGL support" + }, "ptex": { "description": "Path to Ptex", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 83d936726f97f0..ff40fdf6570c82 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5418,7 +5418,7 @@ }, "opensubdiv": { "baseline": "3.4.3", - "port-version": 4 + "port-version": 5 }, "opentelemetry-cpp": { "baseline": "1.5.0", diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json index 963073c9dd5755..0b41a6063e3912 100644 --- a/versions/o-/opensubdiv.json +++ b/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2aebb443eae8d15fc85fbeb0ffdb3774b1b09c8", + "version-semver": "3.4.3", + "port-version": 5 + }, { "git-tree": "91fabcb273d865674e59979585b5f9a6739ad6c5", "version-semver": "3.4.3", From 8ffbeacd5801276d146c1b18b22f873282a19d3f Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Wed, 28 Sep 2022 00:02:37 +0100 Subject: [PATCH 655/791] [luajit] Install .pc file for windows (#26971) Fix installed .pc file on osx Close #23178 --- .../luajit/005-do-not-pass-ld-e-macosx.patch | 11 +++++++++ ports/luajit/luajit.pc.win.in | 24 +++++++++++++++++++ ports/luajit/portfile.cmake | 16 ++++++++++++- ports/luajit/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/luajit.json | 5 ++++ 6 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 ports/luajit/005-do-not-pass-ld-e-macosx.patch create mode 100644 ports/luajit/luajit.pc.win.in diff --git a/ports/luajit/005-do-not-pass-ld-e-macosx.patch b/ports/luajit/005-do-not-pass-ld-e-macosx.patch new file mode 100644 index 00000000000000..8f2f615bca964b --- /dev/null +++ b/ports/luajit/005-do-not-pass-ld-e-macosx.patch @@ -0,0 +1,11 @@ +diff --git a/etc/luajit.pc b/etc/luajit.pc +index 39e1e57..3837d3b 100644 +--- a/etc/luajit.pc ++++ b/etc/luajit.pc +@@ -21,5 +21,5 @@ URL: https://luajit.org + Version: ${version} + Requires: + Libs: -L${libdir} -l${libname} +-Libs.private: -Wl,-E -lm -ldl ++Libs.private: -lm -ldl + Cflags: -I${includedir} diff --git a/ports/luajit/luajit.pc.win.in b/ports/luajit/luajit.pc.win.in new file mode 100644 index 00000000000000..56c0c5783af24b --- /dev/null +++ b/ports/luajit/luajit.pc.win.in @@ -0,0 +1,24 @@ +# Package information for LuaJIT to be used by pkg-config. +majver=2 +minver=1 +relver=0 +version=${majver}.${minver}.${relver}-beta3 +abiver=51 + +prefix=@PREFIX@ +multilib=@LJIT_LIBDIR@ +exec_prefix=${prefix} +libdir=${exec_prefix}/${multilib} +libname=lua${abiver} +includedir=${prefix}/include/luajit + +INSTALL_LMOD=${prefix}/share/lua/${abiver} +INSTALL_CMOD=${prefix}/${multilib}/lua/${abiver} + +Name: LuaJIT +Description: Just-in-time compiler for Lua +URL: https://luajit.org +Version: ${version} +Requires: +Libs: -L${libdir} -l${libname} +Cflags: -I${includedir} @LJIT_MSVC_PC_CFLAGS@ diff --git a/ports/luajit/portfile.cmake b/ports/luajit/portfile.cmake index c38e18a0d3767e..614ed1bdbf089f 100644 --- a/ports/luajit/portfile.cmake +++ b/ports/luajit/portfile.cmake @@ -1,3 +1,9 @@ +if (VCPKG_TARGET_IS_OSX) + set (LJIT_PATCHES 005-do-not-pass-ld-e-macosx.patch) +else() + set (LJIT_PATCHES "") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LuaJIT/LuaJIT @@ -7,12 +13,15 @@ vcpkg_from_github( PATCHES 003-do-not-set-macosx-deployment-target.patch 004-fix-build-path-and-crt-linkage.patch + ${LJIT_PATCHES} ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set (LJIT_STATIC "") + set (LJIT_MSVC_PC_CFLAGS "/DLUA_BUILD_AS_DLL=1") else() set (LJIT_STATIC "static") + set (LJIT_MSVC_PC_CFLAGS "") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) @@ -29,11 +38,13 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) ) # Note that luajit's build system responds to failure by producing no output; in particular a likely outcome is - # only 'minilua.exe' being produced. This reuslted in: + # only 'minilua.exe' being produced. This resulted in: # https://github.com/microsoft/vcpkg/pull/25856#issuecomment-1214285736 # Please ensure luajit.exe is actually produced when making future changes. file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + set(LJIT_LIBDIR "debug/lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" @ONLY) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -55,6 +66,7 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lua") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/luajit.pc" "multilib=lib" "multilib=debug/lib") endif() endif() @@ -73,6 +85,8 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/luajit.exe" DESTINATION "${CURRENT_PACKAGES_DIR}/tools") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + set(LJIT_LIBDIR "lib") + configure_file("${CMAKE_CURRENT_LIST_DIR}/luajit.pc.win.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/luajit.pc" @ONLY) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lua51.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json index a1090cf0fcb2b7..fe55dcbcf36cbc 100644 --- a/ports/luajit/vcpkg.json +++ b/ports/luajit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "luajit", "version-date": "2022-08-11", - "port-version": 1, + "port-version": 2, "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", "homepage": "https://github.com/LuaJIT/LuaJIT", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ff40fdf6570c82..368bc37421420e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4506,7 +4506,7 @@ }, "luajit": { "baseline": "2022-08-11", - "port-version": 1 + "port-version": 2 }, "luasec": { "baseline": "1.1.0", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index 7eeb517a5f3275..e0ba38d978731a 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "572eb21690be2a997b4bc4f1a49f93a77dc4a92b", + "version-date": "2022-08-11", + "port-version": 2 + }, { "git-tree": "bacc33ec723d7fc2b895a1351a2042c5c6fb6971", "version-date": "2022-08-11", From 97d3732f8733261fe79d6e93613bd14ac84d3be0 Mon Sep 17 00:00:00 2001 From: FW <30873659+fwcd@users.noreply.github.com> Date: Wed, 28 Sep 2022 01:04:01 +0200 Subject: [PATCH 656/791] [ffmpeg] Set `--disable-audiotoolbox` when targeting iOS (#26978) * [ffmpeg] Set --disable-audiotoolbox when targeting iOS * [ffmpeg] Bump port version to 19 * Update ffmpeg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/ffmpeg/portfile.cmake | 4 ++++ ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1ab26da6d8112e..680eefa80807b0 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -460,6 +460,10 @@ if (VCPKG_TARGET_IS_OSX) set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX endif() +if(VCPKG_TARGET_IS_IOS) + set(OPTIONS "${OPTIONS} --disable-audiotoolbox") # disable AudioToolbox on iOS +endif() + set(OPTIONS_CROSS " --enable-cross-compile") # ffmpeg needs --cross-prefix option to use appropriate tools for cross-compiling. diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index a464fa5b047005..8a5884e02dc439 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 18, + "port-version": 19, "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." diff --git a/versions/baseline.json b/versions/baseline.json index 368bc37421420e..202fe332c0fd77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2278,7 +2278,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 18 + "port-version": 19 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 24b4de633c4c3f..0918832a22aeca 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81adf5d3e80f0e54a7e968950860fed901186e85", + "version": "4.4.1", + "port-version": 19 + }, { "git-tree": "65fe58cd3c36c19b6ad4b104b9ff57c506009e9a", "version": "4.4.1", From c3a0c823f7f9bcc09f656b4de7744ac6b8b3abfd Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 28 Sep 2022 01:07:44 +0200 Subject: [PATCH 657/791] [zziplib] Fix exported interface include dirs (#26980) * Fix exported interface include dirs * Update versions --- ports/zziplib/export-targets.patch | 2 +- ports/zziplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zziplib.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/zziplib/export-targets.patch b/ports/zziplib/export-targets.patch index 7bcc0655bc7ee8..7d6bea4e20f6b4 100644 --- a/ports/zziplib/export-targets.patch +++ b/ports/zziplib/export-targets.patch @@ -7,7 +7,7 @@ index 1883272..16d4380 100644 add_library(libzzip ${libzzip_SRCS} ) target_link_libraries(libzzip ZLIB::ZLIB ) -target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}) -+target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PUBLIC $) ++target_include_directories (libzzip PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} PUBLIC "$") if(ZZIPFSEEKO) add_library(libzzipfseeko ${libzzipfseeko_SRCS} ) diff --git a/ports/zziplib/vcpkg.json b/ports/zziplib/vcpkg.json index d833544eab280a..4cc5d0d70bd3e3 100644 --- a/ports/zziplib/vcpkg.json +++ b/ports/zziplib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zziplib", "version": "0.13.72", - "port-version": 1, + "port-version": 2, "description": "library providing read access on ZIP-archives", "homepage": "https://github.com/gdraheim/zziplib", "license": "LGPL-2.0-or-later OR MPL-1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 202fe332c0fd77..b666667dcd8d80 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8102,7 +8102,7 @@ }, "zziplib": { "baseline": "0.13.72", - "port-version": 1 + "port-version": 2 } } } diff --git a/versions/z-/zziplib.json b/versions/z-/zziplib.json index 63363563fa2819..3d176d0ca84695 100644 --- a/versions/z-/zziplib.json +++ b/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba836047fca40d155c24a986af7cf5283692a4d6", + "version": "0.13.72", + "port-version": 2 + }, { "git-tree": "571af9ee98bd4bf80bf21fc10a5ec5971678b954", "version": "0.13.72", From 51c3f284f3dc774e7b539d4d84aab4198b545d58 Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 28 Sep 2022 01:08:14 +0200 Subject: [PATCH 658/791] nghttp2: update to 1.50.0 (#26988) --- ports/nghttp2/portfile.cmake | 4 ++-- ports/nghttp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 48ee86ca2e4e64..003d4f74d8788b 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF v1.49.0 - SHA512 bdfd0547e5094acf3784ee6ec46a024e7afd7ba9727f91142be83e5f7ddc12db30935fd25ebd12d69b0f2286af1bb4ee96ab13e160ee6243168f66e4507c1f09 + REF v1.50.0 + SHA512 0bc98be2e61940d78e9542d5391cecc24177a6a55012fb0df10c875d0daf5c6b480d12f00ead85f6d971d20f20af3a55abe4c8593f68c67ef3f016e87675f563 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index 484319ebb5b82c..be7bcdc3c497a1 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.49.0", + "version": "1.50.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index b666667dcd8d80..75674e03f204b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5049,7 +5049,7 @@ "port-version": 3 }, "nghttp2": { - "baseline": "1.49.0", + "baseline": "1.50.0", "port-version": 0 }, "nghttp3": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 0ca6003ad8813b..d0ea608407dcbc 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "deefe549bf6d275db038cc24547637f711f0ff6b", + "version": "1.50.0", + "port-version": 0 + }, { "git-tree": "f2c6faba492d188ec0f72078720084f6a4dc00c3", "version": "1.49.0", From 935d2a547d1e2dde49e5d48189914f4bd9d60889 Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Wed, 28 Sep 2022 07:16:17 +0800 Subject: [PATCH 659/791] [angelscript] update version to 2.36.0 (#27003) * [angelscript] update version to 2.36.0 * update version --- ports/angelscript/portfile.cmake | 6 +++--- ports/angelscript/vcpkg.json | 3 +-- versions/a-/angelscript.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index b63ce6d8b96166..3ac44aa0f6dd0b 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.35.1.zip" - FILENAME "angelscript_2.35.1.zip" - SHA512 b15083c7a77434c291e72ea82cfbab7734fa79df654d911a822f306d526669ebe9e55a981e8a1914deda0d2a52ebdc0ffb51a4179f307632c8c7d74b1abc69fa + URLS "https://angelcode.com/angelscript/sdk/files/angelscript_2.36.0.zip" + FILENAME "angelscript_2.36.0.zip" + SHA512 afd2b9096d0b62bc3d182d684fe34ddc8e9520af7734eea1f1a5c7d3439a28a1be7502faf692080cb0c4591799b7fea09fc8c4ccf25b8ec63a3d306e678682ff ) vcpkg_extract_source_archive_ex( diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json index a7b48cb40f833d..1f8a7aec97bc0b 100644 --- a/ports/angelscript/vcpkg.json +++ b/ports/angelscript/vcpkg.json @@ -1,7 +1,6 @@ { "name": "angelscript", - "version": "2.35.1", - "port-version": 1, + "version": "2.36.0", "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", "homepage": "https://angelcode.com/angelscript", "license": "Zlib", diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index fbd7d66379d898..332aa8c269cdaa 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e82bacd16784a617c44319de8e23d0557f72095f", + "version": "2.36.0", + "port-version": 0 + }, { "git-tree": "4f2a9b2d8cad46707e241ac52565fa50656c0dad", "version": "2.35.1", diff --git a/versions/baseline.json b/versions/baseline.json index 75674e03f204b2..a506d022772cee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -97,8 +97,8 @@ "port-version": 8 }, "angelscript": { - "baseline": "2.35.1", - "port-version": 1 + "baseline": "2.36.0", + "port-version": 0 }, "angle": { "baseline": "chromium_4472", From 5f82fa45df07a446bab57f65479f3d2df797f408 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 28 Sep 2022 07:17:12 +0800 Subject: [PATCH 660/791] [baseline][embree3] Add supports !arm (#27007) --- ports/embree3/portfile.cmake | 11 +++++------ ports/embree3/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/e-/embree3.json | 5 +++++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake index 8134b25d8512a1..ac4a1bdc5621a6 100755 --- a/ports/embree3/portfile.cmake +++ b/ports/embree3/portfile.cmake @@ -47,10 +47,9 @@ Only set feature avx automaticlly. endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DEMBREE_ISPC_SUPPORT=OFF -DEMBREE_TUTORIALS=OFF @@ -58,9 +57,9 @@ vcpkg_configure_cmake( -DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/embree TARGET_PATH share/embree) +vcpkg_cmake_config_fixup(PACKAGE_NAME embree) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -74,4 +73,4 @@ endif() file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/${PORT}/") file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/embree3/vcpkg.json b/ports/embree3/vcpkg.json index 80e51d51436e94..17bf22a33c0ef7 100644 --- a/ports/embree3/vcpkg.json +++ b/ports/embree3/vcpkg.json @@ -1,11 +1,21 @@ { "name": "embree3", "version-semver": "3.12.2", - "port-version": 2, + "port-version": 3, "description": "High Performance Ray Tracing Kernels.", "homepage": "https://github.com/embree/embree", + "license": "Apache-2.0", + "supports": "!arm", "dependencies": [ - "tbb" + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "avx", diff --git a/versions/baseline.json b/versions/baseline.json index a506d022772cee..5b80040e8c3251 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2130,7 +2130,7 @@ }, "embree3": { "baseline": "3.12.2", - "port-version": 2 + "port-version": 3 }, "enet": { "baseline": "1.3.17", diff --git a/versions/e-/embree3.json b/versions/e-/embree3.json index 88d98d2ecca3a2..ab3ae8eaf67c03 100644 --- a/versions/e-/embree3.json +++ b/versions/e-/embree3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36abe72d0c102d1abb828db85701450b8bfab9e7", + "version-semver": "3.12.2", + "port-version": 3 + }, { "git-tree": "04c9ff8d31137bc08cd37662050a41dd5f1d8ecf", "version-semver": "3.12.2", From bc582aaa6fef0476f76cac04c43e42b58aea8d9e Mon Sep 17 00:00:00 2001 From: sssooonnnggg Date: Thu, 29 Sep 2022 00:39:59 +0800 Subject: [PATCH 661/791] [python3] build python3.dll for stable ABI (#26935) --- ports/python3/0001-static-library.patch | 13 +++++++++++++ .../python3/0005-only-build-required-projects.patch | 7 +------ ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch index eef3875742f7b0..980078f5f5e23b 100644 --- a/ports/python3/0001-static-library.patch +++ b/ports/python3/0001-static-library.patch @@ -72,6 +72,19 @@ index ac49f7867a..f3583345ff 100644 #endif #ifdef ABIFLAGS SET_SYS_FROM_STRING("abiflags", ABIFLAGS); +diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj +index 70c336a9d3..ba797e8afd 100644 +--- a/PCbuild/pcbuild.proj ++++ b/PCbuild/pcbuild.proj +@@ -45,7 +45,7 @@ + false + + +- ++ + + + -- 2.28.0.windows.1 diff --git a/ports/python3/0005-only-build-required-projects.patch b/ports/python3/0005-only-build-required-projects.patch index dbbe372340118a..2d616a0d2ff6c2 100644 --- a/ports/python3/0005-only-build-required-projects.patch +++ b/ports/python3/0005-only-build-required-projects.patch @@ -26,12 +26,7 @@ diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index 4d416c589e..ede9868a8f 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj -@@ -45,21 +45,21 @@ - false - - -- -+ +@@ -49,17 +49,17 @@ - + diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index a6ff450678f307..ebf49078d14dfa 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.10.5", - "port-version": 2, + "port-version": 3, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5b80040e8c3251..40fd867e201a8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5882,7 +5882,7 @@ }, "python3": { "baseline": "3.10.5", - "port-version": 2 + "port-version": 3 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 39d13ed7e27790..9801d6d676428e 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03352a9860cce420c7bc069e1f62f5b1a19226ef", + "version": "3.10.5", + "port-version": 3 + }, { "git-tree": "6e7ddcd01a8341a906d5dde6b3d221c955571684", "version": "3.10.5", From 2d6ac7be7ae17979726007aad5775d4912cba404 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Wed, 28 Sep 2022 20:26:31 +0200 Subject: [PATCH 662/791] [halide] No vendored wasm (#26968) * [halide] No vendored wasm * version * Fix cmake * version * license * version --- ports/halide/portfile.cmake | 27 ++++++++++++++------------- ports/halide/vcpkg.json | 3 +++ versions/baseline.json | 2 +- versions/h-/halide.json | 5 +++++ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index c5fcb86a119c7a..a9f4088d5b06ce 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -28,16 +28,18 @@ vcpkg_check_features( ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DWITH_DOCS=NO - -DWITH_PYTHON_BINDINGS=NO - -DWITH_TESTS=NO - -DWITH_TUTORIALS=NO - -DWITH_UTILS=NO + -DWITH_WABT=OFF + -DWITH_V8=OFF + -DWITH_DOCS=OFF + -DWITH_PYTHON_BINDINGS=OFF + -DWITH_TESTS=OFF + -DWITH_TUTORIALS=OFF + -DWITH_UTILS=OFF -DCMAKE_INSTALL_LIBDIR=bin - -DCMAKE_INSTALL_DATADIR=share/${PORT} - -DHalide_INSTALL_CMAKEDIR=share/${PORT} + "-DCMAKE_INSTALL_DATADIR=share/${PORT}" + "-DHalide_INSTALL_CMAKEDIR=share/${PORT}" -DHalide_INSTALL_HELPERSDIR=share/HalideHelpers -DHalide_INSTALL_PLUGINDIR=bin ) @@ -66,9 +68,8 @@ vcpkg_copy_pdbs( vcpkg_cmake_config_fixup() vcpkg_cmake_config_fixup(PACKAGE_NAME HalideHelpers) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/tutorial) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index d24aa98e05dab4..cb79e2677bb4ff 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,12 +1,15 @@ { "name": "halide", "version": "14.0.0", + "port-version": 1, "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", + "license": "MIT", "supports": "!uwp", "dependencies": [ { "name": "llvm", + "default-features": false, "features": [ "clang", "enable-rtti", diff --git a/versions/baseline.json b/versions/baseline.json index 40fd867e201a8b..7acf206d8f0fed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2822,7 +2822,7 @@ }, "halide": { "baseline": "14.0.0", - "port-version": 0 + "port-version": 1 }, "happly": { "baseline": "2021-03-19", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index c0d638418e5da4..11eba04a6c144a 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "958cd321f20007534db5859498f8153017271b2f", + "version": "14.0.0", + "port-version": 1 + }, { "git-tree": "8beaf9e4b505e3a59e286d220492de1af4381154", "version": "14.0.0", From e3504363a92259bf75ebc10146a7de6eba6ccdad Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Wed, 28 Sep 2022 13:27:26 -0500 Subject: [PATCH 663/791] [proxy] update to version 1.1.1 (#27014) * Update proxy to version 1.1.1 * Run x-add-version --- ports/proxy/portfile.cmake | 4 ++-- ports/proxy/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/proxy.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/proxy/portfile.cmake b/ports/proxy/portfile.cmake index ef7321cf2c4b09..8c3e5cf7e91557 100644 --- a/ports/proxy/portfile.cmake +++ b/ports/proxy/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/proxy - REF release/1.0.1 - SHA512 5822064b373d3da8cea884d0c727e98d988252a7324ea9b78fa63fc86ee6afd73852a49f3685842345b86d625380140f80998263a6c8150fe66a30d6ba7e928a + REF release/1.1.1 + SHA512 47fd051cc4b774e02bf390ac6f6319ecf16f8ee063348557a93806e4fd3019229fb0157fb3f12143a90d994675615c05c8a8cf99dde5789f65c43b5ff74a7afa HEAD_REF main ) diff --git a/ports/proxy/vcpkg.json b/ports/proxy/vcpkg.json index 602cf0dd3d6a1a..da4f4c7f58c1ad 100644 --- a/ports/proxy/vcpkg.json +++ b/ports/proxy/vcpkg.json @@ -1,6 +1,6 @@ { "name": "proxy", - "version": "1.0.1", + "version": "1.1.1", "description": "A single-header C++20 library that facilitates runtime polymorphism.", "homepage": "https://github.com/microsoft/proxy", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 7acf206d8f0fed..86cc9fa4b1b307 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5829,7 +5829,7 @@ "port-version": 0 }, "proxy": { - "baseline": "1.0.1", + "baseline": "1.1.1", "port-version": 0 }, "proxygen": { diff --git a/versions/p-/proxy.json b/versions/p-/proxy.json index 3b2270661531e4..a310c169aeac54 100644 --- a/versions/p-/proxy.json +++ b/versions/p-/proxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "259a1e2615c5bd167974fcd5d8148434a1040319", + "version": "1.1.1", + "port-version": 0 + }, { "git-tree": "f0e6617956cb7c1b38369086d9615ccaad354729", "version": "1.0.1", From 5682b9c3d9a95fe866057bcf60081ab94d4cc65d Mon Sep 17 00:00:00 2001 From: Alexis La Goutte Date: Wed, 28 Sep 2022 20:27:52 +0200 Subject: [PATCH 664/791] [nghttp3] update to 0.7.1 (#26989) * nghttp3: update to 0.7.1 * nghttp3: remove port-version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update version * remove wrong git-tree Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/nghttp3/portfile.cmake | 4 ++-- ports/nghttp3/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/nghttp3.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/nghttp3/portfile.cmake b/ports/nghttp3/portfile.cmake index e106f91b7c1c06..ff977da92c80aa 100644 --- a/ports/nghttp3/portfile.cmake +++ b/ports/nghttp3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ngtcp2/nghttp3 - REF 635a532c8ff98cdbd6c141f85583632919102912 #v0.7.0 + GH-84 for fix UWP ARM 32 bits build - SHA512 d81a6b5c89a0c7065b76342f9ccfac6c39700ab2ff9822361b341235b96363b0582440282bdb19f8abd9231890baddf076ff955a3f535d564b87d13f319d4318 + REF v0.7.1 + SHA512 88b095b631235d7b0f568757c09f186a5cafe395f2eef4afb78bbe7185824113c40872379d75e7d63c9f637a26da61217465091875f788eef719fce31a7a83a6 HEAD_REF main ) diff --git a/ports/nghttp3/vcpkg.json b/ports/nghttp3/vcpkg.json index 642dc07553b6c6..e626c91111c9c7 100644 --- a/ports/nghttp3/vcpkg.json +++ b/ports/nghttp3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nghttp3", - "version": "0.7.0", - "port-version": 1, + "version": "0.7.1", "description": "Implementation of RFC 9114 HTTP/3 mapping over QUIC and RFC 9204 QPACK in C", "homepage": "https://github.com/ngtcp2/nghttp3", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 86cc9fa4b1b307..12dcdab13988a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5053,8 +5053,8 @@ "port-version": 0 }, "nghttp3": { - "baseline": "0.7.0", - "port-version": 1 + "baseline": "0.7.1", + "port-version": 0 }, "ngspice": { "baseline": "37", diff --git a/versions/n-/nghttp3.json b/versions/n-/nghttp3.json index 86df12c31f573d..a240b560d4043a 100644 --- a/versions/n-/nghttp3.json +++ b/versions/n-/nghttp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bffdd88b1fceb27e8af54b018033162eb42ff8f", + "version": "0.7.1", + "port-version": 0 + }, { "git-tree": "cf61122128fd277764b9319577d2ed3636c1d0d0", "version": "0.7.0", From 771420ca5c99f66db6767f0e744fa1fbec32edef Mon Sep 17 00:00:00 2001 From: kp <52385411+kp-cat@users.noreply.github.com> Date: Wed, 28 Sep 2022 20:50:51 +0200 Subject: [PATCH 665/791] [configcat] Update to version 1.0.0 (#27012) * [semver] Add new port * [semver] semver.json git-tree update * [semver] vcpkg-cmake + vcpkg-cmake-config deps * [semver] semver.json git-tree update * [z4kn4fein-semver] Add new port * [z4kn4fein-semver] Add new port * [z4kn4fein-semver] remove semver * [configcat] Update to version 1.0.0 * [configcat] Update to version 1.0.0 --- ports/configcat/portfile.cmake | 4 ++-- ports/configcat/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/configcat.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/configcat/portfile.cmake b/ports/configcat/portfile.cmake index 5499852915ff91..da1e8b0b9b4e7a 100644 --- a/ports/configcat/portfile.cmake +++ b/ports/configcat/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO configcat/cpp-sdk - REF v0.1.0 - SHA512 56dee6fe7e54020610c273325d74184ddca7271b434d3527f35eabbdf657bf1c2c84913f4018397ad178f275772fe1207245239237efa95e5692c4845e9a6e7b + REF v1.0.0 + SHA512 4727f72583bb2216160c1607f699b5b4efc957158b783dc3d944a07b27d5400dc4738adc87fe11a0bc819f0d0bde32bd2f39ed04f20bdc103de4a62175281f36 HEAD_REF master ) diff --git a/ports/configcat/vcpkg.json b/ports/configcat/vcpkg.json index 39677c585e1ca4..f483031635cf59 100644 --- a/ports/configcat/vcpkg.json +++ b/ports/configcat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "configcat", - "version": "0.1.0", + "version": "1.0.0", "description": "ConfigCat SDK for C++ provides easy integration for your application to ConfigCat. ConfigCat is a feature flag and configuration management service that lets you separate feature releases from deployments. Alternative to LaunchDarkly.", "homepage": "https://configcat.com/", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 12dcdab13988a8..aa5f2f68a1b7bc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1561,7 +1561,7 @@ "port-version": 0 }, "configcat": { - "baseline": "0.1.0", + "baseline": "1.0.0", "port-version": 0 }, "console-bridge": { diff --git a/versions/c-/configcat.json b/versions/c-/configcat.json index 3c86cf258e63e5..54e89c380a62f5 100644 --- a/versions/c-/configcat.json +++ b/versions/c-/configcat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8174af728666bc67db16f8bba6cd72f977fc6ce", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "d163eba9cf1e8cdc7585806666d8f83330c50678", "version": "0.1.0", From 6d5a3a5e4aafcff4ffd3d02d1c5b9cb662fad98c Mon Sep 17 00:00:00 2001 From: "Dustin L. Howett" Date: Wed, 28 Sep 2022 13:52:09 -0500 Subject: [PATCH 666/791] [bzip2] add a "tool" feature to control the build of bzip2.exe (#26998) * [bzip2] add a "tool" feature to control the build of bzip2.exe This is modelled after curl[tool], but it is on by default for compatibility with the existing portfile. * x-add-version, format * Fix bzip2 git-tree. * Remove deprecated rules * update bzip2 git-tree * Add the bzip2-1.0.6 SPDX license identifier * treeish Co-authored-by: Billy O'Neal --- ports/bzip2/portfile.cmake | 12 +++++++++--- ports/bzip2/vcpkg.json | 23 +++++++++++++++++++++-- versions/b-/bzip2.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 36141ffcbc6e8b..c03f48c48fb779 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -11,17 +11,23 @@ vcpkg_extract_source_archive_ex( PATCHES fix-import-export-macros.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + tool BZIP2_SKIP_TOOLS +) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DBZIP2_SKIP_HEADERS=ON -DBZIP2_SKIP_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H) diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json index 2f8b8aabf328a9..55cdb4ac54552b 100644 --- a/ports/bzip2/vcpkg.json +++ b/ports/bzip2/vcpkg.json @@ -1,8 +1,27 @@ { "name": "bzip2", "version-semver": "1.0.8", - "port-version": 2, + "port-version": 3, "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.", "homepage": "https://sourceware.org/bzip2/", - "documentation": "https://sourceware.org/bzip2/docs.html" + "documentation": "https://sourceware.org/bzip2/docs.html", + "license": "bzip2-1.0.6", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "tool" + ], + "features": { + "tool": { + "description": "Builds bzip2 executable" + } + } } diff --git a/versions/b-/bzip2.json b/versions/b-/bzip2.json index 7025c509f3b16e..b5fb289ec51645 100644 --- a/versions/b-/bzip2.json +++ b/versions/b-/bzip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ee6ad1d0bf78137f7f77671f393abc83363a710", + "version-semver": "1.0.8", + "port-version": 3 + }, { "git-tree": "a1ea352502e69888a565563d9151d3f7ab609fb1", "version-semver": "1.0.8", diff --git a/versions/baseline.json b/versions/baseline.json index aa5f2f68a1b7bc..f84b60c0714263 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1230,7 +1230,7 @@ }, "bzip2": { "baseline": "1.0.8", - "port-version": 2 + "port-version": 3 }, "c-ares": { "baseline": "1.18.1", From 51685e17d6982871e1e8bab164edfe16f7ae6866 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Wed, 28 Sep 2022 21:54:29 +0300 Subject: [PATCH 667/791] at-spi2-atk 2.38.0 port (#26766) at-spi2-core 2.44.1 port Co-authored-by: Billy O'Neal --- ports/at-spi2-atk/portfile.cmake | 29 +++++++++++++++++++ ports/at-spi2-atk/vcpkg.json | 17 +++++++++++ ports/at-spi2-core/portfile.cmake | 48 +++++++++++++++++++++++++++++++ ports/at-spi2-core/vcpkg.json | 19 ++++++++++++ versions/a-/at-spi2-atk.json | 9 ++++++ versions/a-/at-spi2-core.json | 9 ++++++ versions/baseline.json | 8 ++++++ 7 files changed, 139 insertions(+) create mode 100644 ports/at-spi2-atk/portfile.cmake create mode 100644 ports/at-spi2-atk/vcpkg.json create mode 100644 ports/at-spi2-core/portfile.cmake create mode 100644 ports/at-spi2-core/vcpkg.json create mode 100644 versions/a-/at-spi2-atk.json create mode 100644 versions/a-/at-spi2-core.json diff --git a/ports/at-spi2-atk/portfile.cmake b/ports/at-spi2-atk/portfile.cmake new file mode 100644 index 00000000000000..9b7ba9134b5d71 --- /dev/null +++ b/ports/at-spi2-atk/portfile.cmake @@ -0,0 +1,29 @@ +if(VCPKG_TARGET_IS_LINUX) + message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libdbus-1\n\nThese can be installed on Ubuntu systems via apt-get install libdbus-1-dev") +endif() + +vcpkg_from_gitlab( + OUT_SOURCE_PATH SOURCE_PATH + GITLAB_URL https://gitlab.gnome.org + REPO GNOME/at-spi2-atk + REF AT_SPI2_ATK_2_38_0 + SHA512 d065a22e46f5d9459e14bc81050795e8b60ba8d6650ec9edf90ec6c205e68eb4ea3cc01f096cf636b066439b85892f203bc7a1c9d41f8ca899f29777556aa6cd +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dtests=false +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/at-spi2-atk/vcpkg.json b/ports/at-spi2-atk/vcpkg.json new file mode 100644 index 00000000000000..27c85cbdd925e1 --- /dev/null +++ b/ports/at-spi2-atk/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "at-spi2-atk", + "version": "2.38.0", + "description": "Implementation of the ATK interfaces in terms of the libatspi2 API.", + "homepage": "https://www.gtk.org/", + "license": null, + "supports": "linux", + "dependencies": [ + "at-spi2-core", + "atk", + "libxml2", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/ports/at-spi2-core/portfile.cmake b/ports/at-spi2-core/portfile.cmake new file mode 100644 index 00000000000000..304e512d8ef398 --- /dev/null +++ b/ports/at-spi2-core/portfile.cmake @@ -0,0 +1,48 @@ +if(VCPKG_TARGET_IS_LINUX) + message(STATUS "${PORT} currently requires the following libraries from the system package manager:\n libdbus-1\n libxi-dev\n libxtst-dev\n\nThese can be installed on Ubuntu systems via apt-get install libdbus-1-dev libxi-dev libxtst-dev") +endif() + +vcpkg_from_gitlab( + OUT_SOURCE_PATH SOURCE_PATH + GITLAB_URL https://gitlab.gnome.org + REPO GNOME/at-spi2-core + REF AT_SPI2_CORE_2_44_1 + SHA512 4e98b76e019f33af698a5e2b7ae7ce17ce0ff57784b4d505fe4bad58b097080899c1ca82b443502068c5504b60886e2d4a341bba833e0279ebef352211bf3813 +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dintrospection=no + ADDITIONAL_NATIVE_BINARIES + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + ADDITIONAL_CROSS_BINARIES + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/atspi-2.pc" + "-DG_LOG_DOMAIN=\"dbind\"" "" + ) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/atspi-2.pc" + "-DG_LOG_DOMAIN=\"dbind\"" "" + ) +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() diff --git a/ports/at-spi2-core/vcpkg.json b/ports/at-spi2-core/vcpkg.json new file mode 100644 index 00000000000000..bab5f6f62ed462 --- /dev/null +++ b/ports/at-spi2-core/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "at-spi2-core", + "version": "2.44.1", + "description": "Base DBus XML interfaces for accessibility, the accessibility registry daemon, and atspi library.", + "homepage": "https://www.gtk.org/", + "license": null, + "supports": "linux", + "dependencies": [ + "glib", + { + "name": "glib", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/versions/a-/at-spi2-atk.json b/versions/a-/at-spi2-atk.json new file mode 100644 index 00000000000000..a97e2158faa94e --- /dev/null +++ b/versions/a-/at-spi2-atk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ebb28a9cdbd06d3185ba2e0cfc1945be23a0a608", + "version": "2.38.0", + "port-version": 0 + } + ] +} diff --git a/versions/a-/at-spi2-core.json b/versions/a-/at-spi2-core.json new file mode 100644 index 00000000000000..6013354d27c9cb --- /dev/null +++ b/versions/a-/at-spi2-core.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dd1e736f89692df6c27db81eed2269458666841b", + "version": "2.44.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f84b60c0714263..d21917de0e1fe7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -224,6 +224,14 @@ "baseline": "1.1", "port-version": 1 }, + "at-spi2-atk": { + "baseline": "2.38.0", + "port-version": 0 + }, + "at-spi2-core": { + "baseline": "2.44.1", + "port-version": 0 + }, "atk": { "baseline": "2.38.0", "port-version": 2 From 7acd91abc2b19f8b1c59b7f968d25baa5bea8598 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 29 Sep 2022 14:15:38 -0700 Subject: [PATCH 668/791] [google-cloud-cpp] fix feature dependencies (#27001) * [google-cloud-cpp] fix feature dependencies * Add missing 'osconfig' feature * Fix versions --- ports/google-cloud-cpp/vcpkg.json | 31 ++++++++++++++++++++++++++++++- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index a8143fc4f56390..871a13d30761c1 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", "version": "2.2.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", @@ -105,7 +106,9 @@ "name": "google-cloud-cpp", "default-features": false, "features": [ - "grpc-common" + "accesscontextmanager", + "grpc-common", + "osconfig" ] } ] @@ -201,6 +204,7 @@ "name": "google-cloud-cpp", "default-features": false, "features": [ + "grafeas", "grpc-common" ] } @@ -274,6 +278,7 @@ "name": "google-cloud-cpp", "default-features": false, "features": [ + "grafeas", "grpc-common" ] } @@ -460,6 +465,18 @@ } ] }, + "grafeas": { + "description": "Protocol buffers implementing the 'Grafeas API' (metadata about software artifacts)", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "grpc-common": { "description": "Dependencies used by all gRPC-based libraries", "dependencies": [ @@ -643,6 +660,18 @@ } ] }, + "osconfig": { + "description": "Cloud OS Config 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": [ diff --git a/versions/baseline.json b/versions/baseline.json index d21917de0e1fe7..4c3e22b416daa5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2690,7 +2690,7 @@ }, "google-cloud-cpp": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 7f58bd91650003..d40d8c9d5a2495 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1787308d659051c50c95298d855cd7ad5308d8b4", + "version": "2.2.0", + "port-version": 1 + }, { "git-tree": "47537b3b241e2f6a757553ad9475c44c7e13eb01", "version": "2.2.0", From 430f3d37875eec605c402de4d84501f638056ca2 Mon Sep 17 00:00:00 2001 From: Elias Benali <54529923+ebenali@users.noreply.github.com> Date: Thu, 29 Sep 2022 14:20:01 -0700 Subject: [PATCH 669/791] [cpp-httplib] Update to v0.11.2 (#26957) (#26958) * [cpp-httplib] Update to v0.11.2 (#26957) * [cpp-httplib] Update to v0.11.2 * [cpp-httplib] Update to v0.11.2: x-add-version * [cpp-httplib]: Update to v0.11.2: x-add-version * Update cpp-httplib.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/cpp-httplib/portfile.cmake | 4 ++-- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index fe22c0e76a8b74..078e5d2db1d5e4 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF 9452c0a4b69c5e4e31169ed32e961d330695122c #v0.10.7 - SHA512 23c4ca159ed4ddf29c3911436436502df76420d8bc8b202f290627de96ee6a741b74409a90f943f3fbbb59af1975bd8c36a94bd4c5eff3981f4514feb326e110 + REF 8e10d4e8e7febafce0632810262e81e853b2065f #v0.11.2 + SHA512 a213edb3f24c3147879b0500df2baf8819ac39c7943ee01bf096fbae512b81694c1b7805cfae15918ef5820ee10316de268e71c3fe25d1f8cfb39dd384678f1c HEAD_REF master ) diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 9c06a6f6544e72..dd4aa258d15f7d 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.10.7", + "version": "0.11.2", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 4c3e22b416daa5..5e821ef4a3dbaf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1609,7 +1609,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.10.7", + "baseline": "0.11.2", "port-version": 0 }, "cpp-ipc": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index cd1162b97c422a..883d4890362d56 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "447d89cebbf0501f587daf989cd578de438617f2", + "version": "0.11.2", + "port-version": 0 + }, { "git-tree": "48c366ec15c570dbd1968b288649d2c33ce6ca08", "version": "0.10.7", From ab5472aaa9579f47c08bb5e849f7402fc97615ea Mon Sep 17 00:00:00 2001 From: kunitoki Date: Thu, 29 Sep 2022 23:26:17 +0200 Subject: [PATCH 670/791] [LuaBridge3] Add new port (#26600) * LuaBridge3 support for vcpkg * Fix vcpkg.json * Generated files from ./vcpkg x-add-version luabridge3 * Update ports/luabridge3/portfile.cmake Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> * Update portfile.cmake * Update portfile.cmake * Update portfile.cmake * improve portfile.cmake * update version * Update versions for LuaBridge3 * Updated versions * update hash * version Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: FrankXie --- ports/luabridge3/portfile.cmake | 15 +++++++++++++++ ports/luabridge3/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/l-/luabridge3.json | 9 +++++++++ 4 files changed, 35 insertions(+) create mode 100644 ports/luabridge3/portfile.cmake create mode 100644 ports/luabridge3/vcpkg.json create mode 100644 versions/l-/luabridge3.json diff --git a/ports/luabridge3/portfile.cmake b/ports/luabridge3/portfile.cmake new file mode 100644 index 00000000000000..3bf29f0b31ba83 --- /dev/null +++ b/ports/luabridge3/portfile.cmake @@ -0,0 +1,15 @@ +# header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kunitoki/LuaBridge3 + REF d811afc00bc3d19f548d5aa28ccfe16b09e62ea4 # 3.0-beta4 + SHA512 93c6187ac171ea3cc8c01ebdd3ea215b599b06268f83e4c35e9532dbeec94fde9219b26bc1cf8929bbafa1881f5258cbaf61abf89514ee8b557e52df0f05c2eb + HEAD_REF master +) + +# Copy the header files +file(COPY "${SOURCE_PATH}/Source/LuaBridge" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/luabridge3/vcpkg.json b/ports/luabridge3/vcpkg.json new file mode 100644 index 00000000000000..53cbce6f373f96 --- /dev/null +++ b/ports/luabridge3/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "luabridge3", + "version": "3.0-beta4", + "description": "A lightweight, dependency-free, suitable for game development library for binding Lua to C++17", + "homepage": "https://github.com/kunitoki/LuaBridge3", + "license": "MIT" +} diff --git a/versions/baseline.json b/versions/baseline.json index 5e821ef4a3dbaf..4eefee2c69ea45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4508,6 +4508,10 @@ "baseline": "2.6", "port-version": 1 }, + "luabridge3": { + "baseline": "3.0-beta4", + "port-version": 0 + }, "luafilesystem": { "baseline": "1.8.0", "port-version": 2 diff --git a/versions/l-/luabridge3.json b/versions/l-/luabridge3.json new file mode 100644 index 00000000000000..ae8ea7a533d3a5 --- /dev/null +++ b/versions/l-/luabridge3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "832dcdfc1e99b85241865abda8434a33424a3f4b", + "version": "3.0-beta4", + "port-version": 0 + } + ] +} From 07e0d8cb4ffd2c2c61e69a0e4e4135dc9fbf2b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 29 Sep 2022 23:28:51 +0200 Subject: [PATCH 671/791] [libofx] new port (#26864) * [libofx] new port * [libofx] update version * [libofx] update features * [libofx] update versions * [libofx] no support for UWP for now * [libofx] update versions * [libofx] update website * [libofx] update versions * [libofx] add license field * [libofx] update versions * [libofx] add missing newline * [libofx] update versions --- ports/libofx/portfile.cmake | 36 ++++++++++++++++++++++++++++++++++++ ports/libofx/vcpkg.json | 36 ++++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libofx.json | 9 +++++++++ 4 files changed, 85 insertions(+) create mode 100644 ports/libofx/portfile.cmake create mode 100644 ports/libofx/vcpkg.json create mode 100644 versions/l-/libofx.json diff --git a/ports/libofx/portfile.cmake b/ports/libofx/portfile.cmake new file mode 100644 index 00000000000000..32c6135b3a9142 --- /dev/null +++ b/ports/libofx/portfile.cmake @@ -0,0 +1,36 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libofx/libofx + REF 0.10.8 + SHA512 e241a9ad766a91f53a2b65c316e87ee43df9173b25904d1af05c2ce491c8d781278333c20206751787f540c7bc9880b32a41a4646714fd1586f22801394d89a3 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "iconv" ENABLE_ICONV + "ofxdump" ENABLE_OFXDUMP + "ofx2qif" ENABLE_OFX2QIF +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DENABLE_OFXCONNECT=OFF # depends on libxml++ ABI 2.6, while vcpkg ships ABI 4.0. See https://libxmlplusplus.github.io/libxmlplusplus/#abi-versions + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME LibOFX CONFIG_PATH lib/cmake/libofx) +vcpkg_copy_pdbs() + +list(REMOVE_ITEM FEATURES core iconv) +if(FEATURES) + vcpkg_copy_tools(TOOL_NAMES ${FEATURES} AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") diff --git a/ports/libofx/vcpkg.json b/ports/libofx/vcpkg.json new file mode 100644 index 00000000000000..39ec14490b85d4 --- /dev/null +++ b/ports/libofx/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "libofx", + "version": "0.10.8", + "description": "OFX banking protocol abstraction library", + "homepage": "https://github.com/libofx/libofx", + "license": "GPL-2.0-only", + "supports": "!uwp", + "dependencies": [ + "libopensp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "iconv" + ], + "features": { + "iconv": { + "description": "Builds with ICONV support for encoding conversion", + "dependencies": [ + "libiconv" + ] + }, + "ofx2qif": { + "description": "Enables OFX file to QIF (Quicken Interchange Format) file converter" + }, + "ofxdump": { + "description": "Enables ofxdump utility which prints, in human readable form, everything the library understands about a file" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 4eefee2c69ea45..77432f258ec87f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3980,6 +3980,10 @@ "baseline": "2.4.0", "port-version": 9 }, + "libofx": { + "baseline": "0.10.8", + "port-version": 0 + }, "libogg": { "baseline": "1.3.5", "port-version": 0 diff --git a/versions/l-/libofx.json b/versions/l-/libofx.json new file mode 100644 index 00000000000000..a041ab5d2952f7 --- /dev/null +++ b/versions/l-/libofx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "359386dc0b18eea302535a62b8d429325c457ebc", + "version": "0.10.8", + "port-version": 0 + } + ] +} From 2f0a16b5ae24fec6c615924e2fbc8bc43ab73764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 29 Sep 2022 23:30:01 +0200 Subject: [PATCH 672/791] [angle] update list of required apt packages (#26815) * [angle] fix the name of Ubuntu/Debian mesa dev package * [angle] update version --- ports/angle/portfile.cmake | 2 +- ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index ed604ecb420eb4..55e7ba16e73e28 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -1,6 +1,6 @@ if (VCPKG_TARGET_IS_LINUX) message(WARNING "Building with a gcc version less than 6.1 is not supported.") - message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libx11-dev\n libmesa-dev\n libxi-dev\n libxext-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev libmesa-dev libxi-dev libxext-dev.") + message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libx11-dev\n mesa-common-dev\n libxi-dev\n libxext-dev\n\nThese can be installed on Ubuntu systems via apt-get install libx11-dev mesa-common-dev libxi-dev libxext-dev.") endif() if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 2c582aeb5f9502..230cce624a5465 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_4472", - "port-version": 3, + "port-version": 4, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 942f5ceca75adb..3a3f7ddec67060 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d88baa0c355514a753460f90afb0451434460484", + "version-string": "chromium_4472", + "port-version": 4 + }, { "git-tree": "c3b63c0d8bf584235c057cb40486152ebe3fa0a6", "version-string": "chromium_4472", diff --git a/versions/baseline.json b/versions/baseline.json index 77432f258ec87f..c3e03523deaeec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -102,7 +102,7 @@ }, "angle": { "baseline": "chromium_4472", - "port-version": 3 + "port-version": 4 }, "antlr4": { "baseline": "4.10.1", From 10f65a8f08af451a041e9c0b0b2cb056c6497196 Mon Sep 17 00:00:00 2001 From: Craig Edwards Date: Fri, 30 Sep 2022 22:29:41 +0100 Subject: [PATCH 673/791] [bot] Update DPP to v10.0.20 (#27044) --- ports/dpp/portfile.cmake | 4 ++-- ports/dpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/dpp/portfile.cmake b/ports/dpp/portfile.cmake index 614233532490eb..a22487b4bcf824 100644 --- a/ports/dpp/portfile.cmake +++ b/ports/dpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brainboxdotcc/DPP - REF d7f92689381e66decf7ec7e247570690534206a4 - SHA512 994d5ea58b7d95aa28f831864017018dacfeb0f52fd86ab2fc58a913ac041b0097dbef04d4c62ba4a4726c8b7a24e3360c06300fae5d5a79a8f2ab855e701b72 + REF cb591768ee009be2c935847d087fc935ef075ce7 + SHA512 18832c99f208aba4fe44b4fd68fa7132518b16f2535af1323c274282f3128ad7ddb250b5d6c34a87558adf33ba7000561c8abf3be735f221baf978971b4d943d HEAD_REF master PATCHES make-pkgconfig-required.patch diff --git a/ports/dpp/vcpkg.json b/ports/dpp/vcpkg.json index 52123767d7e615..09778ae3a9a1a5 100644 --- a/ports/dpp/vcpkg.json +++ b/ports/dpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dpp", - "version": "10.0.19", + "version": "10.0.20", "description": "D++ Extremely Lightweight C++ Discord Library.", "homepage": "https://dpp.dev/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index c3e03523deaeec..4e7dd51b35db16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2005,7 +2005,7 @@ "port-version": 1 }, "dpp": { - "baseline": "10.0.19", + "baseline": "10.0.20", "port-version": 0 }, "draco": { diff --git a/versions/d-/dpp.json b/versions/d-/dpp.json index 3cca2b75d19d7d..ba034735b27dad 100644 --- a/versions/d-/dpp.json +++ b/versions/d-/dpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d961ae0b2739368c053459b3f6d53ecce397a6f", + "version": "10.0.20", + "port-version": 0 + }, { "git-tree": "d0f56da8e2b3026a15bbf3856d1c601a635065e6", "version": "10.0.19", From 4f83a5642e32287b0605412c95ecc23a1710f7cb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 30 Sep 2022 23:31:13 +0200 Subject: [PATCH 674/791] [jxrlib] Fix mingw build (#27042) * Fix mingw build * Minor portfile changes * Revise guiddef.h selection * Update versions * CI [skip actions] --- ports/jxrlib/CMakeLists.txt | 6 +++-- ports/jxrlib/fix-mingw.patch | 51 ++++++++++++++++++++++++++++++++++++ ports/jxrlib/guiddef.patch | 20 ++++++++++++++ ports/jxrlib/portfile.cmake | 19 +++++--------- ports/jxrlib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/jxrlib.json | 5 ++++ 7 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 ports/jxrlib/fix-mingw.patch create mode 100644 ports/jxrlib/guiddef.patch diff --git a/ports/jxrlib/CMakeLists.txt b/ports/jxrlib/CMakeLists.txt index 7a73e3cba5ace4..3f0513f7d3924f 100644 --- a/ports/jxrlib/CMakeLists.txt +++ b/ports/jxrlib/CMakeLists.txt @@ -18,9 +18,11 @@ macro(JXR_MAKE_OBJ SET_NAME) endforeach() endmacro() -if(NOT MSVC) +if(NOT WIN32) add_definitions(-D__ANSI__) - add_compile_options(-Wno-error=implicit-function-declaration) +endif() +if(NOT MSVC) + add_compile_options(-Wno-error=implicit-function-declaration -Wno-endif-labels) endif() include(TestBigEndian) diff --git a/ports/jxrlib/fix-mingw.patch b/ports/jxrlib/fix-mingw.patch new file mode 100644 index 00000000000000..10ea197d5f82eb --- /dev/null +++ b/ports/jxrlib/fix-mingw.patch @@ -0,0 +1,51 @@ +diff --git a/common/include/wmspecstrings_adt.h b/common/include/wmspecstrings_adt.h +index ca7f25f..d5eb028 100644 +--- a/common/include/wmspecstrings_adt.h ++++ b/common/include/wmspecstrings_adt.h +@@ -36,6 +36,10 @@ + __type_has_adt_prop(compname,valid_schars) \ + __type_has_adt_prop(compname,correct_len) \ + __nullterminated ++#ifdef __MINGW32__ ++#undef __$compname_props ++#define __$compname_props ++#endif + #if defined(UNICODE) || defined(_UNICODE) + #define __$TCHAR unsigned short + #else +diff --git a/image/sys/strcodec.h b/image/sys/strcodec.h +index 695a454..9fad5b6 100644 +--- a/image/sys/strcodec.h ++++ b/image/sys/strcodec.h +@@ -59,7 +59,7 @@ + //#ifdef WIN32 + #if defined(WIN32) && !defined(UNDER_CE) // WIN32 seems to be defined always in VS2005 for ARM platform + #define PLATFORM_X86 +-#include "..\x86\x86.h" ++#include "../x86/x86.h" + #endif + + #ifndef UNREFERENCED_PARAMETER +diff --git a/jxrgluelib/JXRMeta.h b/jxrgluelib/JXRMeta.h +index b7b5880..7c9d653 100644 +--- a/jxrgluelib/JXRMeta.h ++++ b/jxrgluelib/JXRMeta.h +@@ -111,6 +111,18 @@ + #define __out_win __out + #endif + ++#ifndef __in ++#define __in ++#endif ++#ifndef __out ++#define __out ++#endif ++#ifndef __in_ecount ++#define __in_ecount(x) ++#endif ++#ifndef __out_ecount ++#define __out_ecount(x) ++#endif + + //================================================================ + diff --git a/ports/jxrlib/guiddef.patch b/ports/jxrlib/guiddef.patch new file mode 100644 index 00000000000000..4ff1be2ceec35b --- /dev/null +++ b/ports/jxrlib/guiddef.patch @@ -0,0 +1,20 @@ +diff --git a/common/include/guiddef.h b/common/include/jxrguiddef.h +similarity index 100% +rename from common/include/guiddef.h +rename to common/include/jxrguiddef.h +diff --git a/jxrgluelib/JXRGlue.h b/jxrgluelib/JXRGlue.h +index d0b219c..c3e5d2b 100644 +--- a/jxrgluelib/JXRGlue.h ++++ b/jxrgluelib/JXRGlue.h +@@ -32,7 +32,11 @@ extern "C" { + #endif + + #include ++#ifdef _WIN32 + #include ++#else ++#include ++#endif + + //================================================================ + #define WMP_SDK_VERSION 0x0101 diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index cdfe1fd1c7926d..c3e523d27edaf3 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -6,29 +6,24 @@ vcpkg_from_github( REF f7521879862b9085318e814c6157490dd9dbbdb4 SHA512 f5617cbe73b6b905cc6bba181e6a3efedd59584f7a8c90e0f34db580cfdad4239a2ab753df4e221f26a5c0db51475b021052e3b9e3ab3673573573b1d57f3fdb HEAD_REF master + PATCHES + guiddef.patch + fix-mingw.patch ) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION ${SOURCE_PATH}) - -if(NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Darwin AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES Linux AND NOT VCPKG_CMAKE_SYSTEM_NAME MATCHES iOS) - # The file guiddef.h is part of the Windows SDK, - # we then remove the local copy shipped with jxrlib - file(REMOVE "${SOURCE_PATH}/common/include/guiddef.h") -endif() +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -#install FindJXR.cmake file file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/FindJXR.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") -# Handle copyright +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jxr") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jxrlib/vcpkg.json b/ports/jxrlib/vcpkg.json index 5e350632995b2b..7565d2213f437c 100644 --- a/ports/jxrlib/vcpkg.json +++ b/ports/jxrlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "jxrlib", "version": "2019.10.9", - "port-version": 4, + "port-version": 5, "description": "Open source implementation of the jpegxr image format standard.", "homepage": "https://github.com/4creators/jxrlib", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 4e7dd51b35db16..cdb4af1d60f475 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3206,7 +3206,7 @@ }, "jxrlib": { "baseline": "2019.10.9", - "port-version": 4 + "port-version": 5 }, "kangaru": { "baseline": "4.3.1", diff --git a/versions/j-/jxrlib.json b/versions/j-/jxrlib.json index 9689aa86e1f1ce..5a3cbe93497d52 100644 --- a/versions/j-/jxrlib.json +++ b/versions/j-/jxrlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e303b910797ec21313839eac286cf6baaf31c5a", + "version": "2019.10.9", + "port-version": 5 + }, { "git-tree": "faadd72c2d406fce9c076c025285aa692995a8b5", "version": "2019.10.9", From 39420a74dd3bf465403a40c55488f1535a4595f6 Mon Sep 17 00:00:00 2001 From: Clayton Wheeler Date: Fri, 30 Sep 2022 16:32:47 -0500 Subject: [PATCH 675/791] [mimalloc] build for ARM Linux, Mac (#27041) --- ports/mimalloc/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/mimalloc.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 60508c3b5c059d..a7e2a32afecd24 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,10 +1,11 @@ { "name": "mimalloc", "version": "2.0.6", + "port-version": 1, "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "license": "MIT", - "supports": "!(arm | uwp)", + "supports": "!((arm & windows) | uwp)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index cdb4af1d60f475..d70587a898f15c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4730,7 +4730,7 @@ }, "mimalloc": { "baseline": "2.0.6", - "port-version": 0 + "port-version": 1 }, "minc": { "baseline": "2.4.03", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index cf993872242223..8e6292cb4276e9 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "057ac5484ad7a120ffa465073655fe6e10684d4a", + "version": "2.0.6", + "port-version": 1 + }, { "git-tree": "e5d0b88ffbb864754eb8b01ac111f84adb8a36a8", "version": "2.0.6", From d987016d042be166239d6978bd8c8203d8710c81 Mon Sep 17 00:00:00 2001 From: Dimitrij Mijoski Date: Fri, 30 Sep 2022 23:34:02 +0200 Subject: [PATCH 676/791] [nuspell] Update port to v5.1.2 (#27037) * [nuspell] Update port to v5.1.2 * x-add-version --- ports/nuspell/portfile.cmake | 4 ++-- ports/nuspell/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nuspell.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nuspell/portfile.cmake b/ports/nuspell/portfile.cmake index ca5cbe1ee45318..43b4d4c6ae0a5a 100644 --- a/ports/nuspell/portfile.cmake +++ b/ports/nuspell/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nuspell/nuspell - REF v5.1.1 - SHA512 c33a52e3603071d3281b7cdcfa42776cd7ecb998292939538e53e364cfff63227cf094cd88ee6072b8a857f5d85c984c359a16b480dd462dac9cfd602cfd6c2c + REF v5.1.2 + SHA512 138212ae5340836f0bc85d9d5327dc43ffdb1481ca72678b4619938b86c4c8e7c156eec1446f459636460a9015cd476031ad53d0979325e637ed97c19e2f87c8 HEAD_REF master ) diff --git a/ports/nuspell/vcpkg.json b/ports/nuspell/vcpkg.json index 15f37dff5300d0..389b567266b769 100644 --- a/ports/nuspell/vcpkg.json +++ b/ports/nuspell/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nuspell", - "version-semver": "5.1.1", + "version-semver": "5.1.2", "description": [ "Nuspell is a fast and safe spelling checker software program.", "It is designed for languages with rich morphology and complex word compounding.", diff --git a/versions/baseline.json b/versions/baseline.json index d70587a898f15c..7fd254490c831f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5161,7 +5161,7 @@ "port-version": 0 }, "nuspell": { - "baseline": "5.1.1", + "baseline": "5.1.2", "port-version": 0 }, "nvtt": { diff --git a/versions/n-/nuspell.json b/versions/n-/nuspell.json index b277222189c5b5..3e29a947878ede 100644 --- a/versions/n-/nuspell.json +++ b/versions/n-/nuspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6175a848b3c05c1adf0816f1b3b4dd056c12ed40", + "version-semver": "5.1.2", + "port-version": 0 + }, { "git-tree": "0daf4a7623ab68c7f706b815dbe29e8f4627668e", "version-semver": "5.1.1", From 1d3eafa05dcf0866bb9385cd39406825633b52c1 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 30 Sep 2022 23:35:44 +0200 Subject: [PATCH 677/791] [hpx] no absolute paths (#27035) --- ports/hpx/portfile.cmake | 4 +--- ports/hpx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hpx.json | 5 +++++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 00d351d31f0f15..6401ea5a90dcbf 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -90,13 +90,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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}/bin/hpxcxx" "${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index ba47e04b643a5d..1f7a876e9cdbc2 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hpx", "version": "1.8.0", - "port-version": 1, + "port-version": 2, "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." diff --git a/versions/baseline.json b/versions/baseline.json index 7fd254490c831f..cbf1c5537371d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2902,7 +2902,7 @@ }, "hpx": { "baseline": "1.8.0", - "port-version": 1 + "port-version": 2 }, "http-parser": { "baseline": "2.9.4", diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 1bdd4bc4647c3d..7334a4957067fa 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65b93e6c2b9660897d82d6dd32c0edb6689aa6e6", + "version": "1.8.0", + "port-version": 2 + }, { "git-tree": "aaf58e8627662fd841d011ea7e71d23507573772", "version": "1.8.0", From 4bff872bb20d99cb2fbe1a7e4ceaec44fa0be604 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 30 Sep 2022 23:38:26 +0200 Subject: [PATCH 678/791] [roaring] no absolute paths (#27034) --- ports/roaring/portfile.cmake | 2 ++ ports/roaring/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/roaring.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/roaring/portfile.cmake b/ports/roaring/portfile.cmake index e058a246be3dbb..e04848457d2e81 100644 --- a/ports/roaring/portfile.cmake +++ b/ports/roaring/portfile.cmake @@ -28,5 +28,7 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_pkgconfig() + # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/roaring/vcpkg.json b/ports/roaring/vcpkg.json index dfbe9bed30c346..f76f8ade377e4f 100644 --- a/ports/roaring/vcpkg.json +++ b/ports/roaring/vcpkg.json @@ -1,6 +1,7 @@ { "name": "roaring", "version": "0.7.1", + "port-version": 1, "description": "A better compressed bitset in C (and C++)", "homepage": "https://github.com/RoaringBitmap/CRoaring", "license": "Apache-2.0 OR MIT", diff --git a/versions/baseline.json b/versions/baseline.json index cbf1c5537371d4..0cc193aaa9b152 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6486,7 +6486,7 @@ }, "roaring": { "baseline": "0.7.1", - "port-version": 0 + "port-version": 1 }, "robin-hood-hashing": { "baseline": "3.11.5", diff --git a/versions/r-/roaring.json b/versions/r-/roaring.json index 469d922ab27bd8..0daeeb1ff1a606 100644 --- a/versions/r-/roaring.json +++ b/versions/r-/roaring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98f7eb1a2902435670c2f7eb019a47d4cbe4451a", + "version": "0.7.1", + "port-version": 1 + }, { "git-tree": "53f447b8e40bdaef2d1e693942505f95357e7279", "version": "0.7.1", From a7eb62640d52285c80d0ff2a56e399b42f77a6f7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 30 Sep 2022 23:42:18 +0200 Subject: [PATCH 679/791] [guile] no absolute paths (#27033) --- ports/guile/portfile.cmake | 11 +++++++++++ ports/guile/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/guile.json | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ports/guile/portfile.cmake b/ports/guile/portfile.cmake index c41acdf4537812..e8bbbb410611c4 100644 --- a/ports/guile/portfile.cmake +++ b/ports/guile/portfile.cmake @@ -18,6 +18,17 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() +if (NOT VCPKG_BUILD_TYPE) + foreach(file guile-tools guile-config guild) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/${file}" "${CURRENT_INSTALLED_DIR}/debug/../tools/guile/debug/bin" "`dirname $0`") + endforeach() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/guile-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") +endif() +foreach(file guile-tools guile-config guild) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${file}" "${CURRENT_INSTALLED_DIR}/tools/guile/bin" "`dirname $0`") +endforeach() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/guile-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + file( INSTALL "${GUILE_SOURCES}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/guile/vcpkg.json b/ports/guile/vcpkg.json index 59c7e4163523f7..01ccab5c5a6095 100644 --- a/ports/guile/vcpkg.json +++ b/ports/guile/vcpkg.json @@ -1,6 +1,7 @@ { "name": "guile", "version": "3.0.8", + "port-version": 1, "description": "GNU's programming and extension language", "homepage": "https://www.gnu.org/software/guile/", "documentation": "https://www.gnu.org/software/guile/manual/", diff --git a/versions/baseline.json b/versions/baseline.json index 0cc193aaa9b152..8e2889843eba77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2802,7 +2802,7 @@ }, "guile": { "baseline": "3.0.8", - "port-version": 0 + "port-version": 1 }, "guilite": { "baseline": "2022-05-05", diff --git a/versions/g-/guile.json b/versions/g-/guile.json index bed043b1452f13..2593a3ab08e371 100644 --- a/versions/g-/guile.json +++ b/versions/g-/guile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ccaa1b9bc0ba4c7397a8f5a05cf99df4c47897d9", + "version": "3.0.8", + "port-version": 1 + }, { "git-tree": "1c74041cde8519afb26d9fa588b8d24877d35514", "version": "3.0.8", From fc5a7c6d6e1940edb68a2a27b1410db68cbbb06f Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Sat, 1 Oct 2022 05:48:11 +0800 Subject: [PATCH 680/791] [catch2] build static lib on WIN32 (#27021) * [catch2] build static lib on WIN32 * update version * del the patch * update version --- ports/catch2/portfile.cmake | 5 +++++ ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 3cccd9e2d6e4c4..7e786c9dc296f4 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,3 +1,8 @@ + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index d714616b2688b2..cf338398a2ab0d 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "3.1.0", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "license": "BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 8e2889843eba77..48f7313d508afd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1314,7 +1314,7 @@ }, "catch2": { "baseline": "3.1.0", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 2128ee1aafbe35..3e448c8ef83cde 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "286e5ac6cd8702b9b6cf6f486c35cc2516c7950b", + "version-semver": "3.1.0", + "port-version": 1 + }, { "git-tree": "414a5ef901a6f05c85b4f19ff2d0d216933a65b1", "version-semver": "3.1.0", From 65521f7dc3701c25d72ecc544f798198b9a4aa33 Mon Sep 17 00:00:00 2001 From: Roel Standaert Date: Fri, 30 Sep 2022 23:52:19 +0200 Subject: [PATCH 681/791] [libharu,wt] Update libharu to 2.4.2 and Wt to 4.8.1 (#26945) * [libharu] Update to 2.4.2 I updated the patches for libharu so they apply to 2.4.2 properly. The target name changed from haru to hpdf, the haru imported library is included for backwards compatibility. I added a usage file that only mentions hpdf. I added a patch for VTK so that it compiles with libharu 2.4.x, since the type of one the HPDF_Page_SetDash arguments changed from HPDF_UINT16 to HPDF_REAL. POCO also has an optional libharu dependency when the 'pdf' feature is enabled, but at the moment the PocoPDF library doesn't seem to be built even when enabled. * [wt] Update to 4.8.1 This release fixes compatibility with libharu 2.4.x --- ports/libharu/export-targets.patch | 27 ++++++++++++---------- ports/libharu/fix-include-path.patch | 6 ++--- ports/libharu/portfile.cmake | 5 +++-- ports/libharu/usage | 4 ++++ ports/libharu/vcpkg.json | 2 +- ports/vtk/fix-find-libharu.patch | 8 +++---- ports/vtk/fix-libharu2.4-compat.patch | 32 +++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 1 + ports/vtk/vcpkg.json | 2 +- ports/wt/0006-GraphicsMagick.patch | 20 +++++++++-------- ports/wt/portfile.cmake | 4 ++-- ports/wt/vcpkg.json | 2 +- versions/baseline.json | 6 ++--- versions/l-/libharu.json | 5 +++++ versions/v-/vtk.json | 5 +++++ versions/w-/wt.json | 5 +++++ 16 files changed, 96 insertions(+), 38 deletions(-) create mode 100644 ports/libharu/usage create mode 100644 ports/vtk/fix-libharu2.4-compat.patch diff --git a/ports/libharu/export-targets.patch b/ports/libharu/export-targets.patch index 3e7b62c9686339..fab3e5be6f33f9 100644 --- a/ports/libharu/export-targets.patch +++ b/ports/libharu/export-targets.patch @@ -1,22 +1,25 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4ca0f14..02ad1ab 100644 +index b87af66..10ec58f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -87,9 +87,23 @@ if(UNIX AND NOT APPLE) - target_link_libraries (haru ${M_LIB}) +@@ -87,9 +87,26 @@ if(UNIX AND NOT APPLE) + target_link_libraries (hpdf ${M_LIB}) endif() +if(LIBHPDF_SHARED) -+ if(WIN32 AND NOT CYGWIN) -+ set_target_properties(haru PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) -+ endif(WIN32 AND NOT CYGWIN) -+endif(LIBHPDF_SHARED) ++ if(WIN32 AND NOT CYGWIN) ++ set_target_properties(hpdf PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) ++ endif() ++endif() + -+target_include_directories(haru PUBLIC $ $) ++target_include_directories(hpdf PUBLIC $ $) ++ ++add_library(haru INTERFACE) ++set_property(TARGET haru APPEND PROPERTY INTERFACE_LINK_LIBRARIES hpdf) + install( -- TARGETS -+ TARGETS haru +- TARGETS hpdf ++ TARGETS hpdf haru + EXPORT unofficial-libharu-config ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -24,6 +27,6 @@ index 4ca0f14..02ad1ab 100644 ) + +install(EXPORT unofficial-libharu-config -+ NAMESPACE unofficial::libharu:: -+ DESTINATION share/unofficial-libharu ++ NAMESPACE unofficial::libharu:: ++ DESTINATION share/unofficial-libharu +) diff --git a/ports/libharu/fix-include-path.patch b/ports/libharu/fix-include-path.patch index 83ef8f324f1b9b..8565594ad3812e 100644 --- a/ports/libharu/fix-include-path.patch +++ b/ports/libharu/fix-include-path.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 14ed67d..57673c1 100644 +index 1c75e5a..9a6c575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -126,7 +126,7 @@ set( +@@ -148,7 +148,7 @@ set( ) # install header files @@ -10,4 +10,4 @@ index 14ed67d..57673c1 100644 +install(FILES ${haru_HDRS} DESTINATION include/) # install various files - install(FILES README.md CHANGES INSTALL DESTINATION .) + install(FILES README.md CHANGES INSTALL DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/libharu) diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 819bfff642568a..4bcdceacaac386 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libharu/libharu - REF 6997cf775b2345e3db82ac774fe2931faf348458 #2.4.0-rc1 - SHA512 758753b0f977c6b9f0b6309958e1edfba491851682c9b04cead6ebebc9af726fdec7265f36ca1b1e80f1849f9b4a43ad329a688b4844eb911c64d42a92cd7823 + REF 0eb5cdc5a7b5f2b03de20de7a0a57921f56b59f3 # 2.4.2 + SHA512 f6be210b09eee348d5de87a0e6edbab360091db121baa21d9e1b3c45fb4dda4f6351353605cc247fc375e0daf2f05b576a73244110e44cfb02798b3f3d1836db HEAD_REF master PATCHES fix-include-path.patch @@ -56,4 +56,5 @@ endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/hpdf_types.h" "${_contents}") vcpkg_copy_pdbs() +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/ports/libharu/usage b/ports/libharu/usage new file mode 100644 index 00000000000000..b018352057604b --- /dev/null +++ b/ports/libharu/usage @@ -0,0 +1,4 @@ +libharu provides CMake targets: + + find_package(unofficial-libharu CONFIG REQUIRED) + target_link_libraries(main PRIVATE unofficial::libharu::hpdf) diff --git a/ports/libharu/vcpkg.json b/ports/libharu/vcpkg.json index 442551d6e91711..c8f13744402454 100644 --- a/ports/libharu/vcpkg.json +++ b/ports/libharu/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libharu", - "version-semver": "2.4.0-rc1", + "version-semver": "2.4.2", "description": "libharu - free PDF library", "homepage": "https://github.com/libharu/libharu", "license": "Zlib", diff --git a/ports/vtk/fix-find-libharu.patch b/ports/vtk/fix-find-libharu.patch index 4f707c757f1618..2257c500380395 100644 --- a/ports/vtk/fix-find-libharu.patch +++ b/ports/vtk/fix-find-libharu.patch @@ -1,5 +1,5 @@ diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake -index c87bb9c..0c0133e 100644 +index bcb20446c2..24c06ed8ad 100644 --- a/CMake/vtkInstallCMakePackage.cmake +++ b/CMake/vtkInstallCMakePackage.cmake @@ -62,7 +62,6 @@ set(vtk_cmake_module_files @@ -11,7 +11,7 @@ index c87bb9c..0c0133e 100644 FindLibXml2.cmake FindLZ4.cmake diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt -index bac8dce..c0b98cd 100644 +index bac8dce188..44004fd9bb 100644 --- a/ThirdParty/libharu/CMakeLists.txt +++ b/ThirdParty/libharu/CMakeLists.txt @@ -4,16 +4,15 @@ vtk_module_third_party( @@ -25,12 +25,12 @@ index bac8dce..c0b98cd 100644 # https://github.com/libharu/libharu/pull/187 - VERSION 2.4.0 - TARGETS LibHaru::LibHaru -+ TARGETS unofficial::libharu::haru ++ TARGETS unofficial::libharu::hpdf STANDARD_INCLUDE_DIRS) include(vtkDetectLibraryType) -vtk_detect_library_shared(vtklibharu LibHaru::LibHaru) -+vtk_detect_library_shared(vtklibharu unofficial::libharu::haru) ++vtk_detect_library_shared(vtklibharu unofficial::libharu::hpdf) set(HPDF_DLL 0) if (WIN32 AND vtklibharu_is_shared) diff --git a/ports/vtk/fix-libharu2.4-compat.patch b/ports/vtk/fix-libharu2.4-compat.patch new file mode 100644 index 00000000000000..493383823974e0 --- /dev/null +++ b/ports/vtk/fix-libharu2.4-compat.patch @@ -0,0 +1,32 @@ +diff --git a/IO/ExportPDF/vtkPDFContextDevice2D.cxx b/IO/ExportPDF/vtkPDFContextDevice2D.cxx +index a51945dc9b..1cbc3945af 100644 +--- a/IO/ExportPDF/vtkPDFContextDevice2D.cxx ++++ b/IO/ExportPDF/vtkPDFContextDevice2D.cxx +@@ -1631,21 +1631,21 @@ void vtkPDFContextDevice2D::ApplyLineWidth(float width) + void vtkPDFContextDevice2D::ApplyLineType(int type) + { + // These match the OpenGL2 implementation: +- static const HPDF_UINT16 noPen[] = { 0, 10 }; ++ static const HPDF_REAL noPen[] = { 0, 10 }; + static const HPDF_UINT noPenLen = 2; + +- static const HPDF_UINT16 dash[] = { 8 }; ++ static const HPDF_REAL dash[] = { 8 }; + static const HPDF_UINT dashLen = 1; + +- static const HPDF_UINT16 dot[] = { 1, 7 }; +- static const HPDF_UINT16 denseDot[] = { 1, 3 }; ++ static const HPDF_REAL dot[] = { 1, 7 }; ++ static const HPDF_REAL denseDot[] = { 1, 3 }; + static const HPDF_UINT dotLen = 2; + +- static const HPDF_UINT16 dashDot[] = { 4, 6, 2, 4 }; ++ static const HPDF_REAL dashDot[] = { 4, 6, 2, 4 }; + static const HPDF_UINT dashDotLen = 4; + + // This is dash-dot-dash, but eh. It matches the OpenGL2 0x1C47 pattern. +- static const HPDF_UINT16 dashDotDot[] = { 3, 3, 1, 3, 3, 3 }; ++ static const HPDF_REAL dashDotDot[] = { 3, 3, 1, 3, 3, 3 }; + static const HPDF_UINT dashDotDotLen = 6; + + switch (type) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 7be2566dd1c46d..4013f6a5cc4560 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_from_github( missing-limits.patch # This patch can be removed in next version. Since it has been merged to upstream via https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 UseProj5Api.patch # Allow Proj 8.0+ (commit b66e4a7, backported). Should be in soon after 9.0.3 fix-find-libharu.patch + fix-libharu2.4-compat.patch ) # ============================================================================= diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 244fd06887b4a3..1666a05ca58867 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 11, + "port-version": 12, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", diff --git a/ports/wt/0006-GraphicsMagick.patch b/ports/wt/0006-GraphicsMagick.patch index 2f1b50a60ced61..327c852c1e4079 100644 --- a/ports/wt/0006-GraphicsMagick.patch +++ b/ports/wt/0006-GraphicsMagick.patch @@ -1,21 +1,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5012cfd1b..95f812685 100644 +index 7fe932fb7..ae122f03a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -338,7 +338,7 @@ ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) - ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 8) +@@ -342,9 +342,9 @@ SET(WT_WRASTERIMAGE_IMPLEMENTATION ${WT_WRASTERIMAGE_DEFAULT_IMPLEMENTATION} CAC + SET_PROPERTY(CACHE WT_WRASTERIMAGE_IMPLEMENTATION PROPERTY STRINGS GraphicsMagick Direct2D none) IF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "GraphicsMagick") - IF (NOT GM_FOUND) + IF (0) MESSAGE(FATAL_ERROR "WT_WRASTERIMAGE_IMPLEMENTATION set to GraphicsMagick but GM is not found. Indicate the location of your graphicsmagick library using -DGM_PREFIX=...") - ENDIF (NOT GM_FOUND) +- ENDIF (NOT GM_FOUND) ++ ENDIF () SET(WT_HAS_WRASTERIMAGE true) + ELSEIF (${WT_WRASTERIMAGE_IMPLEMENTATION} STREQUAL "Direct2D") + IF (WIN32) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 78d82ee53..01ac5f42a 100644 +index fb398ff0d..16b5f76b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -595,8 +595,9 @@ ELSE(HAVE_HARU) +@@ -632,8 +632,8 @@ ELSE(HAVE_HARU) ENDIF(HAVE_HARU) IF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "GraphicsMagick") @@ -23,7 +26,6 @@ index 78d82ee53..01ac5f42a 100644 - INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS}) + find_package(unofficial-graphicsmagick REQUIRED) + TARGET_LINK_LIBRARIES(wt PRIVATE unofficial::graphicsmagick::graphicsmagick) -+ # INCLUDE_DIRECTORIES(${GM_INCLUDE_DIRS}) ADD_DEFINITIONS(-DHAVE_GRAPHICSMAGICK) - ELSEIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "skia") - TARGET_LINK_LIBRARIES(wt PRIVATE ${SKIA_LIBRARIES}) + ELSEIF("${WT_WRASTERIMAGE_IMPLEMENTATION}" STREQUAL "Direct2D") + TARGET_LINK_LIBRARIES(wt PRIVATE d2d1 dwrite windowscodecs shlwapi) diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index a04cee499f6a81..e55edc1c03f77c 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO emweb/wt - REF d0e9f2e8096a1acb4558130a851812dd424d8f3e # 4.7.1 - SHA512 ddda642e464a0c93017161404911cd8261e105971162171cd6aa0e4334e22b5f284a753e8b81a4f43c9269b14389abd28c61e2cdfe706b414808e82fc4bc1680 + REF 402c55d196da761ec982beabaf11a8675fa76518 # 4.8.1 + SHA512 de89e0de17bcfa142b9e94fde2b398b26046ecb66ef9ab673cd278e1d60a366965d3de524884f17a54ab65ffdc5d9ade5f8df457d3ff157af214476fe1285140 HEAD_REF master PATCHES 0002-link-glew.patch diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 443486fe20ee93..455e1dc8d1c700 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "wt", - "version": "4.7.1", + "version": "4.8.1", "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "license": "GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 48f7313d508afd..74eb2e04ccbaaf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3757,7 +3757,7 @@ "port-version": 1 }, "libharu": { - "baseline": "2.4.0-rc1", + "baseline": "2.4.2", "port-version": 0 }, "libhdfs3": { @@ -7714,7 +7714,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 11 + "port-version": 12 }, "vtk-dicom": { "baseline": "0.8.12", @@ -7857,7 +7857,7 @@ "port-version": 0 }, "wt": { - "baseline": "4.7.1", + "baseline": "4.8.1", "port-version": 0 }, "wtl": { diff --git a/versions/l-/libharu.json b/versions/l-/libharu.json index 579f95262300fc..f6cc37685cc181 100644 --- a/versions/l-/libharu.json +++ b/versions/l-/libharu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7df48b846add8eaed23517704e6a130fe8dca2ec", + "version-semver": "2.4.2", + "port-version": 0 + }, { "git-tree": "7119cd9fe86c40e908ef4c65be267b35caf8d010", "version-semver": "2.4.0-rc1", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index f4afbd9dd95b71..5423109ba52ae5 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64cd3c51764272ed1c8acc2d5fa37106d9f76b66", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 12 + }, { "git-tree": "3193e1219e09f8f67d2762fa4fe823f4327a1c93", "version-semver": "9.0.3-pv5.9.1", diff --git a/versions/w-/wt.json b/versions/w-/wt.json index 88eaa5f941e355..0303ba9a3b2fcf 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1617b936bd6c68b1a5e3e316ccc773c405036135", + "version": "4.8.1", + "port-version": 0 + }, { "git-tree": "24546bcb3aa44c987d85536d39420e4159d4ad99", "version": "4.7.1", From eeb845640a9f69d3e3f8ef71cbb303bfdb7d9635 Mon Sep 17 00:00:00 2001 From: Nursultan Zarlyk Date: Sat, 1 Oct 2022 02:03:30 +0200 Subject: [PATCH 682/791] [geogram] Add arm64-windows support (#26875) * Add arm64-windows * Add version * Remove geogram from ci.baseline Co-authored-by: Nursultan Zarlyk --- ports/geogram/portfile.cmake | 1 + ports/geogram/use-arm64-intrinsics.patch | 16 ++++++++++++++++ ports/geogram/vcpkg.json | 2 +- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/g-/geogram.json | 5 +++++ 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 ports/geogram/use-arm64-intrinsics.patch diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 4908387759bde9..d3816694a0f1e8 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -5,6 +5,7 @@ vcpkg_from_github( SHA512 0ec0deded92c8d5d100b6e77f8cfbbbaf7b744c230e10abd0b86861960cda9713ff65209575fdc09034afcb0e9137428a20c00d399c09fd58ce541fed2105a2d PATCHES fix-vcpkg-install.patch + use-arm64-intrinsics.patch ) file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake) diff --git a/ports/geogram/use-arm64-intrinsics.patch b/ports/geogram/use-arm64-intrinsics.patch new file mode 100644 index 00000000000000..04c2d0c1b3bd67 --- /dev/null +++ b/ports/geogram/use-arm64-intrinsics.patch @@ -0,0 +1,16 @@ +diff --git a/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp b/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp +index 352ea76..34e73e2 100644 +--- a/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp ++++ b/src/lib/geogram/delaunay/periodic_delaunay_3d.cpp +@@ -122,7 +122,11 @@ namespace { + #if defined(GEO_COMPILER_GCC_FAMILY) + return GEO::index_t(Numeric::uint32(__builtin_popcount(x))); + #elif defined(GEO_COMPILER_MSVC) ++ #if defined(_M_ARM64) ++ return GEO::index_t(_CountOneBits(x)); ++ #else + return GEO::index_t(__popcnt(x)); ++ #endif + #else + int result = 0; + for(int b=0; b<32; ++b) { diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json index e7c40ee36551cd..7c70b0ee3120e0 100644 --- a/ports/geogram/vcpkg.json +++ b/ports/geogram/vcpkg.json @@ -1,7 +1,7 @@ { "name": "geogram", "version": "1.7.6", - "port-version": 2, + "port-version": 3, "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://gforge.inria.fr/projects/geogram/", "supports": "!uwp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4afd8d1cca24ef..797134d962d418 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -275,7 +275,6 @@ gsoap:x86-windows = skip gsoap:x64-windows-static = skip gsoap:x64-windows-static-md = skip -geogram:arm64-windows=fail # Port geotrans source ftp://ftp.nga.mil server # extremely slow may take several hours to download geotrans:x64-linux = skip diff --git a/versions/baseline.json b/versions/baseline.json index 74eb2e04ccbaaf..c46d44f525bbe2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2550,7 +2550,7 @@ }, "geogram": { "baseline": "1.7.6", - "port-version": 2 + "port-version": 3 }, "geographiclib": { "baseline": "2.1.1", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index 9ee01d4bcf10f1..5c3583fccb433f 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2be512adda374e08c638f617f81f86b3dc3099a0", + "version": "1.7.6", + "port-version": 3 + }, { "git-tree": "d68db6c8078b7598e5bed6550a911f791ae63ab3", "version": "1.7.6", From b92daebd09641f0647f0beb6305e40009fa639a8 Mon Sep 17 00:00:00 2001 From: Vladimir Serdyuk Date: Sat, 1 Oct 2022 03:22:06 +0300 Subject: [PATCH 683/791] [scripts] fixes for armv7l host builds (#26510) * [scripts] fixes for armv7l host builds * [scripts] fix meson for 32-bit arm * [scripts] replaced EXEC_PROGRAM with execute_process in ninja and pathelf paths in vcpkg_find_acquire_program --- scripts/cmake/vcpkg_configure_meson.cmake | 3 +++ .../cmake/vcpkg_find_acquire_program.cmake | 21 +++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 2115680d8b7852..9fc9caa7c9c2da 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -224,6 +224,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu if(MACHINE MATCHES "arm64|aarch64") set(build_cpu_fam aarch64) set(build_cpu armv8) + elseif(MACHINE MATCHES "armv7h?l") + set(build_cpu_fam arm) + set(build_cpu ${MACHINE}) elseif(MACHINE MATCHES "x86_64|amd64") set(build_cpu_fam x86_64) set(build_cpu x86_64) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 58b3d7039715a7..4611af6511c9e2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -298,6 +298,7 @@ function(vcpkg_find_acquire_program program) set(program_name ninja) set(program_version 1.10.2) set(supported_on_unix ON) + set(version_command --version) if(CMAKE_HOST_WIN32) set(download_filename "ninja-win-${program_version}.zip") set(tool_subdirectory "${program_version}-windows") @@ -313,13 +314,17 @@ function(vcpkg_find_acquire_program program) set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") set(supported_on_unix OFF) else() - set(download_filename "ninja-linux-${program_version}.zip") - set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") - set(tool_subdirectory "${program_version}-linux") - set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") - set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH) + if(HOST_ARCH MATCHES "x86_64|amd64|AMD64") + set(download_filename "ninja-linux-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") + set(tool_subdirectory "${program_version}-linux") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") + set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + else() + set(version_command "") # somewhat hacky way to skip version check and use system binary + endif() endif() - set(version_command --version) elseif(program STREQUAL "NUGET") set(program_name nuget) set(tool_subdirectory "5.11.0") @@ -550,9 +555,13 @@ function(vcpkg_find_acquire_program program) set(program_version 0.14.5) set(supported_on_unix ON) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + execute_process(COMMAND "uname" "-m" OUTPUT_VARIABLE HOST_ARCH) if(HOST_ARCH STREQUAL "aarch64") set(patchelf_platform "aarch64") set(download_sha512 "3B5EB4405FAB1D5202728AA390DD9F059CD7AFD582BAD9C50383CAD605127BC77DFCE3F2F26E9714F6BD5CCFFD49D3973BA2F061D2E2931B6E1BD0C263B99E75") + elseif(HOST_ARCH STREQUAL "armv7l") + set(patchelf_platform "armv7l") + set(download_sha512 "30160d750784f5e8805bffe96ca80b40ed10441549e10f47b61e0d21b32979e01865cd770f1de9162988d4daabc6984dcdb7438f67bcd5eee76ad5f01b00276d") else() set(patchelf_platform "x86_64") set(download_sha512 "5E983A25B3F3F3B8582D1DE6C7DE30812E8D6E58E96F711F33A2634D3FB1F2370531DA179927AA401328319F92465E6F76274A6F994D1DC54C74B98E704D0D29") From 5f144173006dbeea7b9cb017775675606666a207 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Fri, 30 Sep 2022 20:23:42 -0400 Subject: [PATCH 684/791] vcpkg_configure_meson: Support wasm32-emscripten triplet (#26317) Co-authored-by: JackBoosY --- scripts/cmake/vcpkg_configure_meson.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 9fc9caa7c9c2da..5b6d39f27617d0 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -262,6 +262,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "loongarch64") set(host_cpu_fam loongarch64) set(host_cpu loongarch64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "wasm32") + set(host_cpu_fam wasm32) + set(host_cpu wasm32) else() message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) endif() From 8709c3344a89db96bdd5cd2d34ac0063f2105be1 Mon Sep 17 00:00:00 2001 From: Max Khon Date: Mon, 3 Oct 2022 07:52:08 +0300 Subject: [PATCH 685/791] gtk 3.24.34 port (#27026) --- ports/gtk3/0001-build.patch | 13 +++++++ ports/gtk3/portfile.cmake | 78 +++++++++++++++++++++++++++++++++++++ ports/gtk3/vcpkg.json | 54 +++++++++++++++++++++++++ versions/baseline.json | 4 ++ versions/g-/gtk3.json | 9 +++++ 5 files changed, 158 insertions(+) create mode 100644 ports/gtk3/0001-build.patch create mode 100644 ports/gtk3/portfile.cmake create mode 100644 ports/gtk3/vcpkg.json create mode 100644 versions/g-/gtk3.json diff --git a/ports/gtk3/0001-build.patch b/ports/gtk3/0001-build.patch new file mode 100644 index 00000000000000..0f3d7b4fffabbe --- /dev/null +++ b/ports/gtk3/0001-build.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index c599843..0cafd79 100644 +--- a/meson.build ++++ b/meson.build +@@ -1008,7 +1008,7 @@ subdir('docs/reference') + + install_data('m4macros/gtk-3.0.m4', install_dir: join_paths(get_option('datadir'), 'aclocal')) + +-if not meson.is_cross_build() ++if false + if meson.version().version_compare('>=0.57.0') + gnome.post_install( + glib_compile_schemas: true, diff --git a/ports/gtk3/portfile.cmake b/ports/gtk3/portfile.cmake new file mode 100644 index 00000000000000..6821b386bf6fd5 --- /dev/null +++ b/ports/gtk3/portfile.cmake @@ -0,0 +1,78 @@ +set(warning_length 24) +string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtrees_path_length) +if(buildtrees_path_length GREATER warning_length AND CMAKE_HOST_WIN32) + message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n" + "We recommend moving vcpkg to a short path such as 'C:\\vcpkg' or using the subst command." + ) +endif() + +vcpkg_from_gitlab( + OUT_SOURCE_PATH SOURCE_PATH + GITLAB_URL https://gitlab.gnome.org + REPO GNOME/gtk + REF 3.24.34 + SHA512 20a91e30a89070461af06b33829bc723b348806b4a785d0743af8bd4789b55dade24686e08bf1b2f0335240463aacc040134babb0605b809186b15de9cf261e4 + PATCHES + 0001-build.patch +) + +vcpkg_find_acquire_program(PKGCONFIG) +get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY ) +vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/") +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf") +vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin") + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dwayland_backend=false + -Ddemos=false + -Dexamples=false + -Dtests=false + -Dgtk_doc=false + -Dman=false + -Dxinerama=no # Enable support for the X11 Xinerama extension + -Dcloudproviders=false # Enable the cloudproviders support + -Dprofiler=false # include tracing support for sysprof + -Dtracker3=false # Enable Tracker3 filechooser search + -Dcolord=no # Build colord support for the CUPS printing backend + -Dintrospection=false + ADDITIONAL_NATIVE_BINARIES + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' + ADDITIONAL_CROSS_BINARIES + glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' + glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}' + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}' +) + +vcpkg_install_meson() + +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +set(GTK_TOOLS + gtk-builder-tool + gtk-encode-symbolic-svg + gtk-launch + gtk-query-immodules-3.0 + gtk-query-settings + gtk-update-icon-cache +) +vcpkg_copy_tools(TOOL_NAMES ${GTK_TOOLS} AUTO_CLEAN) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") +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() diff --git a/ports/gtk3/vcpkg.json b/ports/gtk3/vcpkg.json new file mode 100644 index 00000000000000..748a95469624e1 --- /dev/null +++ b/ports/gtk3/vcpkg.json @@ -0,0 +1,54 @@ +{ + "name": "gtk3", + "version": "3.24.34", + "description": "Portable library for creating graphical user interfaces.", + "homepage": "https://www.gtk.org/", + "license": null, + "dependencies": [ + { + "name": "at-spi2-atk", + "platform": "linux" + }, + "atk", + { + "name": "cairo", + "default-features": false, + "features": [ + "gobject" + ] + }, + { + "name": "cairo", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + "gdk-pixbuf", + { + "name": "gdk-pixbuf", + "host": true + }, + "gettext", + { + "name": "gettext", + "host": true, + "default-features": false, + "features": [ + "tools" + ] + }, + "glib", + { + "name": "glib", + "host": true + }, + "libepoxy", + "pango", + { + "name": "vcpkg-tool-meson", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c46d44f525bbe2..4344f34852449e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2784,6 +2784,10 @@ "baseline": "4.6.2", "port-version": 2 }, + "gtk3": { + "baseline": "3.24.34", + "port-version": 0 + }, "gtkmm": { "baseline": "4.6.0", "port-version": 0 diff --git a/versions/g-/gtk3.json b/versions/g-/gtk3.json new file mode 100644 index 00000000000000..98b557dd207b65 --- /dev/null +++ b/versions/g-/gtk3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "91d648bc4cff36c2ac289cff836ece2875566e2b", + "version": "3.24.34", + "port-version": 0 + } + ] +} From aa27f5d15ab1d8cb1617d1c003d1b4a30e472e24 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Mon, 3 Oct 2022 13:06:50 +0700 Subject: [PATCH 686/791] [lemon-parser-generator] New port (#26977) * [vcpkg-tool-lemon] New port * [vcpkg-tool-lemon] Rename to lemon-parser-generator * [vcpkg baseline] Add lemon-parser-generator --- ports/lemon-parser-generator/CMakeLists.txt | 5 +++++ ports/lemon-parser-generator/portfile.cmake | 23 +++++++++++++++++++++ ports/lemon-parser-generator/vcpkg.json | 14 +++++++++++++ versions/baseline.json | 4 ++++ versions/l-/lemon-parser-generator.json | 9 ++++++++ 5 files changed, 55 insertions(+) create mode 100644 ports/lemon-parser-generator/CMakeLists.txt create mode 100644 ports/lemon-parser-generator/portfile.cmake create mode 100644 ports/lemon-parser-generator/vcpkg.json create mode 100644 versions/l-/lemon-parser-generator.json diff --git a/ports/lemon-parser-generator/CMakeLists.txt b/ports/lemon-parser-generator/CMakeLists.txt new file mode 100644 index 00000000000000..c5fc7b09c09a3f --- /dev/null +++ b/ports/lemon-parser-generator/CMakeLists.txt @@ -0,0 +1,5 @@ +project(lemon-parser-generator C) +add_executable(lemon lemon.c) +install(TARGETS lemon + RUNTIME DESTINATION tools/lemon +) diff --git a/ports/lemon-parser-generator/portfile.cmake b/ports/lemon-parser-generator/portfile.cmake new file mode 100644 index 00000000000000..1c2f845ff31d2f --- /dev/null +++ b/ports/lemon-parser-generator/portfile.cmake @@ -0,0 +1,23 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +set(VCPKG_BUILD_TYPE release) +set(SQLITE_VERSION "3.39.3") + +vcpkg_download_distfile(SOURCE_FILE + URLS "https://github.com/sqlite/sqlite/raw/version-${SQLITE_VERSION}/tool/lemon.c" + FILENAME "lemon.c" + SHA512 "e9cca77d45a3be55fc958be69a30730dcbd39ba5c85c4c6c6c9eb6988c5cae9d14607be214ce57c11c73a6ffd4005784fb4d046d78f50e348ffa7ea6392ee03a" +) + +get_filename_component(SOURCE_PATH "${SOURCE_FILE}" DIRECTORY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_download_distfile(LEMPAR + URLS "https://github.com/sqlite/sqlite/raw/version-${SQLITE_VERSION}/tool/lempar.c" + FILENAME "lempar.c" + SHA512 "45ef60bbfef54f6583d6f9a854aaa72c5538e791b09ad15f4094a96905974277f964f471dcd5775e76b685b54415897a32a40c09f913f61cf91b99eb2e5ff5f0" +) + +file(COPY "${LEMPAR}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/lemon") diff --git a/ports/lemon-parser-generator/vcpkg.json b/ports/lemon-parser-generator/vcpkg.json new file mode 100644 index 00000000000000..ba43a3443b9c48 --- /dev/null +++ b/ports/lemon-parser-generator/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "lemon-parser-generator", + "version": "3.39.3", + "description": "The Lemon program is an LALR(1) parser generator. It takes a context free grammar and converts it into a subroutine that will parse a file using that grammar.", + "homepage": "https://www.hwaci.com/sw/lemon/index.html", + "license": "blessing", + "supports": "native", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 4344f34852449e..17d8567689a2df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3484,6 +3484,10 @@ "baseline": "0", "port-version": 1 }, + "lemon-parser-generator": { + "baseline": "3.39.3", + "port-version": 0 + }, "leptonica": { "baseline": "1.82.0", "port-version": 0 diff --git a/versions/l-/lemon-parser-generator.json b/versions/l-/lemon-parser-generator.json new file mode 100644 index 00000000000000..7b49ddd2def193 --- /dev/null +++ b/versions/l-/lemon-parser-generator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "efe39fd9654d045490a62729cba3e44840b7dd6f", + "version": "3.39.3", + "port-version": 0 + } + ] +} From 1aff5b6ac2eb470379e5bca8a257b089b1c71af4 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Mon, 3 Oct 2022 15:50:25 -0500 Subject: [PATCH 687/791] [liblsquic] Remove spurious duplicated install line. (#27088) * [liblsquic] Remove spurious duplicated install line. Got left behind when the new helper usage was added before merging the original PR * Update versions --- ports/liblsquic/portfile.cmake | 2 -- ports/liblsquic/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/liblsquic.json | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/liblsquic/portfile.cmake b/ports/liblsquic/portfile.cmake index 1d3276082bf7db..847500e02eaaae 100644 --- a/ports/liblsquic/portfile.cmake +++ b/ports/liblsquic/portfile.cmake @@ -69,8 +69,6 @@ vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.chrome" ) -file(INSTALL "${CURRENT_BUILDTREES_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - # Remove duplicated include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/liblsquic/vcpkg.json b/ports/liblsquic/vcpkg.json index 481a3bf16ed28e..09570d93629e29 100644 --- a/ports/liblsquic/vcpkg.json +++ b/ports/liblsquic/vcpkg.json @@ -1,6 +1,7 @@ { "name": "liblsquic", "version": "3.1.1", + "port-version": 1, "description": "An implementation of the QUIC and HTTP/3 protocols.", "homepage": "https://github.com/litespeedtech/lsquic", "license": "MIT AND BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 17d8567689a2df..1d48e546a9f72c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3874,7 +3874,7 @@ }, "liblsquic": { "baseline": "3.1.1", - "port-version": 0 + "port-version": 1 }, "liblzma": { "baseline": "5.2.5", diff --git a/versions/l-/liblsquic.json b/versions/l-/liblsquic.json index e182c28c553f8d..0280cb1bdaf20f 100644 --- a/versions/l-/liblsquic.json +++ b/versions/l-/liblsquic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a2383de53efd9458419db7bd82db49b342023da", + "version": "3.1.1", + "port-version": 1 + }, { "git-tree": "f6f4593aba81acc749f3223d0fd3987d5920b164", "version": "3.1.1", From 5185baad44f2ea9a5828a22b0145b7f925e98506 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:51:18 +0200 Subject: [PATCH 688/791] [mdspan] update to 0.4.0 (#27085) * Update mdspan to 0.4.0 * Update version * Add license * Update CI baseline Co-authored-by: chausner --- ports/mdspan/portfile.cmake | 6 ++---- ports/mdspan/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/m-/mdspan.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/mdspan/portfile.cmake b/ports/mdspan/portfile.cmake index af3df0890fd446..c102ae65f1519a 100644 --- a/ports/mdspan/portfile.cmake +++ b/ports/mdspan/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kokkos/mdspan - REF aced2cebd362a1e15830da030bd16748131d28bd # stable as of 2021-11-03 - SHA512 a1950430be537497fb84c4a8c5e681cacead93512775098f38ea6c1a20b95d0f7110d9d0802fbdcf8ce3c40ade766cc697773f6ea6fcf8c363b3ebee55620f7c + REF mdspan-0.4.0 + SHA512 9452bed074401b5bbaea7ff6e318e1b631ba8a9b4c6e6c8d05f82be9b24055026645a501963b0443b211833124228499d2acf7fb0ff79c48a43e0ea198dba0af HEAD_REF stable ) @@ -14,6 +14,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mdspan) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") -vcpkg_copy_pdbs() - file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mdspan/vcpkg.json b/ports/mdspan/vcpkg.json index 8bfe7b88d40e6d..1d725fd97ec291 100644 --- a/ports/mdspan/vcpkg.json +++ b/ports/mdspan/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mdspan", - "version-date": "2021-11-03", + "version": "0.4.0", "description": "A non-owning multi-dimensional array reference type.", "homepage": "https://github.com/kokkos/mdspan", + "license": "BSD-3-Clause", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 1d48e546a9f72c..5d9e5b96d71743 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4681,7 +4681,7 @@ "port-version": 2 }, "mdspan": { - "baseline": "2021-11-03", + "baseline": "0.4.0", "port-version": 0 }, "mecab": { diff --git a/versions/m-/mdspan.json b/versions/m-/mdspan.json index 3eb709742de2cf..35aa4fe1c34dc4 100644 --- a/versions/m-/mdspan.json +++ b/versions/m-/mdspan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea06cdb7d1943dac6ada2f2fd419bb68d7bc196a", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "3e312b5c0220a832b0deebd7478f044481ebe79c", "version-date": "2021-11-03", From 146e97610baa5f6980d79166cc47b6bb2a805958 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:53:31 +0200 Subject: [PATCH 689/791] [libudis86] use python3 (#27077) --- ports/libudis86/portfile.cmake | 8 +++++--- ports/libudis86/python3.patch | 17 +++++++++++++++++ ports/libudis86/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libudis86.json | 5 +++++ 5 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 ports/libudis86/python3.patch diff --git a/ports/libudis86/portfile.cmake b/ports/libudis86/portfile.cmake index 991b8039c0760d..24f93ead04185e 100644 --- a/ports/libudis86/portfile.cmake +++ b/ports/libudis86/portfile.cmake @@ -4,15 +4,17 @@ vcpkg_from_github( REF 56ff6c87c11de0ffa725b14339004820556e343d SHA512 7a98333f9310f5f0466294bd980f03f9269c118a7557832015c59a7b6349a0eeab5642e0e6598d0be76d71f5d2d566d8b8af0ec75c26bdcff45646d60ff18e3a HEAD_REF master - PATCHES fix-macbuild.patch + PATCHES + fix-macbuild.patch + python3.patch # from https://github.com/vmt/udis86/pull/133 ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_find_acquire_program(PYTHON2) +vcpkg_find_acquire_program(PYTHON3) vcpkg_execute_required_process( - COMMAND "${PYTHON2}" "${SOURCE_PATH}/scripts/ud_itab.py" "${SOURCE_PATH}/docs/x86/optable.xml" "${SOURCE_PATH}/libudis86/" + COMMAND "${PYTHON3}" "${SOURCE_PATH}/scripts/ud_itab.py" "${SOURCE_PATH}/docs/x86/optable.xml" "${SOURCE_PATH}/libudis86/" WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME python-${TARGET_TRIPLET}-generate-sources ) diff --git a/ports/libudis86/python3.patch b/ports/libudis86/python3.patch new file mode 100644 index 00000000000000..0c8f851792b721 --- /dev/null +++ b/ports/libudis86/python3.patch @@ -0,0 +1,17 @@ +diff --git a/scripts/ud_opcode.py b/scripts/ud_opcode.py +index fe1833d..30c9f43 100644 +--- a/scripts/ud_opcode.py ++++ b/scripts/ud_opcode.py +@@ -550,10 +550,10 @@ def printWalk(tbl, indent=""): + entries = tbl.entries() + for k, e in entries: + if isinstance(e, UdOpcodeTable): +- self.log("%s |-<%02x> %s" % (indent, k, e)) ++ self.log("%s |-<%02x> %s" % (indent, int(k), e)) + printWalk(e, indent + " |") + elif isinstance(e, UdInsnDef): +- self.log("%s |-<%02x> %s" % (indent, k, e)) ++ self.log("%s |-<%02x> %s" % (indent, int(k), e)) + printWalk(self.root) + + diff --git a/ports/libudis86/vcpkg.json b/ports/libudis86/vcpkg.json index c642dfaf49117c..66b500f75062ba 100644 --- a/ports/libudis86/vcpkg.json +++ b/ports/libudis86/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libudis86", - "version-string": "2018-01-28-56ff6c87", - "port-version": 2, + "version-date": "2018-01-28", + "port-version": 3, "description": "Disassembler Library for x86 and x86-64", "homepage": "https://github.com/vmt/udis86", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5d9e5b96d71743..ffb4a1b7337ae4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4257,8 +4257,8 @@ "port-version": 4 }, "libudis86": { - "baseline": "2018-01-28-56ff6c87", - "port-version": 2 + "baseline": "2018-01-28", + "port-version": 3 }, "libudns": { "baseline": "0.4", diff --git a/versions/l-/libudis86.json b/versions/l-/libudis86.json index 1cd4ee6118dcb7..1528b0f4dc512c 100644 --- a/versions/l-/libudis86.json +++ b/versions/l-/libudis86.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db5757ef908acdfdb58b06da531d1a10aba11f69", + "version-date": "2018-01-28", + "port-version": 3 + }, { "git-tree": "22693ee63d17429c0430a2888b515a047cbb4c7d", "version-string": "2018-01-28-56ff6c87", From cf57d2bfdee89b32c957050ed88c5faf8666a00b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:54:36 +0200 Subject: [PATCH 690/791] [rxcpp] disable tests (#27075) --- ports/rxcpp/disable-tests.patch | 34 +++++++++++++++++++++++++++++++++ ports/rxcpp/portfile.cmake | 2 ++ ports/rxcpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rxcpp.json | 5 +++++ 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 ports/rxcpp/disable-tests.patch diff --git a/ports/rxcpp/disable-tests.patch b/ports/rxcpp/disable-tests.patch new file mode 100644 index 00000000000000..8378c7f0cbb06b --- /dev/null +++ b/ports/rxcpp/disable-tests.patch @@ -0,0 +1,34 @@ +diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt +index 8856aa42e..2b3d57e97 100755 +--- a/projects/CMake/CMakeLists.txt ++++ b/projects/CMake/CMakeLists.txt +@@ -11,18 +11,20 @@ get_filename_component(RXCPP_DIR "${RXCPP_DIR}" PATH) + + MESSAGE( STATUS "RXCPP_DIR: " ${RXCPP_DIR} ) + +-add_subdirectory(${RXCPP_DIR}/Rx/v2/test ${CMAKE_CURRENT_BINARY_DIR}/test) ++if (NOT ${RXCPP_DISABLE_TESTS_AND_EXAMPLES}) ++ add_subdirectory(${RXCPP_DIR}/Rx/v2/test ${CMAKE_CURRENT_BINARY_DIR}/test) + +-add_subdirectory(${RXCPP_DIR}/projects/doxygen ${CMAKE_CURRENT_BINARY_DIR}/projects/doxygen) ++ add_subdirectory(${RXCPP_DIR}/projects/doxygen ${CMAKE_CURRENT_BINARY_DIR}/projects/doxygen) + +-set(EXAMPLES_DIR ${RXCPP_DIR}/Rx/v2/examples) ++ set(EXAMPLES_DIR ${RXCPP_DIR}/Rx/v2/examples) + +-add_subdirectory(${EXAMPLES_DIR}/cep ${CMAKE_CURRENT_BINARY_DIR}/examples/cep) +-add_subdirectory(${EXAMPLES_DIR}/stop ${CMAKE_CURRENT_BINARY_DIR}/examples/stop) +-add_subdirectory(${EXAMPLES_DIR}/linesfrombytes ${CMAKE_CURRENT_BINARY_DIR}/examples/linesfrombytes) +-add_subdirectory(${EXAMPLES_DIR}/println ${CMAKE_CURRENT_BINARY_DIR}/examples/println) +-add_subdirectory(${EXAMPLES_DIR}/pythagorian ${CMAKE_CURRENT_BINARY_DIR}/examples/pythagorian) +-add_subdirectory(${EXAMPLES_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/examples/tests) ++ add_subdirectory(${EXAMPLES_DIR}/cep ${CMAKE_CURRENT_BINARY_DIR}/examples/cep) ++ add_subdirectory(${EXAMPLES_DIR}/stop ${CMAKE_CURRENT_BINARY_DIR}/examples/stop) ++ add_subdirectory(${EXAMPLES_DIR}/linesfrombytes ${CMAKE_CURRENT_BINARY_DIR}/examples/linesfrombytes) ++ add_subdirectory(${EXAMPLES_DIR}/println ${CMAKE_CURRENT_BINARY_DIR}/examples/println) ++ add_subdirectory(${EXAMPLES_DIR}/pythagorian ${CMAKE_CURRENT_BINARY_DIR}/examples/pythagorian) ++ add_subdirectory(${EXAMPLES_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/examples/tests) ++endif () + + # The list of RxCpp source files. Please add every new file to this list + set(RX_SOURCES diff --git a/ports/rxcpp/portfile.cmake b/ports/rxcpp/portfile.cmake index deb7e294ca68f1..56c14927b93197 100644 --- a/ports/rxcpp/portfile.cmake +++ b/ports/rxcpp/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v4.1.1 SHA512 387e1276151a19b62fd1d36b486ff5f3ed28f0f48ae8b00902bf13464d20603f492ecd63ab4444d04293fc3d92a8f7ce3e67a4c68836415c4655331fb6b54edb HEAD_REF master + PATCHES + disable-tests.patch # from https://github.com/ReactiveX/RxCpp/pull/574 ) vcpkg_cmake_configure( diff --git a/ports/rxcpp/vcpkg.json b/ports/rxcpp/vcpkg.json index 44f51ec0eb1ea8..27a475cd0ae033 100644 --- a/ports/rxcpp/vcpkg.json +++ b/ports/rxcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rxcpp", "version": "4.1.1", + "port-version": 1, "description": "Reactive Extensions for C++", "homepage": "https://github.com/Reactive-Extensions/RxCpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index ffb4a1b7337ae4..92233b7201797b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6566,7 +6566,7 @@ }, "rxcpp": { "baseline": "4.1.1", - "port-version": 0 + "port-version": 1 }, "rxqt": { "baseline": "bb2138c", diff --git a/versions/r-/rxcpp.json b/versions/r-/rxcpp.json index 53ed12b1e484d6..3de7765ca592a0 100644 --- a/versions/r-/rxcpp.json +++ b/versions/r-/rxcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f127fb83dfe052e029bd2febf1d9e3eac7ab134", + "version": "4.1.1", + "port-version": 1 + }, { "git-tree": "92ae6c5ff3c5a9f81dda630c0b6cc4e69766ee61", "version": "4.1.1", From c62d5cb2c429eebe21af8136a032017865d788ec Mon Sep 17 00:00:00 2001 From: talregev Date: Mon, 3 Oct 2022 23:55:23 +0300 Subject: [PATCH 691/791] Add ignition-utils1 (#27074) --- ports/ignition-utils1/portfile.cmake | 29 ++++++++++++++++++++++++++++ ports/ignition-utils1/vcpkg.json | 18 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/i-/ignition-utils1.json | 9 +++++++++ 4 files changed, 60 insertions(+) create mode 100644 ports/ignition-utils1/portfile.cmake create mode 100644 ports/ignition-utils1/vcpkg.json create mode 100644 versions/i-/ignition-utils1.json diff --git a/ports/ignition-utils1/portfile.cmake b/ports/ignition-utils1/portfile.cmake new file mode 100644 index 00000000000000..dd54204f3c1675 --- /dev/null +++ b/ports/ignition-utils1/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gazebosim/gz-utils + REF ignition-utils1_1.4.0 + SHA512 f7c841391b0f523ed631c00d8053c52c3a52f409fb76faf68565ae2db96424c79e91a4bdcab650acfc35c17fe7f1df6881de4b59d5210539ebe8e9cfef991461 + HEAD_REF ign-utils1 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +# Fix cmake targets and pkg-config file location +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ignition-utils1") +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" + "${CURRENT_PACKAGES_DIR}/include/ignition/utils1/ignition/utils/cli" +) + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/ignition-utils1/vcpkg.json b/ports/ignition-utils1/vcpkg.json new file mode 100644 index 00000000000000..1401310a1914f5 --- /dev/null +++ b/ports/ignition-utils1/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-utils1", + "version": "1.4.0", + "description": "Ignition Utils, a component of Ignition Robotics, provides general purpose classes and functions designed for robotic applications.", + "homepage": "https://gazebosim.org", + "license": "Apache-2.0", + "dependencies": [ + "ignition-cmake2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 92233b7201797b..c9011459331b73 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3020,6 +3020,10 @@ "baseline": "9.0.0", "port-version": 4 }, + "ignition-utils1": { + "baseline": "1.4.0", + "port-version": 0 + }, "igraph": { "baseline": "0.10.1", "port-version": 0 diff --git a/versions/i-/ignition-utils1.json b/versions/i-/ignition-utils1.json new file mode 100644 index 00000000000000..557ef409963242 --- /dev/null +++ b/versions/i-/ignition-utils1.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "020c2c9b24d3d0a0d627a762e4c780ba1af2e154", + "version": "1.4.0", + "port-version": 0 + } + ] +} From fef923ce2010fbf23fa5aacf84b0f59a5fa0dd66 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:55:49 +0200 Subject: [PATCH 692/791] [serdepp] update port (#27073) --- ports/serdepp/portfile.cmake | 4 ++-- ports/serdepp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/serdepp.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/serdepp/portfile.cmake b/ports/serdepp/portfile.cmake index 3e347b7c91c324..007cc751371118 100644 --- a/ports/serdepp/portfile.cmake +++ b/ports/serdepp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO injae/serdepp - REF v0.1.4 - SHA512 da84ad82e882c0cada5c9dd3c77afd45aaf7b3b4eb150257b09b9b4854b349fdb2c39be2f6ba40bb39b34262e44609a02afba1ec860625f25a2313f7ac34a055 + REF v0.1.4.1 + SHA512 623414807e43d03f1ef1f9b7f02f10148b2745f5487047df3a678f92ccbe0a0f5f7d76cc6e2e88097e2c0e2cf2dde60b4f33dc9c6aaeafc7cd2dc3adfd88959f HEAD_REF main ) diff --git a/ports/serdepp/vcpkg.json b/ports/serdepp/vcpkg.json index 0bf3d3c7ac235f..0564822b3b39c0 100644 --- a/ports/serdepp/vcpkg.json +++ b/ports/serdepp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "serdepp", - "version": "0.1.4", + "version": "0.1.4.1", "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", + "supports": "!(osx & arm)", "dependencies": [ "magic-enum", "nameof", diff --git a/versions/baseline.json b/versions/baseline.json index c9011459331b73..dab0895f3673c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6737,7 +6737,7 @@ "port-version": 0 }, "serdepp": { - "baseline": "0.1.4", + "baseline": "0.1.4.1", "port-version": 0 }, "sf2cute": { diff --git a/versions/s-/serdepp.json b/versions/s-/serdepp.json index a6effc714a29e4..9fcf19df7e7a68 100644 --- a/versions/s-/serdepp.json +++ b/versions/s-/serdepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f077fd6d05147d61959cfc007f667feb6b8948e3", + "version": "0.1.4.1", + "port-version": 0 + }, { "git-tree": "37783a8fa004467ce9ee44c8f1e79fd994abd8e7", "version": "0.1.4", From 91688a98749160656710563de617c60b230b2188 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:56:55 +0200 Subject: [PATCH 693/791] [selene] fix arm64-osx (#27071) --- ports/selene/portfile.cmake | 1 + ports/selene/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/selene.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake index d300f5f839cb26..abc6e87bc6f2ab 100644 --- a/ports/selene/portfile.cmake +++ b/ports/selene/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DSELENE_ARCH_NATIVE=OFF ${FEATURE_OPTIONS} ) diff --git a/ports/selene/vcpkg.json b/ports/selene/vcpkg.json index 71bcb2514063d6..be547fcd8203d5 100644 --- a/ports/selene/vcpkg.json +++ b/ports/selene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "selene", "version": "0.3.1", - "port-version": 5, + "port-version": 6, "description": "A C++17 image representation, processing and I/O library.", "homepage": "https://github.com/kmhofmann/selene", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index dab0895f3673c6..60e7019641e854 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6710,7 +6710,7 @@ }, "selene": { "baseline": "0.3.1", - "port-version": 5 + "port-version": 6 }, "sentencepiece": { "baseline": "0.1.96", diff --git a/versions/s-/selene.json b/versions/s-/selene.json index c1635f9df68277..25821ecda4e8ba 100644 --- a/versions/s-/selene.json +++ b/versions/s-/selene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3bb766dcf3564bc3f0c852d3e7cd7910413b0ac5", + "version": "0.3.1", + "port-version": 6 + }, { "git-tree": "a7e77d03f1d4e5a4d24e10c3ffc1ac326df1791e", "version": "0.3.1", From 1deddd155116cfc2ea96783d6ffbd0651666d7cc Mon Sep 17 00:00:00 2001 From: Gregory Popovitch Date: Mon, 3 Oct 2022 16:57:31 -0400 Subject: [PATCH 694/791] [gtl] Bump version to 1.1.5 (#27062) * [gtl] Bump version to 1.1.5 * [gtl] run x-add-version --- ports/gtl/portfile.cmake | 4 ++-- ports/gtl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gtl.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gtl/portfile.cmake b/ports/gtl/portfile.cmake index ac553fecbda12b..50956ea2457461 100644 --- a/ports/gtl/portfile.cmake +++ b/ports/gtl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/gtl - REF v1.1.2 - SHA512 f609b965826f738592d85b015c3a5d29830cebc457e21987aaa69ab0fc4336adfd69538d81bd8b46c9467a449d7c25dd92fd3fa0ec86e68e423a4abf2bafa517 + REF v1.1.5 + SHA512 87666a975d3e355d24463f31bd7fe9796eb9e90b557b678807432fc3797a2b501e76acefae490cbaa503f993efe7f44c04a7cc8bd48662c38293c90741c8f7df HEAD_REF main ) diff --git a/ports/gtl/vcpkg.json b/ports/gtl/vcpkg.json index 12a1347cb4eaf0..f67c086d2f7eb8 100644 --- a/ports/gtl/vcpkg.json +++ b/ports/gtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gtl", - "version": "1.1.2", + "version": "1.1.5", "description": "Greg's Template Library of useful classes.", "homepage": "https://github.com/greg7mdp/gtl", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 60e7019641e854..01b3e019050dfd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2793,7 +2793,7 @@ "port-version": 0 }, "gtl": { - "baseline": "1.1.2", + "baseline": "1.1.5", "port-version": 0 }, "gts": { diff --git a/versions/g-/gtl.json b/versions/g-/gtl.json index 8268ef67001dff..bc8ed1da425861 100644 --- a/versions/g-/gtl.json +++ b/versions/g-/gtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e858eb1464aecbfd828e88515da6c75dc9277bd", + "version": "1.1.5", + "port-version": 0 + }, { "git-tree": "45ab838bcba517295403cbd3d619f7cedca27346", "version": "1.1.2", From dc558404ec85d0aaff71e54511010efd2e73510d Mon Sep 17 00:00:00 2001 From: Gregory Popovitch Date: Mon, 3 Oct 2022 16:58:05 -0400 Subject: [PATCH 695/791] [parallel-hashmap] Bump version to 1.3.8 (#27061) * [parallel-hashmap] Bump version to 1.3.8 * run x-add-version --- ports/parallel-hashmap/portfile.cmake | 4 ++-- ports/parallel-hashmap/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/parallel-hashmap.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index 324d2d23e4ae61..1a6217be836991 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.36 - SHA512 c5f7eea4cda698b8a2cc405d061fa1f4746354d5b0d3edd4db2e571fed757ffffe21c5ad4ec45feaa72db0dd092c7d220505f378340caeb176685900a57bc24c + REF v1.3.8 + SHA512 499f132aa1513942762ae5214e9a37915529d60142439d32276d9e68a446c93ecea66caa32ac00bea683e2c932101cd999c8839a89211e91032f777f236181f7 HEAD_REF master ) diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json index 19fe2412992589..d370b7296db947 100644 --- a/ports/parallel-hashmap/vcpkg.json +++ b/ports/parallel-hashmap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "parallel-hashmap", - "version": "1.36", + "version": "1.3.8", "description": "A header-only, very fast and memory-friendly family of C++ hash map & btree containers.", "license": "Apache-2.0", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 01b3e019050dfd..24cb8973f7a3a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5561,7 +5561,7 @@ "port-version": 2 }, "parallel-hashmap": { - "baseline": "1.36", + "baseline": "1.3.8", "port-version": 0 }, "parallelstl": { diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index 212f7468e4dbec..6586a5d3b4dd76 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65be62557bbdb29d6d0ee383b70a6f84ef401b2f", + "version": "1.3.8", + "port-version": 0 + }, { "git-tree": "80dc90f1c5acfd71797d79ecc2e976e0d1185afc", "version": "1.36", From 2f491e39b20e0fa3b36ff35bde04f5d9c09dfdb4 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:59:08 +0200 Subject: [PATCH 696/791] [tfhe] does not supports arm64 (#27070) --- ports/tfhe/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/t-/tfhe.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/tfhe/vcpkg.json b/ports/tfhe/vcpkg.json index 9749d5d1c101ba..2053bc996c7c91 100644 --- a/ports/tfhe/vcpkg.json +++ b/ports/tfhe/vcpkg.json @@ -1,8 +1,8 @@ { "name": "tfhe", "version-semver": "1.0.1", - "port-version": 3, + "port-version": 4, "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.", "homepage": "https://github.com/tfhe/tfhe", - "supports": "!windows" + "supports": "!windows & !arm" } diff --git a/versions/baseline.json b/versions/baseline.json index 24cb8973f7a3a3..759e8a15fd2328 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7226,7 +7226,7 @@ }, "tfhe": { "baseline": "1.0.1", - "port-version": 3 + "port-version": 4 }, "tgbot-cpp": { "baseline": "1.3", diff --git a/versions/t-/tfhe.json b/versions/t-/tfhe.json index dd960cfc1f88eb..6e46314f9d9161 100644 --- a/versions/t-/tfhe.json +++ b/versions/t-/tfhe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d620d8f9d52b36f1d703a4b072f7cc51ecc10069", + "version-semver": "1.0.1", + "port-version": 4 + }, { "git-tree": "657bf75ef9440b68186eeeccc1c7e3f2c55d3ec4", "version-semver": "1.0.1", From 1a28e9c6d9da913d781cf6dea9068b727f1bf3ae Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 22:59:32 +0200 Subject: [PATCH 697/791] [quickfix] does not supports arm64-osx (#27069) --- ports/quickfix/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/q-/quickfix.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/quickfix/vcpkg.json b/ports/quickfix/vcpkg.json index 7ad5fb2a37fa47..748140573f2dc5 100644 --- a/ports/quickfix/vcpkg.json +++ b/ports/quickfix/vcpkg.json @@ -1,10 +1,10 @@ { "name": "quickfix", "version": "1.15.1", - "port-version": 7, + "port-version": 8, "description": "QuickFIX is a free and open source implementation of the FIX protocol.", "homepage": "https://github.com/quickfix/quickfix", - "supports": "!uwp", + "supports": "!uwp & !(osx & arm64)", "dependencies": [ "openssl", { diff --git a/versions/baseline.json b/versions/baseline.json index 759e8a15fd2328..91741241b69b32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6306,7 +6306,7 @@ }, "quickfix": { "baseline": "1.15.1", - "port-version": 7 + "port-version": 8 }, "quill": { "baseline": "2.1.0", diff --git a/versions/q-/quickfix.json b/versions/q-/quickfix.json index 87b646b8922978..572afd7c588750 100644 --- a/versions/q-/quickfix.json +++ b/versions/q-/quickfix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8cdc0c05fb161bb28059f93d8dc05ea60d4c118", + "version": "1.15.1", + "port-version": 8 + }, { "git-tree": "73e9e7e7bcc08f6f0f491d68cd2ff93f5571353f", "version": "1.15.1", From d5cfd0d24a69bc341b87ce4e85419fe237139d1d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 23:00:34 +0200 Subject: [PATCH 698/791] [bitserializer-rapidyaml] does work on arm osx (#27068) --- ports/bitserializer-rapidyaml/vcpkg.json | 3 +-- ports/bitserializer/portfile.cmake | 2 +- ports/bitserializer/vcpkg.json | 7 ++----- ports/c4core/vcpkg.json | 3 ++- versions/b-/bitserializer-rapidyaml.json | 5 +++++ versions/b-/bitserializer.json | 5 +++++ versions/baseline.json | 6 +++--- versions/c-/c4core.json | 5 +++++ 8 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ports/bitserializer-rapidyaml/vcpkg.json b/ports/bitserializer-rapidyaml/vcpkg.json index c6fc4961ec5619..9d548ea4206eb9 100644 --- a/ports/bitserializer-rapidyaml/vcpkg.json +++ b/ports/bitserializer-rapidyaml/vcpkg.json @@ -1,9 +1,8 @@ { "name": "bitserializer-rapidyaml", "version-string": "alias", - "port-version": 2, + "port-version": 3, "description": "Deprecated alias for bitserializer-rapidyaml", - "supports": "!osx", "dependencies": [ { "name": "bitserializer", diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 28c43ace76a999..36f9c413f985d2 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/bitserializer) +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json index 42b09e65d214a3..8ea09f7b01fb8b 100644 --- a/ports/bitserializer/vcpkg.json +++ b/ports/bitserializer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bitserializer", "version": "0.44", - "port-version": 1, + "port-version": 2, "description": "C++ 17 library for serialization to JSON, XML, YAML", "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", "license": "MIT", @@ -37,10 +37,7 @@ "rapidyaml-archive": { "description": "Module for support YAML (implementation based on the RapidYaml library)", "dependencies": [ - { - "name": "ryml", - "platform": "!osx" - } + "ryml" ] } } diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json index cc75970c5063d8..ca56b17a53d849 100644 --- a/ports/c4core/vcpkg.json +++ b/ports/c4core/vcpkg.json @@ -1,10 +1,11 @@ { "name": "c4core", "version": "0.1.9", + "port-version": 1, "description": "Library of low-level C++ utilities", "homepage": "https://github.com/biojppm/c4core", "license": "MIT", - "supports": "!(uwp | arm)", + "supports": "!uwp & !(windows & arm)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/b-/bitserializer-rapidyaml.json b/versions/b-/bitserializer-rapidyaml.json index da58b49d7813b8..945d41310efc61 100644 --- a/versions/b-/bitserializer-rapidyaml.json +++ b/versions/b-/bitserializer-rapidyaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3dbe01a4244088fa34e2dae25ebcfbe67a35fad", + "version-string": "alias", + "port-version": 3 + }, { "git-tree": "08097fe26fb2b85b77ee6df81ba666201b1dd991", "version-string": "alias", diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index 00d44d04e1f619..b0cd2b5cf257b6 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5890683ebbade2c0abbc466cd447e3f4220f49cd", + "version": "0.44", + "port-version": 2 + }, { "git-tree": "e25c895f4054e151b1865640ae8500efcddda95b", "version": "0.44", diff --git a/versions/baseline.json b/versions/baseline.json index 91741241b69b32..8ee6742cd62d9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -498,7 +498,7 @@ }, "bitserializer": { "baseline": "0.44", - "port-version": 1 + "port-version": 2 }, "bitserializer-cpprestjson": { "baseline": "alias", @@ -514,7 +514,7 @@ }, "bitserializer-rapidyaml": { "baseline": "alias", - "port-version": 2 + "port-version": 3 }, "bitsery": { "baseline": "5.2.2", @@ -1250,7 +1250,7 @@ }, "c4core": { "baseline": "0.1.9", - "port-version": 0 + "port-version": 1 }, "c89stringutils": { "baseline": "0.0.1", diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json index ee68963c6b4590..4d8d02a23ed5bb 100644 --- a/versions/c-/c4core.json +++ b/versions/c-/c4core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfb9957f519b41c482f60cac729c8256d26190f6", + "version": "0.1.9", + "port-version": 1 + }, { "git-tree": "db4217bd25647d340de3233e8f2fd59d250e16d8", "version": "0.1.9", From 6adcef5a2784d369520b858fd84b6e88d8181682 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 3 Oct 2022 23:01:27 +0200 Subject: [PATCH 699/791] [geogram] does not work on arm osx (#27065) --- ports/geogram/portfile.cmake | 24 ++++++++++++------------ ports/geogram/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 2 +- versions/g-/geogram.json | 5 +++++ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index d3816694a0f1e8..456a2e3a220fd9 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( use-arm64-intrinsics.patch ) -file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake) +file(COPY "${CURRENT_PORT_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}/cmake") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -48,10 +48,10 @@ else() endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" # Geogram cannot be built with ninja because it embeds $(Configuration) in some of the generated paths. These require MSBuild in order to be evaluated. - #PREFER_NINJA # Disable this option if project cannot be built with Ninja + WINDOWS_USE_MSBUILD OPTIONS -DVORPALINE_BUILD_DYNAMIC=${VORPALINE_BUILD_DYNAMIC} -DGEOGRAM_LIB_ONLY=ON @@ -61,22 +61,22 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/geogram/GeogramTargets.cmake + "${CURRENT_PACKAGES_DIR}/share/geogram/GeogramTargets.cmake" [[INTERFACE_INCLUDE_DIRECTORIES "/src/lib;${_IMPORT_PREFIX}/include"]] [[INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"]] ) # Handle copyright -file(INSTALL ${SOURCE_PATH}/doc/devkit/license.dox DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/doc/devkit/license.dox" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json index 7c70b0ee3120e0..3e72ae0e2e9c37 100644 --- a/ports/geogram/vcpkg.json +++ b/ports/geogram/vcpkg.json @@ -1,13 +1,22 @@ { "name": "geogram", "version": "1.7.6", - "port-version": 3, + "port-version": 4, "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://gforge.inria.fr/projects/geogram/", - "supports": "!uwp", + "license": "BSD-3-Clause", + "supports": "!uwp & !(osx & arm64)", "dependencies": [ "blas", - "lapack" + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "graphics": { diff --git a/versions/baseline.json b/versions/baseline.json index 8ee6742cd62d9e..1a77e59b922d70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2550,7 +2550,7 @@ }, "geogram": { "baseline": "1.7.6", - "port-version": 3 + "port-version": 4 }, "geographiclib": { "baseline": "2.1.1", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index 5c3583fccb433f..5421809486cb85 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "902027c917fa8e2047dd0655721a753305432010", + "version": "1.7.6", + "port-version": 4 + }, { "git-tree": "2be512adda374e08c638f617f81f86b3dc3099a0", "version": "1.7.6", From 0a098ee6a86775b3dcf5c4b18cdb3419630571f3 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 3 Oct 2022 14:01:58 -0700 Subject: [PATCH 700/791] [cppwinrt] Update port for 2.0.220929.3 release (#27057) * Update cppwinrt for 2.0.220929.3 release * Update baseline --- ports/cppwinrt/portfile.cmake | 4 ++-- ports/cppwinrt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cppwinrt.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cppwinrt/portfile.cmake b/ports/cppwinrt/portfile.cmake index 7a3cd021c0e039..7eae1d393e946b 100644 --- a/ports/cppwinrt/portfile.cmake +++ b/ports/cppwinrt/portfile.cmake @@ -1,9 +1,9 @@ -set(CPPWINRT_VERSION 2.0.220418.1) +set(CPPWINRT_VERSION 2.0.220929.3) vcpkg_download_distfile(ARCHIVE URLS "https://www.nuget.org/api/v2/package/Microsoft.Windows.CppWinRT/${CPPWINRT_VERSION}" FILENAME "cppwinrt.${CPPWINRT_VERSION}.zip" - SHA512 67738587f7b1ca98a7c2c2c0733dd09612deb5ef6bcfa788ca0bcccbbfde2c706a675316085a41e79ab2c8796a0dd3bdba87d5c996dc0b6f76b438b5d75d2567 + SHA512 be15d8aab83ee56b4ae45782c87f5e38af6e07c2b468aea157e32b8b5289c1084e955f4d8237f8d9f1ebb4e36564be913b274210f535056fa6d773c8e0cb986b ) vcpkg_extract_source_archive_ex( diff --git a/ports/cppwinrt/vcpkg.json b/ports/cppwinrt/vcpkg.json index 679191ebebb88c..dc539eaa00a3d3 100644 --- a/ports/cppwinrt/vcpkg.json +++ b/ports/cppwinrt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppwinrt", - "version": "2.0.220418.1", + "version": "2.0.220929.3", "description": "C++/WinRT is a standard C++ language projection for the Windows Runtime.", "homepage": "https://github.com/microsoft/cppwinrt", "documentation": "https://docs.microsoft.com/windows/uwp/cpp-and-winrt-apis/", diff --git a/versions/baseline.json b/versions/baseline.json index 1a77e59b922d70..6aa51717bd52c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1693,7 +1693,7 @@ "port-version": 2 }, "cppwinrt": { - "baseline": "2.0.220418.1", + "baseline": "2.0.220929.3", "port-version": 0 }, "cppxaml": { diff --git a/versions/c-/cppwinrt.json b/versions/c-/cppwinrt.json index bdff431eb4dfe7..af5a2042014d60 100644 --- a/versions/c-/cppwinrt.json +++ b/versions/c-/cppwinrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba79ee15a44c311721836b535804423506cbcf5d", + "version": "2.0.220929.3", + "port-version": 0 + }, { "git-tree": "18d6860cc0a36639fe348d27ab4cb763dfc0e879", "version": "2.0.220418.1", From 4a5fbdb6e06310a7577e4f1bf406460bd2a42df5 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Mon, 3 Oct 2022 14:03:11 -0700 Subject: [PATCH 701/791] [google-cloud-cpp] update to latest release (v2.3.0) (#27060) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 27 +++++++++++++++++++++++++-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 6dc05bf8b9a56d..ce7381ac93be3a 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v2.2.0 - SHA512 7f51f993464ff72e34a39ba0095774ba71b51203aba82953aaedf9c6eb610efe00d1e798f848575e7e526cf1e5de512bf2024adce50506bab429ac765429159c + REF v2.3.0 + SHA512 094b8607aab0fc69a0999f63c4f4ed0d23a3658215192229968dfcf24ae3c9610821dc0e9b0da61edf192fcbf554e23cd4f9979c57ff6103011251012fb28596 HEAD_REF main PATCHES support_absl_cxx17.patch diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 871a13d30761c1..bae074f92cea95 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "2.2.0", - "port-version": 1, + "version": "2.3.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -392,6 +391,18 @@ } ] }, + "edgecontainer": { + "description": "Distributed Cloud Edge Container API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "eventarc": { "description": "Eventarc API C++ Client Library", "dependencies": [ @@ -612,6 +623,18 @@ } ] }, + "networkconnectivity": { + "description": "Network Connectivity API C++ Client Library", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "grpc-common" + ] + } + ] + }, "networkmanagement": { "description": "Network Management API C++ Client Library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6aa51717bd52c1..9d137ee3eae01f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2689,8 +2689,8 @@ "port-version": 1 }, "google-cloud-cpp": { - "baseline": "2.2.0", - "port-version": 1 + "baseline": "2.3.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index d40d8c9d5a2495..ab490bffe1049b 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "653d6d11f8a3dade7985f982ae09471dc34b9d7d", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "1787308d659051c50c95298d855cd7ad5308d8b4", "version": "2.2.0", From 5317fe2c157b3e045b121a8291357578d373c303 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 3 Oct 2022 14:03:35 -0700 Subject: [PATCH 702/791] [directx-headers] Update port for 1.606.4 minor release (#27056) * Update directx-headers for 1.606.4 minor update * Update baseline --- ports/directx-headers/portfile.cmake | 4 ++-- ports/directx-headers/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/directx-headers.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/directx-headers/portfile.cmake b/ports/directx-headers/portfile.cmake index 179786010ae1be..c96fccbca7864c 100644 --- a/ports/directx-headers/portfile.cmake +++ b/ports/directx-headers/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectX-Headers - REF v1.606.3-r1 - SHA512 a6a9337446f890bb44872ecc9ae0a6feed8e790331ab5bc861e5eea4c552fbbe06655c20b46b8683a76dadf58aaeb0591430e3a4ac2629a41448f1f32f6edc3f + REF v1.606.4 + SHA512 3fb4142f8ceedd8484f5f7dae5804a7a0012951de344936fbf22991d6ae659d4e5093e1627bfe51c3cb0859340b13171c4f6aa68377ec26ac05038acaad8c540 HEAD_REF main ) diff --git a/ports/directx-headers/vcpkg.json b/ports/directx-headers/vcpkg.json index 3f98e41faa2775..c6720af204b937 100644 --- a/ports/directx-headers/vcpkg.json +++ b/ports/directx-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directx-headers", - "version": "1.606.3", + "version": "1.606.4", "description": "Official DirectX 12 Headers", "homepage": "https://devblogs.microsoft.com/directx/", "documentation": "https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/", diff --git a/versions/baseline.json b/versions/baseline.json index 9d137ee3eae01f..5811a087f419ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1921,7 +1921,7 @@ "port-version": 0 }, "directx-headers": { - "baseline": "1.606.3", + "baseline": "1.606.4", "port-version": 0 }, "directxmath": { diff --git a/versions/d-/directx-headers.json b/versions/d-/directx-headers.json index 45be4d28eb2bbf..6d6e9a25eb307a 100644 --- a/versions/d-/directx-headers.json +++ b/versions/d-/directx-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "164c2675281e6d570c824a1403e458628d087ec1", + "version": "1.606.4", + "port-version": 0 + }, { "git-tree": "561f4b44e30ab8806b2983ebdabeaeeebabb48e0", "version": "1.606.3", From fc2959942a91c7dec6a633d109055d3fcfd04cdd Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Tue, 4 Oct 2022 06:04:17 +0900 Subject: [PATCH 703/791] [bext-ut] remove `ut-1.1.9/include` from header install path (#27051) * [bext-ut] change header install path * [bext-ut] update baseline * [bext-ut] nest patch file --- ports/bext-ut/portfile.cmake | 2 ++ ports/bext-ut/pr-521.patch | 15 +++++++++++++++ ports/bext-ut/vcpkg.json | 1 + versions/b-/bext-ut.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ports/bext-ut/pr-521.patch diff --git a/ports/bext-ut/portfile.cmake b/ports/bext-ut/portfile.cmake index a76999db04496f..69aca2095878dc 100644 --- a/ports/bext-ut/portfile.cmake +++ b/ports/bext-ut/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES avoid-cpm.patch + pr-521.patch # See https://github.com/boost-ext/ut/pull/521 ) vcpkg_cmake_configure( @@ -14,6 +15,7 @@ vcpkg_cmake_configure( -DBOOST_UT_BUILD_BENCHMARKS=OFF -DBOOST_UT_BUILD_EXAMPLES=OFF -DBOOST_UT_BUILD_TESTS=OFF + -DINCLUDE_INSTALL_DIR=include ) vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/bext-ut/pr-521.patch b/ports/bext-ut/pr-521.patch new file mode 100644 index 00000000000000..422917ef6722c1 --- /dev/null +++ b/ports/bext-ut/pr-521.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea96425..a8ce453 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,9 @@ endif() + + add_library(ut INTERFACE) + +-set(INCLUDE_INSTALL_DIR include/${PROJECT_NAME}-${PROJECT_VERSION}/include) ++if(NOT DEFINED INCLUDE_INSTALL_DIR) ++ set(INCLUDE_INSTALL_DIR include/${PROJECT_NAME}-${PROJECT_VERSION}/include) ++endif() + # XXX variant: set(INCLUDE_INSTALL_DIR include) + target_include_directories(ut INTERFACE $ $) + if(APPLE) diff --git a/ports/bext-ut/vcpkg.json b/ports/bext-ut/vcpkg.json index 8ede04611e04eb..08e0cea84c8493 100644 --- a/ports/bext-ut/vcpkg.json +++ b/ports/bext-ut/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bext-ut", "version": "1.1.9", + "port-version": 1, "description": "UT: C++20 μ(micro)/Unit Testing Framework", "homepage": "https://boost-ext.github.io/ut/", "license": "BSL-1.0", diff --git a/versions/b-/bext-ut.json b/versions/b-/bext-ut.json index bd99a7fbc2d1a7..b62fdd1a0d3a4b 100644 --- a/versions/b-/bext-ut.json +++ b/versions/b-/bext-ut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c80b6f438634bb91f77d03f18bcafe5486f8aaab", + "version": "1.1.9", + "port-version": 1 + }, { "git-tree": "ea37a3905161a060e837b30d42868792d50029f8", "version": "1.1.9", diff --git a/versions/baseline.json b/versions/baseline.json index 5811a087f419ca..02c17f6a1e8409 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -474,7 +474,7 @@ }, "bext-ut": { "baseline": "1.1.9", - "port-version": 0 + "port-version": 1 }, "bext-wintls": { "baseline": "0.9.5", From 779ce74ef67d3e12d904da1b15f9ed5626d5f677 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 3 Oct 2022 23:07:49 +0200 Subject: [PATCH 704/791] [gstreamer] enable builds on more platforms (#27050) * gstreamer fix build on linux * v db * let ci actually build more platforms. * move qtmultimedia on baseline * gstreamer osx --- ports/gst-rtsp-server/portfile.cmake | 9 +++++++++ ports/gst-rtsp-server/vcpkg.json | 2 +- .../gstreamer-disable-no-unused.patch | 5 ++--- ports/gstreamer/portfile.cmake | 19 +++++++++++++++---- ports/gstreamer/remove_x264_define.patch | 18 ++++++++++++++++++ ports/gstreamer/vcpkg.json | 4 ++-- ports/x264/portfile.cmake | 1 + ports/x264/vcpkg.json | 2 +- scripts/ci.baseline.txt | 4 ++-- versions/baseline.json | 6 +++--- versions/g-/gst-rtsp-server.json | 5 +++++ versions/g-/gstreamer.json | 5 +++++ versions/x-/x264.json | 5 +++++ 13 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 ports/gstreamer/remove_x264_define.patch diff --git a/ports/gst-rtsp-server/portfile.cmake b/ports/gst-rtsp-server/portfile.cmake index d184c1affc5d1d..6e4a7a65bbe107 100644 --- a/ports/gst-rtsp-server/portfile.cmake +++ b/ports/gst-rtsp-server/portfile.cmake @@ -29,6 +29,15 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(REMOVE ${DBG_BINS} ${REL_BINS}) endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Move plugin pkg-config files + file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*") + file(COPY ${pc_files} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(GLOB pc_files_dbg "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*") + file(COPY ${pc_files_dbg} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/") +endif() vcpkg_fixup_pkgconfig() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json index cd58d37f023230..e63b50a949806a 100644 --- a/ports/gst-rtsp-server/vcpkg.json +++ b/ports/gst-rtsp-server/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gst-rtsp-server", "version": "1.19.2", - "port-version": 1, + "port-version": 2, "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", "dependencies": [ "gstreamer", diff --git a/ports/gstreamer/gstreamer-disable-no-unused.patch b/ports/gstreamer/gstreamer-disable-no-unused.patch index 4fd3e068f48e7e..f8e7d0bce0107d 100644 --- a/ports/gstreamer/gstreamer-disable-no-unused.patch +++ b/ports/gstreamer/gstreamer-disable-no-unused.patch @@ -2,14 +2,13 @@ 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') +@@ -435,8 +435,8 @@ 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' ++if not gst_debug and cc.has_argument('-Wno-unused') add_project_arguments(['-Wno-unused'], language: 'c') endif diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 0262270872693e..0e422b7fd93c7b 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -49,7 +49,7 @@ vcpkg_from_github( REF 1.19.2 SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a HEAD_REF master - PATCHES ${PLUGIN_UGLY_PATCHES} fix-clang-cl-ugly.patch + PATCHES ${PLUGIN_UGLY_PATCHES} fix-clang-cl-ugly.patch remove_x264_define.patch ) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org @@ -290,9 +290,12 @@ vcpkg_install_meson() 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" -) +if(NOT VCPKG_TARGET_IS_LINUX) + 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" + ) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/libexec" "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/include" @@ -301,6 +304,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Move plugin pkg-config files + file(GLOB pc_files "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/*") + file(COPY ${pc_files} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(GLOB pc_files_dbg "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/*") + file(COPY ${pc_files_dbg} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/pkgconfig/" + "${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/pkgconfig/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin" ) diff --git a/ports/gstreamer/remove_x264_define.patch b/ports/gstreamer/remove_x264_define.patch new file mode 100644 index 00000000000000..044fb926bd0fd7 --- /dev/null +++ b/ports/gstreamer/remove_x264_define.patch @@ -0,0 +1,18 @@ +diff --git a/ext/x264/gstx264enc.h b/ext/x264/gstx264enc.h +index 6cbfc5c3d..ba7845b20 100644 +--- a/ext/x264/gstx264enc.h ++++ b/ext/x264/gstx264enc.h +@@ -31,13 +31,6 @@ + #include + #endif + +-/* The x264.h header says this isn't needed with MinGW, but sometimes the +- * compiler is unable to correctly do the pointer indirection for us, which +- * leads to a segfault when you try to dereference any const values provided +- * by x264.dll. See: https://bugzilla.gnome.org/show_bug.cgi?id=779249 */ +-#if defined(_WIN32) && !defined(X264_API_IMPORTS) +-# define X264_API_IMPORTS +-#endif + #include + + G_BEGIN_DECLS diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index b2ac7fb19f9014..68b629aeebd683 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,11 +1,11 @@ { "name": "gstreamer", "version": "1.19.2", - "port-version": 8, + "port-version": 9, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0-only", - "supports": "!linux & !uwp", + "supports": "!uwp", "dependencies": [ { "name": "cairo", diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index 6b726b40bea15e..cbd951a70b0b22 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -127,6 +127,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT if (NOT VCPKG_BUILD_TYPE) file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libx264.dll.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libx264.lib") endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/x264.h" "#ifdef X264_API_IMPORTS" "#if 1") elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/x264.h" "defined(U_STATIC_IMPLEMENTATION)" "1") file(REMOVE_RECURSE diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 54ba0439de199f..064f07140e6217 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x264", "version": "0.164.3095", - "port-version": 1, + "port-version": 2, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://www.videolan.org/developers/x264.html", "license": "GPL-2.0-or-later", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 797134d962d418..a66b75bcbc0366 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -310,8 +310,6 @@ gmmlib:x64-windows-static-md=fail gmmlib:x64-windows-static=fail gmmlib:x64-windows=fail gmmlib:x86-windows=fail -gstreamer:x64-windows-static=fail -gstreamer:x64-windows-static-md=fail google-cloud-cpp:arm-uwp=fail google-cloud-cpp:x64-uwp=fail gperftools:arm64-windows=fail @@ -872,6 +870,8 @@ qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip # Missing system libraries qt5-wayland:x64-osx=fail +# qtmultimedia needs an EGL fix +qtmultimedia:x64-linux=fail qtwayland:x64-osx=fail qtwayland:arm64-osx=fail # Post build checks fail diff --git a/versions/baseline.json b/versions/baseline.json index 02c17f6a1e8409..4f98d7f26dd8bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2770,11 +2770,11 @@ }, "gst-rtsp-server": { "baseline": "1.19.2", - "port-version": 1 + "port-version": 2 }, "gstreamer": { "baseline": "1.19.2", - "port-version": 8 + "port-version": 9 }, "gtest": { "baseline": "1.12.1", @@ -7894,7 +7894,7 @@ }, "x264": { "baseline": "0.164.3095", - "port-version": 1 + "port-version": 2 }, "x265": { "baseline": "3.4", diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json index 695937996b7e7a..2a41c65f874109 100644 --- a/versions/g-/gst-rtsp-server.json +++ b/versions/g-/gst-rtsp-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6c0f43ea29f3c58c4ea82529d5a33aac49982d5", + "version": "1.19.2", + "port-version": 2 + }, { "git-tree": "d769d57cd8c5c732146992a174266c11e7ef52ec", "version": "1.19.2", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index fd6824af511d5c..eaee70c958fe5a 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50b3345068815cb82022b680689ddfee0395e6de", + "version": "1.19.2", + "port-version": 9 + }, { "git-tree": "34e4471f1313a9d9ce220e461dde37a331c5bf47", "version": "1.19.2", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 55e06c314a2408..8b98973cc5331d 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ff53c90cd7222ae9d3e8dc579c1d198715585c2", + "version": "0.164.3095", + "port-version": 2 + }, { "git-tree": "16be87b659ccfeaba052e561f3f0a8b1b927c5d0", "version": "0.164.3095", From a3aa291c5900a4d2ed4cc780a5e27d22ec19c6e2 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Wed, 5 Oct 2022 17:54:44 -0400 Subject: [PATCH 705/791] [physfs] Update to 3.2.0 (#27108) * [physfs] Update to 3.2.0 * Run x-add-version --- .../001-fix-lzmasdk-arm64-windows.patch | 20 ----- ports/physfs/002-fix-posix-eintr.patch | 73 ------------------- ports/physfs/003-fix-posix-cloexec.patch | 34 --------- ports/physfs/portfile.cmake | 21 ++---- ports/physfs/vcpkg.json | 8 +- versions/baseline.json | 4 +- versions/p-/physfs.json | 5 ++ 7 files changed, 18 insertions(+), 147 deletions(-) delete mode 100644 ports/physfs/001-fix-lzmasdk-arm64-windows.patch delete mode 100644 ports/physfs/002-fix-posix-eintr.patch delete mode 100644 ports/physfs/003-fix-posix-cloexec.patch diff --git a/ports/physfs/001-fix-lzmasdk-arm64-windows.patch b/ports/physfs/001-fix-lzmasdk-arm64-windows.patch deleted file mode 100644 index 0fad2b58007f69..00000000000000 --- a/ports/physfs/001-fix-lzmasdk-arm64-windows.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/physfs_lzmasdk.h b/src/physfs_lzmasdk.h ---- a/src/physfs_lzmasdk.h -+++ b/src/physfs_lzmasdk.h -@@ -506,6 +506,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem - #endif - - #if defined(MY_CPU_AMD64) \ -+ || defined(_M_ARM64) \ - || defined(_M_IA64) \ - || defined(__AARCH64EL__) \ - || defined(__AARCH64EB__) -@@ -531,6 +532,8 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem - - #if defined(_WIN32) && defined(_M_ARM) - #define MY_CPU_ARM_LE -+#elif defined(_WIN64) && defined(_M_ARM64) -+#define MY_CPU_ARM_LE - #endif - - #if defined(_WIN32) && defined(_M_IA64) diff --git a/ports/physfs/002-fix-posix-eintr.patch b/ports/physfs/002-fix-posix-eintr.patch deleted file mode 100644 index 08d314af1c142e..00000000000000 --- a/ports/physfs/002-fix-posix-eintr.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/src/physfs_platform_posix.c b/src/physfs_platform_posix.c ---- a/src/physfs_platform_posix.c -+++ b/src/physfs_platform_posix.c -@@ -6,8 +6,6 @@ - * This file written by Ryan C. Gordon. - */ - --/* !!! FIXME: check for EINTR? */ -- - #define __PHYSICSFS_INTERNAL__ - #include "physfs_platforms.h" - -@@ -167,7 +165,9 @@ static void *doOpen(const char *filename, int mode) - /* O_APPEND doesn't actually behave as we'd like. */ - mode &= ~O_APPEND; - -- fd = open(filename, mode, S_IRUSR | S_IWUSR); -+ do { -+ fd = open(filename, mode, S_IRUSR | S_IWUSR); -+ } while ((fd < 0) && (errno == EINTR)); - BAIL_IF(fd < 0, errcodeFromErrno(), NULL); - - if (appending) -@@ -219,7 +219,9 @@ PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, - if (!__PHYSFS_ui64FitsAddressSpace(len)) - BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1); - -- rc = read(fd, buffer, (size_t) len); -+ do { -+ rc = read(fd, buffer, (size_t) len); -+ } while ((rc == -1) && (errno == EINTR)); - BAIL_IF(rc == -1, errcodeFromErrno(), -1); - assert(rc >= 0); - assert(rc <= len); -@@ -236,7 +238,9 @@ PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, - if (!__PHYSFS_ui64FitsAddressSpace(len)) - BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1); - -- rc = write(fd, (void *) buffer, (size_t) len); -+ do { -+ rc = write(fd, (void *) buffer, (size_t) len); -+ } while ((rc == -1) && (errno == EINTR)); - BAIL_IF(rc == -1, errcodeFromErrno(), rc); - assert(rc >= 0); - assert(rc <= len); -@@ -275,8 +279,13 @@ PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) - int __PHYSFS_platformFlush(void *opaque) - { - const int fd = *((int *) opaque); -- if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) -- BAIL_IF(fsync(fd) == -1, errcodeFromErrno(), 0); -+ int rc = -1; -+ if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) { -+ do { -+ rc = fsync(fd); -+ } while ((rc == -1) && (errno == EINTR)); -+ BAIL_IF(rc == -1, errcodeFromErrno(), 0); -+ } - return 1; - } /* __PHYSFS_platformFlush */ - -@@ -284,7 +293,10 @@ int __PHYSFS_platformFlush(void *opaque) - void __PHYSFS_platformClose(void *opaque) - { - const int fd = *((int *) opaque); -- (void) close(fd); /* we don't check this. You should have used flush! */ -+ int rc = -1; -+ do { -+ rc = close(fd); /* we don't check this. You should have used flush! */ -+ } while ((rc == -1) && (errno == EINTR)); - allocator.Free(opaque); - } /* __PHYSFS_platformClose */ - diff --git a/ports/physfs/003-fix-posix-cloexec.patch b/ports/physfs/003-fix-posix-cloexec.patch deleted file mode 100644 index 6ff2114a5e7529..00000000000000 --- a/ports/physfs/003-fix-posix-cloexec.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/physfs_platform_posix.c b/src/physfs_platform_posix.c ---- a/src/physfs_platform_posix.c -+++ b/src/physfs_platform_posix.c -@@ -160,16 +160,30 @@ static void *doOpen(const char *filename, int mode) - const int appending = (mode & O_APPEND); - int fd; - int *retval; -+ int flags; -+ flags = -1; - errno = 0; - - /* O_APPEND doesn't actually behave as we'd like. */ - mode &= ~O_APPEND; -+ -+#ifdef O_CLOEXEC -+ /* Add O_CLOEXEC if defined */ -+ mode |= O_CLOEXEC; -+#endif - - do { - fd = open(filename, mode, S_IRUSR | S_IWUSR); - } while ((fd < 0) && (errno == EINTR)); - BAIL_IF(fd < 0, errcodeFromErrno(), NULL); - -+#if !defined(O_CLOEXEC) && defined(FD_CLOEXEC) -+ flags = fcntl(fd, F_GETFD); -+ if (flags != -1) { -+ fcntl(fd, F_SETFD, flags | FD_CLOEXEC); -+ } -+#endif -+ - if (appending) - { - if (lseek(fd, 0, SEEK_END) < 0) diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index b47465de2924d0..fa62bf2f5313dc 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -1,20 +1,8 @@ -set(PHYSFS_VERSION 3.0.2) - -vcpkg_download_distfile(ARCHIVE - URLS "https://icculus.org/physfs/downloads/physfs-${PHYSFS_VERSION}.tar.bz2" - "https://hg.icculus.org/icculus/physfs/archive/release-${PHYSFS_VERSION}.tar.bz2" - FILENAME "physfs-${PHYSFS_VERSION}.tar.bz2" - SHA512 4024b6c3348e0b6fc1036aac330192112dfe17de3e3d14773be9f06e9a062df5a1006869f21162b4e0b584989f463788a35e64186b1913225c073fea62754472 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF ${PHYSFS_VERSION} - PATCHES - "001-fix-lzmasdk-arm64-windows.patch" - "002-fix-posix-eintr.patch" # Remove this patch in the next update - "003-fix-posix-cloexec.patch" # Remove this patch in the next update + REPO icculus/physfs + REF eb3383b532c5f74bfeb42ec306ba2cf80eed988c # release-3.2.0 + SHA512 4231b379107a8dbacad18d98c0800bad4a3aae1bdd1db0bd4cf0c89c69bb7590ed14422c77671c28bd7556f606d3ff155ad8432940ce6222340f647f9e73ae8e ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) @@ -36,6 +24,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PhysFS) vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json index 649fa9384935ad..8fe3db08a7f8eb 100644 --- a/ports/physfs/vcpkg.json +++ b/ports/physfs/vcpkg.json @@ -1,14 +1,18 @@ { "name": "physfs", - "version-semver": "3.0.2", - "port-version": 7, + "version-semver": "3.2.0", "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", + "license": "Zlib", "dependencies": [ { "name": "vcpkg-cmake", "host": true }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4f98d7f26dd8bd..c280c341bdf636 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5653,8 +5653,8 @@ "port-version": 0 }, "physfs": { - "baseline": "3.0.2", - "port-version": 7 + "baseline": "3.2.0", + "port-version": 0 }, "physx": { "baseline": "4.1.2", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index 7961b91513989b..1dc795a88b2e62 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d594baf908325d64c1223954daf61842e7be1db", + "version-semver": "3.2.0", + "port-version": 0 + }, { "git-tree": "0acbb8771db07ce3e4641f015189fb48e732bdd5", "version-semver": "3.0.2", From be15c299779723507b940e8c30b5fcabb3f50b38 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 5 Oct 2022 23:58:04 +0200 Subject: [PATCH 706/791] [libpq] Fix osx-dynamic (#27103) * Fix osx-dynamic builds * Update versions --- ports/libpq/portfile.cmake | 3 +++ ports/libpq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index bd0e708a7b8aa0..378d41109eed75 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -299,8 +299,11 @@ else() DETERMINE_BUILD_TRIPLET OPTIONS ${BUILD_OPTS} + OPTIONS_RELEASE + "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/lib:${CURRENT_INSTALLED_DIR}/debug/lib" OPTIONS_DEBUG --enable-debug + "DYLD_FALLBACK_LIBRARY_PATH=${CURRENT_INSTALLED_DIR}/debug/lib:${CURRENT_INSTALLED_DIR}/lib" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 4f3ed6375d4013..cb3023f97cf67c 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "14.4", - "port-version": 1, + "port-version": 2, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "license": "PostgreSQL", diff --git a/versions/baseline.json b/versions/baseline.json index c280c341bdf636..36233a19a1180e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4058,7 +4058,7 @@ }, "libpq": { "baseline": "14.4", - "port-version": 1 + "port-version": 2 }, "libpqxx": { "baseline": "7.7.3", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 319cc73f919aed..b966cbf77c4094 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d452cd83bf4c62032f2ecbf66b23d75261f6ed88", + "version": "14.4", + "port-version": 2 + }, { "git-tree": "bdf23f137f7f72e57555542fc392a8ec8e0ebd28", "version": "14.4", From 878246e6c9428e79df0fda1e5379ad0e50950717 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 5 Oct 2022 23:58:23 +0200 Subject: [PATCH 707/791] [sdformat9] no osx arm (#27102) --- ports/sdformat9/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/sdformat9.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json index c541b726b34984..1abe244286b696 100644 --- a/ports/sdformat9/vcpkg.json +++ b/ports/sdformat9/vcpkg.json @@ -1,10 +1,11 @@ { "name": "sdformat9", "version": "9.8.0", + "port-version": 1, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "license": "Apache-2.0", - "supports": "!uwp", + "supports": "!uwp & !(arm & osx)", "dependencies": [ "ignition-math6", "tinyxml", diff --git a/versions/baseline.json b/versions/baseline.json index 36233a19a1180e..6d5acfd27627eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6662,7 +6662,7 @@ }, "sdformat9": { "baseline": "9.8.0", - "port-version": 0 + "port-version": 1 }, "sdl1": { "baseline": "1.2.15", diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json index a4b2c78df32055..e19b6ac97f8ce8 100644 --- a/versions/s-/sdformat9.json +++ b/versions/s-/sdformat9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "693fd5dc7bdb0dfe766275719f0b3f85477994aa", + "version": "9.8.0", + "port-version": 1 + }, { "git-tree": "32a06104ef8500390db26865dbc6f887de83f1ee", "version": "9.8.0", From d98da60f998aa2333ebb9726a99b1e9930f916e1 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 5 Oct 2022 23:58:42 +0200 Subject: [PATCH 708/791] [sdformat10] no osx arm (#27101) --- ports/sdformat10/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/s-/sdformat10.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sdformat10/vcpkg.json b/ports/sdformat10/vcpkg.json index 13c81a93b4dffb..5f4761dfc86554 100644 --- a/ports/sdformat10/vcpkg.json +++ b/ports/sdformat10/vcpkg.json @@ -1,10 +1,10 @@ { "name": "sdformat10", "version": "10.0.0", - "port-version": 2, + "port-version": 3, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", - "supports": "!uwp", + "supports": "!uwp & !(arm & osx)", "dependencies": [ "ignition-math6", "tinyxml2", diff --git a/versions/baseline.json b/versions/baseline.json index 6d5acfd27627eb..a4242fc5ef4453 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6654,7 +6654,7 @@ }, "sdformat10": { "baseline": "10.0.0", - "port-version": 2 + "port-version": 3 }, "sdformat6": { "baseline": "6.2.0", diff --git a/versions/s-/sdformat10.json b/versions/s-/sdformat10.json index 00cd92457625f1..7541db3a7611eb 100644 --- a/versions/s-/sdformat10.json +++ b/versions/s-/sdformat10.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "872ca568e5e49581fe0404d3422230d60b3d9710", + "version": "10.0.0", + "port-version": 3 + }, { "git-tree": "abf1fc376b102a9ef833522a615261e5d3e155b8", "version": "10.0.0", From 725395a0eb2c64ad6f84b84cd27af6e9532d4c65 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 5 Oct 2022 23:59:14 +0200 Subject: [PATCH 709/791] [usd] does not work on arm64 (#27100) --- ports/usd/portfile.cmake | 7 +++---- ports/usd/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/u-/usd.json | 5 +++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ports/usd/portfile.cmake b/ports/usd/portfile.cmake index b1eda984b3bf54..4c3b47eb8b687d 100644 --- a/ports/usd/portfile.cmake +++ b/ports/usd/portfile.cmake @@ -29,9 +29,8 @@ ELSE() file(REMOVE ${SOURCE_PATH}/cmake/modules/FindTBB.cmake) ENDIF() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DPXR_BUILD_ALEMBIC_PLUGIN:BOOL=OFF -DPXR_BUILD_EMBREE_PLUGIN:BOOL=OFF @@ -46,14 +45,14 @@ vcpkg_configure_cmake( -DPXR_BUILD_USD_TOOLS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file( RENAME "${CURRENT_PACKAGES_DIR}/pxrConfig.cmake" "${CURRENT_PACKAGES_DIR}/cmake/pxrConfig.cmake") -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/pxr) +vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME pxr) vcpkg_copy_pdbs() diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json index 55dd4cc3e5f0aa..5642284a4ca1a9 100644 --- a/ports/usd/vcpkg.json +++ b/ports/usd/vcpkg.json @@ -1,10 +1,11 @@ { "name": "usd", "version-string": "20.08", - "port-version": 3, + "port-version": 4, "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", + "license": null, + "supports": "!x86 & !arm", "dependencies": [ "boost-assign", "boost-crc", @@ -17,6 +18,14 @@ "boost-system", "boost-vmd", "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index a4242fc5ef4453..40d5cb26c6e785 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7550,7 +7550,7 @@ }, "usd": { "baseline": "20.08", - "port-version": 3 + "port-version": 4 }, "usockets": { "baseline": "0.8.1", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index f1d76f10ef5071..9af1724dbe35fc 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4c2d8c578eff85a0c1c897c595ddc35240cce98", + "version-string": "20.08", + "port-version": 4 + }, { "git-tree": "c241a36daa1c8695be5e0d4a8a29f2cc304dd6b1", "version-string": "20.08", From ba21b17102f91c74417d1e68588893aab4369df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 5 Oct 2022 23:59:43 +0200 Subject: [PATCH 710/791] [libofx] upgrade to 0.10.9 (#27098) * [libofx] upgrade to 0.10.9 * [libofx] update versions --- ports/libofx/portfile.cmake | 4 ++-- ports/libofx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libofx.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libofx/portfile.cmake b/ports/libofx/portfile.cmake index 32c6135b3a9142..6b49481bc498ba 100644 --- a/ports/libofx/portfile.cmake +++ b/ports/libofx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libofx/libofx - REF 0.10.8 - SHA512 e241a9ad766a91f53a2b65c316e87ee43df9173b25904d1af05c2ce491c8d781278333c20206751787f540c7bc9880b32a41a4646714fd1586f22801394d89a3 + REF 0.10.9 + SHA512 be7b77f77a012fe04121c615b88f674bba11f79b5353b3c4594de395f9f787c3a9b6910693f5ba701421387fc13c13e7977ab73893e18c6a0b6e1292b7d1cfe2 HEAD_REF master ) diff --git a/ports/libofx/vcpkg.json b/ports/libofx/vcpkg.json index 39ec14490b85d4..d0e3355401ee36 100644 --- a/ports/libofx/vcpkg.json +++ b/ports/libofx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libofx", - "version": "0.10.8", + "version": "0.10.9", "description": "OFX banking protocol abstraction library", "homepage": "https://github.com/libofx/libofx", "license": "GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 40d5cb26c6e785..c94a270c963cec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3993,7 +3993,7 @@ "port-version": 9 }, "libofx": { - "baseline": "0.10.8", + "baseline": "0.10.9", "port-version": 0 }, "libogg": { diff --git a/versions/l-/libofx.json b/versions/l-/libofx.json index a041ab5d2952f7..482c77d85c9f59 100644 --- a/versions/l-/libofx.json +++ b/versions/l-/libofx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f68c536d0f30c47c36d02d0bf6e7eda76ea7e08", + "version": "0.10.9", + "port-version": 0 + }, { "git-tree": "359386dc0b18eea302535a62b8d429325c457ebc", "version": "0.10.8", From f579f4c7d24b2014122df01bc5d8c242844322dc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:01:43 +0200 Subject: [PATCH 711/791] [xeus] fix arm64-osx build (#27097) --- ports/xeus/portfile.cmake | 10 +++++----- ports/xeus/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/x-/xeus.json | 5 +++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ports/xeus/portfile.cmake b/ports/xeus/portfile.cmake index 85ffb5e8bd5834..b790d4d2919f27 100644 --- a/ports/xeus/portfile.cmake +++ b/ports/xeus/portfile.cmake @@ -11,9 +11,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DXEUS_BUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} @@ -21,13 +20,14 @@ vcpkg_configure_cmake( -DBUILD_TESTS=OFF -DDOWNLOAD_GTEST=OFF -DDISABLE_ARCH_NATIVE=OFF + -DXEUS_DISABLE_ARCH_NATIVE=On ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/xeus/vcpkg.json b/ports/xeus/vcpkg.json index 178c6e7163bf02..89f8f67ad2a069 100644 --- a/ports/xeus/vcpkg.json +++ b/ports/xeus/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xeus", - "version-string": "0.24.3", - "port-version": 1, + "version": "0.24.3", + "port-version": 2, "description": "C++ implementation of the Jupyter kernel protocol", "homepage": "https://github.com/jupyter-xeus/xeus", + "license": "BSD-3-Clause", "dependencies": [ "cppzmq", { @@ -12,6 +13,14 @@ }, "nlohmann-json", "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtl", "zeromq" ] diff --git a/versions/baseline.json b/versions/baseline.json index c94a270c963cec..f7519698ef07fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7934,7 +7934,7 @@ }, "xeus": { "baseline": "0.24.3", - "port-version": 1 + "port-version": 2 }, "xframe": { "baseline": "0.3.0", diff --git a/versions/x-/xeus.json b/versions/x-/xeus.json index ddd6614a97d07b..15c72b6b7dc6c5 100644 --- a/versions/x-/xeus.json +++ b/versions/x-/xeus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58ccbb03903ad023da77a9a53225dc4bd25df600", + "version": "0.24.3", + "port-version": 2 + }, { "git-tree": "2bb5d11153c9982aad5337c44d2f781918e8d991", "version-string": "0.24.3", From 4b6d101cc3a8e2dfaa1e49bba0ae53019c10a9fe Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:02:27 +0200 Subject: [PATCH 712/791] [colmap] fix arm64-osx build (#27095) --- ports/colmap/portfile.cmake | 6 ++++++ ports/colmap/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/colmap.json | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/colmap/portfile.cmake b/ports/colmap/portfile.cmake index a9971e6cc27a60..2ec30cc5625899 100644 --- a/ports/colmap/portfile.cmake +++ b/ports/colmap/portfile.cmake @@ -39,6 +39,11 @@ if("tests" IN_LIST FEATURES) set(TESTS_ENABLED ON) endif() +set(OPENMP_ENABLED ON) +if (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE MATCHES "arm") + set(OPENMP_ENABLED Off) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE @@ -48,6 +53,7 @@ vcpkg_cmake_configure( -DTESTS_ENABLED=${TESTS_ENABLED} -DGIT_COMMIT_ID=${GIT_COMMIT_ID} -DGIT_COMMIT_DATE=${COLMAP_GIT_COMMIT_DATE} + -DOPENMP_ENABLED=${OPENMP_ENABLED} ) vcpkg_cmake_install() diff --git a/ports/colmap/vcpkg.json b/ports/colmap/vcpkg.json index f1f0a09b63162d..e029534210aa4b 100644 --- a/ports/colmap/vcpkg.json +++ b/ports/colmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "colmap", "version-date": "2022-03-14", + "port-version": 1, "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", diff --git a/versions/baseline.json b/versions/baseline.json index f7519698ef07fd..87e715d9540a5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1538,7 +1538,7 @@ }, "colmap": { "baseline": "2022-03-14", - "port-version": 0 + "port-version": 1 }, "color-console": { "baseline": "2022-03-20", diff --git a/versions/c-/colmap.json b/versions/c-/colmap.json index 3f00dddf1029a8..e65f997a00e265 100644 --- a/versions/c-/colmap.json +++ b/versions/c-/colmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc9f3b2c6df41f81ef8ad2b7657c87bfb1bb83f3", + "version-date": "2022-03-14", + "port-version": 1 + }, { "git-tree": "bf74fe8bdad103c3212e029ac7e736c759be2aa8", "version-date": "2022-03-14", From 45fb2215a3595d84b6438818e42987a6089790d7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:03:50 +0200 Subject: [PATCH 713/791] [coolprop] use python3 (#27094) --- ports/coolprop/portfile.cmake | 13 ++++++------- ports/coolprop/vcpkg.json | 9 +++++++-- versions/baseline.json | 2 +- versions/c-/coolprop.json | 5 +++++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ports/coolprop/portfile.cmake b/ports/coolprop/portfile.cmake index a1e7b978de3dbe..e036e1da17a78b 100644 --- a/ports/coolprop/portfile.cmake +++ b/ports/coolprop/portfile.cmake @@ -13,9 +13,9 @@ vcpkg_from_github( fix-install.patch ) -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) -vcpkg_add_to_path(${PYTHON2_DIR}) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) +vcpkg_add_to_path(${PYTHON3_DIR}) file(REMOVE_RECURSE ${SOURCE_PATH}/externals) @@ -73,9 +73,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" COOLPROP_MSVC_DYNAMIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" COOLPROP_MSVC_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY} -DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY} @@ -87,7 +86,7 @@ vcpkg_configure_cmake( -DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if (VCPKG_TARGET_IS_WINDOWS AND COOLPROP_SHARED_LIBRARY) diff --git a/ports/coolprop/vcpkg.json b/ports/coolprop/vcpkg.json index acd6b2f17ff339..5599289bbaf6fd 100644 --- a/ports/coolprop/vcpkg.json +++ b/ports/coolprop/vcpkg.json @@ -1,9 +1,10 @@ { "name": "coolprop", "version-semver": "6.4.1", - "port-version": 1, + "port-version": 2, "description": "Thermophysical properties for the masses", "homepage": "https://github.com/CoolProp/CoolProp", + "license": "MIT", "dependencies": [ "catch", "eigen3", @@ -12,6 +13,10 @@ "msgpack", "pybind11", "rapidjson", - "refprop-headers" + "refprop-headers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 87e715d9540a5a..2b52998ca6e923 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1594,7 +1594,7 @@ }, "coolprop": { "baseline": "6.4.1", - "port-version": 1 + "port-version": 2 }, "coroutine": { "baseline": "1.5.0", diff --git a/versions/c-/coolprop.json b/versions/c-/coolprop.json index 7c9baee71e5b3b..9386fc5a049294 100644 --- a/versions/c-/coolprop.json +++ b/versions/c-/coolprop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b66373d8ddd7b8b887779bfb7c132b4000fe4c87", + "version-semver": "6.4.1", + "port-version": 2 + }, { "git-tree": "61676b5a1e9b82c4b88fd3bf37b684f592f9103e", "version-semver": "6.4.1", From 3c861b4e9bfb17be6e8b2f80dc4014d9ec974c97 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 5 Oct 2022 15:04:06 -0700 Subject: [PATCH 714/791] [cmakerc] Add usage text. (#27109) --- ports/cmakerc/portfile.cmake | 3 +-- ports/cmakerc/usage | 7 +++++++ ports/cmakerc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cmakerc.json | 5 +++++ 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 ports/cmakerc/usage diff --git a/ports/cmakerc/portfile.cmake b/ports/cmakerc/portfile.cmake index 1a0d3ba5569388..0649fa702f3944 100644 --- a/ports/cmakerc/portfile.cmake +++ b/ports/cmakerc/portfile.cmake @@ -9,6 +9,5 @@ vcpkg_from_github( ) file(INSTALL "${SOURCE_PATH}/CMakeRC.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME cmakerc-config.cmake) - -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/cmakerc/usage b/ports/cmakerc/usage new file mode 100644 index 00000000000000..248589fba22126 --- /dev/null +++ b/ports/cmakerc/usage @@ -0,0 +1,7 @@ +The package cmakerc provides additional cmake functions: + + find_package(CMakeRC CONFIG REQUIRED) + cmrc_add_resource_library(foo-resources ALIAS foo::rc NAMESPACE foo ...) + target_link_libraries(main PRIVATE foo::rc) + +See https://github.com/vector-of-bool/cmrc/blob/master/README.md diff --git a/ports/cmakerc/vcpkg.json b/ports/cmakerc/vcpkg.json index 39162213e52b5b..67b839394446ff 100644 --- a/ports/cmakerc/vcpkg.json +++ b/ports/cmakerc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cmakerc", "version-date": "2021-08-27", + "port-version": 1, "description": "A Resource Compiler in a Single CMake Script", "homepage": "https://github.com/vector-of-bool/cmrc", "license": "MIT" diff --git a/versions/baseline.json b/versions/baseline.json index 2b52998ca6e923..5c263b51fea72b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1490,7 +1490,7 @@ }, "cmakerc": { "baseline": "2021-08-27", - "port-version": 0 + "port-version": 1 }, "cmark": { "baseline": "0.30.1", diff --git a/versions/c-/cmakerc.json b/versions/c-/cmakerc.json index fc2a9fb618313b..f5885182ad2f91 100644 --- a/versions/c-/cmakerc.json +++ b/versions/c-/cmakerc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2fd3d5a7ba3648e56e111691ea6fa938cbc4ed9", + "version-date": "2021-08-27", + "port-version": 1 + }, { "git-tree": "740fd9bb83e79eba29ccd69546d2b3105d719d5d", "version-date": "2021-08-27", From 72c3a756011a835053a32a57a55c656730551de3 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:05:06 +0200 Subject: [PATCH 715/791] [clfft] fix arm build (#27093) --- ports/clfft/fix-build.patch | 25 +++++++++++++++++++++++++ ports/clfft/portfile.cmake | 1 + ports/clfft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/clfft.json | 5 +++++ 5 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 ports/clfft/fix-build.patch diff --git a/ports/clfft/fix-build.patch b/ports/clfft/fix-build.patch new file mode 100644 index 00000000000000..65c343945aa5ea --- /dev/null +++ b/ports/clfft/fix-build.patch @@ -0,0 +1,25 @@ +diff --git a/src/library/generator.transpose.cpp b/src/library/generator.transpose.cpp +index a04a43a..5c15882 100644 +--- a/src/library/generator.transpose.cpp ++++ b/src/library/generator.transpose.cpp +@@ -1089,8 +1089,18 @@ clfftStatus genSwapKernelGeneral(const FFTGeneratedTransposeNonSquareAction::Sig + + //std::string funcName = "swap_nonsquare_" + std::to_string(smaller_dim) + "_" + std::to_string(dim_ratio); + std::string funcName = "swap_nonsquare_"; +- std::string smaller_dim_str = static_cast(&(std::ostringstream() << smaller_dim))->str(); +- std::string dim_ratio_str = static_cast(&(std::ostringstream() << dim_ratio))->str(); ++ std::string smaller_dim_str; ++ { ++ std::ostringstream oss; ++ oss << smaller_dim; ++ smaller_dim_str = oss.str(); ++ } ++ std::string dim_ratio_str; ++ { ++ std::ostringstream oss; ++ oss << dim_ratio; ++ dim_ratio_str = oss.str(); ++ } + if(params.fft_N[0] > params.fft_N[1]) + funcName = funcName + smaller_dim_str + "_" + dim_ratio_str; + else diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake index bd52b123052fb6..c45c30a9c940c9 100644 --- a/ports/clfft/portfile.cmake +++ b/ports/clfft/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES tweak-install.patch + fix-build.patch ) vcpkg_cmake_configure( diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json index 15886ab2ff7e28..4eef7f93266f59 100644 --- a/ports/clfft/vcpkg.json +++ b/ports/clfft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clfft", "version": "2.12.2", - "port-version": 5, + "port-version": 6, "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.", "homepage": "https://github.com/clMathLibraries/clFFT", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 5c263b51fea72b..72b61df184b345 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1450,7 +1450,7 @@ }, "clfft": { "baseline": "2.12.2", - "port-version": 5 + "port-version": 6 }, "cli": { "baseline": "2.0.2", diff --git a/versions/c-/clfft.json b/versions/c-/clfft.json index 33be216903f29a..3efe93477858f6 100644 --- a/versions/c-/clfft.json +++ b/versions/c-/clfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4acb8a5a455beee82cacccf5b72e6c6aa8d8c6a7", + "version": "2.12.2", + "port-version": 6 + }, { "git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04", "version": "2.12.2", From afb70b3caec8b0a2cf982215846e2ed4db438abd Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:06:16 +0200 Subject: [PATCH 716/791] [boost-coroutine] works on arm (#27091) --- ports/boost-asio/vcpkg.json | 3 ++- ports/boost-coroutine/vcpkg.json | 3 ++- ports/boost/vcpkg.json | 5 +++-- scripts/boost/generate-ports.ps1 | 7 ++++++- versions/b-/boost-asio.json | 5 +++++ versions/b-/boost-coroutine.json | 5 +++++ versions/b-/boost.json | 5 +++++ versions/baseline.json | 6 +++--- 8 files changed, 31 insertions(+), 8 deletions(-) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 764289f0f7a8e3..6aacd8f9c31ea0 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-asio", "version": "1.80.0", + "port-version": 1, "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "license": "BSL-1.0", @@ -18,7 +19,7 @@ "boost-core", { "name": "boost-coroutine", - "platform": "!arm & !uwp & !emscripten" + "platform": "!(arm & windows) & !uwp & !emscripten" }, "boost-date-time", "boost-exception", diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index eb4f9b84f83f81..2ca652abf4a2e9 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,10 +1,11 @@ { "name": "boost-coroutine", "version": "1.80.0", + "port-version": 1, "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "license": "BSL-1.0", - "supports": "!arm & !uwp & !emscripten", + "supports": "!(arm & windows) & !uwp & !emscripten", "dependencies": [ "boost-assert", { diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index 99728cceaa459c..1c7fc5e3565b7a 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost", "version": "1.80.0", + "port-version": 1, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "license": "BSL-1.0", @@ -39,7 +40,7 @@ "boost-core", { "name": "boost-coroutine", - "platform": "!arm & !uwp & !emscripten" + "platform": "!(arm & windows) & !uwp & !emscripten" }, { "name": "boost-coroutine2", @@ -55,7 +56,7 @@ "boost-exception", { "name": "boost-fiber", - "platform": "!osx & !uwp & !arm & !emscripten" + "platform": "!uwp & !arm & !emscripten" }, { "name": "boost-filesystem", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 0c6fae9ec6404c..6e587c2d0cd82e 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -25,6 +25,11 @@ else { $portVersions = @{ #e.g. "boost-asio" = 1; "boost-fiber" = 1; + "boost-coroutine" = 1; + "boost" = 1; + "boost-asio" = 1; + "boost-build" = 1; + "boost-modular-build-helper" = 1; } $portData = @{ @@ -78,7 +83,7 @@ $portData = @{ }; "boost-context" = @{ "supports" = "!uwp & !emscripten" }; "boost-stacktrace" = @{ "supports" = "!uwp" }; - "boost-coroutine" = @{ "supports" = "!arm & !uwp & !emscripten" }; + "boost-coroutine" = @{ "supports" = "!(arm & windows) & !uwp & !emscripten" }; "boost-coroutine2" = @{ "supports" = "!emscripten" }; "boost-test" = @{ "supports" = "!uwp" }; "boost-wave" = @{ "supports" = "!uwp" }; diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 0b6f3181187b22..8b4a933daeb2c9 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ee085e21ed4445f2cb442f39fd91c77f79a80e4", + "version": "1.80.0", + "port-version": 1 + }, { "git-tree": "2879fa47cd2ac0abbd8ad8c1b38fa28605c45bee", "version": "1.80.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index c6107fdddb9d4a..dfb1459df0df0f 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58decd230ff2227603af8e6e95dfcf45fab3b032", + "version": "1.80.0", + "port-version": 1 + }, { "git-tree": "c5c4a955fcf3465c0e9589a57d9c9f2df02eb3a2", "version": "1.80.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 86076e72ba6e74..5a31edaeb32de6 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd28384ddceb935eecbc6e787b67e2a9b506aab3", + "version": "1.80.0", + "port-version": 1 + }, { "git-tree": "f4e929db67c1d0b4c043ec1f1f1d1f1157029d99", "version": "1.80.0", diff --git a/versions/baseline.json b/versions/baseline.json index 72b61df184b345..a1967ae42a9e16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -558,7 +558,7 @@ }, "boost": { "baseline": "1.80.0", - "port-version": 0 + "port-version": 1 }, "boost-accumulators": { "baseline": "1.80.0", @@ -582,7 +582,7 @@ }, "boost-asio": { "baseline": "1.80.0", - "port-version": 0 + "port-version": 1 }, "boost-assert": { "baseline": "1.80.0", @@ -670,7 +670,7 @@ }, "boost-coroutine": { "baseline": "1.80.0", - "port-version": 0 + "port-version": 1 }, "boost-coroutine2": { "baseline": "1.80.0", From b533da1ea3da8f5759cb2e0d447d3786aedda41f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:06:50 +0200 Subject: [PATCH 717/791] [clblas] fix arm build (#27092) --- ports/clblas/abs-arm.patch | 24 ++++++++++++++++++++++++ ports/clblas/portfile.cmake | 1 + ports/clblas/vcpkg.json | 4 +++- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/c-/clblas.json | 5 +++++ 6 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 ports/clblas/abs-arm.patch diff --git a/ports/clblas/abs-arm.patch b/ports/clblas/abs-arm.patch new file mode 100644 index 00000000000000..8bc6f3816c8598 --- /dev/null +++ b/ports/clblas/abs-arm.patch @@ -0,0 +1,24 @@ +diff --git a/src/library/blas/gens/gemv.c b/src/library/blas/gens/gemv.c +index 9835482..8bf3476 100644 +--- a/src/library/blas/gens/gemv.c ++++ b/src/library/blas/gens/gemv.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include // for abs(int) + #include + #include + #include +diff --git a/src/library/blas/gens/symv.c b/src/library/blas/gens/symv.c +index 47c8f1d..31ab3c5 100644 +--- a/src/library/blas/gens/symv.c ++++ b/src/library/blas/gens/symv.c +@@ -21,6 +21,7 @@ + + #include + #include ++#include // for abs(int) + #include + #include + #include diff --git a/ports/clblas/portfile.cmake b/ports/clblas/portfile.cmake index b173c90bdba203..0e694036fcc0d5 100644 --- a/ports/clblas/portfile.cmake +++ b/ports/clblas/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES cmake.patch Fix-BuildDLL.patch + abs-arm.patch ) # v2.12 has a very old FindOpenCL.cmake using OPENCL_ vs. OpenCL_ var names diff --git a/ports/clblas/vcpkg.json b/ports/clblas/vcpkg.json index ee4c8bf7616416..79d9f12dc68124 100644 --- a/ports/clblas/vcpkg.json +++ b/ports/clblas/vcpkg.json @@ -1,8 +1,10 @@ { "name": "clblas", "version": "2.12", - "port-version": 6, + "port-version": 7, "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.", + "license": "Apache-2.0", + "supports": "!(windows & arm)", "dependencies": [ "opencl", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a66b75bcbc0366..3152851b211759 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -131,7 +131,6 @@ civetweb:arm64-windows = skip civetweb:arm-uwp = skip civetweb:x64-uwp = skip clamav:arm64-windows=fail -clblas:arm64-windows=fail clockutils:x64-linux=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip diff --git a/versions/baseline.json b/versions/baseline.json index a1967ae42a9e16..2432819741e285 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1442,7 +1442,7 @@ }, "clblas": { "baseline": "2.12", - "port-version": 6 + "port-version": 7 }, "clblast": { "baseline": "1.5.2", diff --git a/versions/c-/clblas.json b/versions/c-/clblas.json index 7b8c3594f75eb2..06a8377326ffe0 100644 --- a/versions/c-/clblas.json +++ b/versions/c-/clblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68caca1b774b1896768237791456b8962aa28d54", + "version": "2.12", + "port-version": 7 + }, { "git-tree": "a94b503ed4a4a74fa316ac65c363968092a0b026", "version": "2.12", From 63927d81be129e2c85b370bf588859286e7e071a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 5 Oct 2022 15:15:14 -0700 Subject: [PATCH 718/791] [nmap] Fix usage text; nmap is not curl. (#27110) --- ports/nmap/usage | 2 +- ports/nmap/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nmap.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/nmap/usage b/ports/nmap/usage index d910c7d2eca129..56722008cea82b 100644 --- a/ports/nmap/usage +++ b/ports/nmap/usage @@ -1,4 +1,4 @@ -The package curl is compatible with built-in CMake targets: +The package nmap is compatible with built-in CMake targets: find_package(NMAP REQUIRED) target_link_libraries(main PRIVATE ${NMAP_LIBRARIES}) diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json index 6aba23611c541d..ff165b5ddd3dca 100644 --- a/ports/nmap/vcpkg.json +++ b/ports/nmap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nmap", "version": "7.70", - "port-version": 5, + "port-version": 6, "description": "A library for scanning network ports.", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 2432819741e285..22c7c1c651e254 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5110,7 +5110,7 @@ }, "nmap": { "baseline": "7.70", - "port-version": 5 + "port-version": 6 }, "nmslib": { "baseline": "2.1.1", diff --git a/versions/n-/nmap.json b/versions/n-/nmap.json index 16b6862f6cbbab..b89b826282a337 100644 --- a/versions/n-/nmap.json +++ b/versions/n-/nmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d9e2e59a91c2ef33e59bb886accd8af1ac39b54", + "version": "7.70", + "port-version": 6 + }, { "git-tree": "b435c01d439c57ba46d2de58b81fd1da81555776", "version": "7.70", From f6db2412a0796cf38a967001d38e8755fabae2a7 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:16:55 +0200 Subject: [PATCH 719/791] [concurrencpp] Update to 0.1.5 (#26963) * Update concurrencpp to 0.1.5 * Update CI baseline * Update ci.baseline.txt Co-authored-by: chausner --- ports/concurrencpp/portfile.cmake | 6 +++--- ports/concurrencpp/vcpkg.json | 3 +-- scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 ++-- versions/c-/concurrencpp.json | 5 +++++ 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/concurrencpp/portfile.cmake b/ports/concurrencpp/portfile.cmake index c6097bdf7d2968..ef456748f2a9ed 100644 --- a/ports/concurrencpp/portfile.cmake +++ b/ports/concurrencpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO David-Haim/concurrencpp - REF v.0.1.4 - SHA512 494680b8a642d9c2ad1e31a6b52ecac672af7b8ba2213fc6b0d525968bd27122c9b3c7105286af22fd6ebfa3cee4bb3b2c8948062418ad8419a305f7c3df0d4b + REF v.0.1.5 + SHA512 94f2c4896e3455284874ea1dc7b4a836a5dd634b15b8582e90eaa7b4200e992f7744f025fac2cdb15471da104b40da97072b05bbe6eebecd0146622b747120ca HEAD_REF master PATCHES fix-include-path.patch @@ -18,6 +18,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.4) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.5) file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/concurrencpp/vcpkg.json b/ports/concurrencpp/vcpkg.json index 741c9b56b3572d..3d27706abb871b 100644 --- a/ports/concurrencpp/vcpkg.json +++ b/ports/concurrencpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "concurrencpp", - "version": "0.1.4", - "port-version": 1, + "version": "0.1.5", "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", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3152851b211759..3b146cd42c936c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -152,6 +152,7 @@ colmap:x64-windows-static=fail colmap:x64-windows-static-md=fail concurrencpp:x64-linux=fail +concurrencpp:x64-osx=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail coolprop:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 22c7c1c651e254..450711d5c0fcd6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1561,8 +1561,8 @@ "port-version": 0 }, "concurrencpp": { - "baseline": "0.1.4", - "port-version": 1 + "baseline": "0.1.5", + "port-version": 0 }, "concurrentqueue": { "baseline": "1.0.3", diff --git a/versions/c-/concurrencpp.json b/versions/c-/concurrencpp.json index a940f9f9e38d75..c118498979e159 100644 --- a/versions/c-/concurrencpp.json +++ b/versions/c-/concurrencpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b83d01e0edaa7fa36ca4e67542201b5fc7354b58", + "version": "0.1.5", + "port-version": 0 + }, { "git-tree": "ecae9e070ec807384d676e49c413118174487f6a", "version": "0.1.4", From 73351a37f90994efc1037b9d63d151e45e3470af Mon Sep 17 00:00:00 2001 From: An Tao Date: Thu, 6 Oct 2022 06:32:52 +0800 Subject: [PATCH 720/791] [trantor] Update to 1.5.7 [drogon] Update to 1.8.1 (#26994) * [trantor] Update to 1.5.7 * [drogon] Update to 1.8.1 * Remove redis.patch --- ports/drogon/portfile.cmake | 5 ++- ports/drogon/redis.patch | 66 ------------------------------------ ports/drogon/vcpkg.json | 2 +- ports/trantor/portfile.cmake | 4 +-- ports/trantor/vcpkg.json | 2 +- versions/baseline.json | 4 +-- versions/d-/drogon.json | 5 +++ versions/t-/trantor.json | 5 +++ 8 files changed, 18 insertions(+), 75 deletions(-) delete mode 100644 ports/drogon/redis.patch diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index ad7b310a352daf..61593b9b66785f 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.8.0 - SHA512 a834d937e3719059223d9bf19d777dbc92eaf09c5c9c44b5a742bfefcbcd95a146a6568cef8c058050fb87e330f221434ffe784dfa29a49de12b031f86ab1a33 + REF v1.8.1 + SHA512 ee7303350fd2b6d7a6ad283d0edcc5a7e6ef289652e3393699d9c4101308681f0124ebff6225de1665e86d2e2cf4c3192a17e70a204268e40d935acd097324a3 HEAD_REF master PATCHES vcpkg.patch drogon_config.patch - redis.patch ) vcpkg_check_features( diff --git a/ports/drogon/redis.patch b/ports/drogon/redis.patch deleted file mode 100644 index 1c54e1166fc745..00000000000000 --- a/ports/drogon/redis.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/nosql_lib/redis/src/RedisClientImpl.cc b/nosql_lib/redis/src/RedisClientImpl.cc -index 15fa74b..b2f9ac1 100644 ---- a/nosql_lib/redis/src/RedisClientImpl.cc -+++ b/nosql_lib/redis/src/RedisClientImpl.cc -@@ -12,6 +12,7 @@ - * - */ - -+#include "RedisConnection.h" - #include "RedisClientImpl.h" - #include "RedisTransactionImpl.h" - #include "../../lib/src/TaskTimeoutFlag.h" -diff --git a/nosql_lib/redis/src/RedisClientImpl.h b/nosql_lib/redis/src/RedisClientImpl.h -index d84cfab..e7c8fab 100644 ---- a/nosql_lib/redis/src/RedisClientImpl.h -+++ b/nosql_lib/redis/src/RedisClientImpl.h -@@ -13,7 +13,6 @@ - */ - #pragma once - --#include "RedisConnection.h" - #include - #include - #include -@@ -26,6 +25,8 @@ namespace drogon - { - namespace nosql - { -+class RedisConnection; -+using RedisConnectionPtr = std::shared_ptr; - class RedisClientImpl final - : public RedisClient, - public trantor::NonCopyable, -diff --git a/nosql_lib/redis/src/RedisClientLockFree.cc b/nosql_lib/redis/src/RedisClientLockFree.cc -index 2f27b64..fe225b2 100644 ---- a/nosql_lib/redis/src/RedisClientLockFree.cc -+++ b/nosql_lib/redis/src/RedisClientLockFree.cc -@@ -12,6 +12,7 @@ - * - */ - -+#include "RedisConnection.h" - #include "RedisClientLockFree.h" - #include "RedisTransactionImpl.h" - #include "../../lib/src/TaskTimeoutFlag.h" -diff --git a/nosql_lib/redis/src/RedisClientLockFree.h b/nosql_lib/redis/src/RedisClientLockFree.h -index 00bc6c1..136f315 100644 ---- a/nosql_lib/redis/src/RedisClientLockFree.h -+++ b/nosql_lib/redis/src/RedisClientLockFree.h -@@ -13,7 +13,6 @@ - */ - #pragma once - --#include "RedisConnection.h" - #include - #include - #include -@@ -26,6 +25,8 @@ namespace drogon - { - namespace nosql - { -+class RedisConnection; -+using RedisConnectionPtr = std::shared_ptr; - class RedisClientLockFree final - : public RedisClient, - public trantor::NonCopyable, diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index a5fd7284ea07da..996c59ef1e6e3c 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "drogon", - "version-semver": "1.8.0", + "version-semver": "1.8.1", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index d7cec3fb19626e..e51320cde81e90 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.5.6 - SHA512 9c9827b1640fa23f2941c6c10ffe692d4207595de1cb149f94140c0f20d4fe6c45e3efcc50d464bd40aff80443dfe3bdd8db263302755ab8f639a920e497c0b3 + REF v1.5.7 + SHA512 52fe66a5eb4a682abffe90b69b5ebf4f5791d07e020bf8bbe88317b3fddbc9f3c04b6a2664aa3ca1851c5c9681433f99e3851458bb9a99be89452382ca33e837 HEAD_REF master PATCHES ) diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json index 67440de43425e9..65a12b0e376c8e 100644 --- a/ports/trantor/vcpkg.json +++ b/ports/trantor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "trantor", - "version-semver": "1.5.6", + "version-semver": "1.5.7", "description": "A non-blocking I/O cross-platform TCP network library, using C++14", "homepage": "https://github.com/an-tao/trantor", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 450711d5c0fcd6..4f83cc2016e0ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2017,7 +2017,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.8.0", + "baseline": "1.8.1", "port-version": 0 }, "dstorage": { @@ -7421,7 +7421,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.6", + "baseline": "1.5.7", "port-version": 0 }, "tre": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index fd90e6ffcac2a5..87b2cba0717f4b 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c87a9d24699da1d37f15e8c339df0be6e45cf65", + "version-semver": "1.8.1", + "port-version": 0 + }, { "git-tree": "27ee8227ae9871ffc307380b209f9dbe04de8801", "version-semver": "1.8.0", diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index 56cc41162164b0..3149ab8c398082 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68e68faf890f237795416745f315e3c4bbd3fb72", + "version-semver": "1.5.7", + "port-version": 0 + }, { "git-tree": "6f72c33fe2ab8b7d6b89cf48402c3cb550233abe", "version-semver": "1.5.6", From 955a842e86905919342e46acd5323ec34afdda88 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Wed, 5 Oct 2022 17:36:14 -0500 Subject: [PATCH 721/791] [libevent] Fix android build. (#27083) I'm not sure why find_package(Threads) isn't working, I was pretty sure it used to, but this fixes the Android build. --- ports/libevent/fix-android-threads.patch | 30 ++++++++++++++++++++++++ ports/libevent/portfile.cmake | 1 + ports/libevent/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libevent.json | 5 ++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 ports/libevent/fix-android-threads.patch diff --git a/ports/libevent/fix-android-threads.patch b/ports/libevent/fix-android-threads.patch new file mode 100644 index 00000000000000..52a46dd55dcb41 --- /dev/null +++ b/ports/libevent/fix-android-threads.patch @@ -0,0 +1,30 @@ +From 5698ab6de0720f4da078423aa1676ad6a1c6d7ff Mon Sep 17 00:00:00 2001 +From: Ryan Pavlik +Date: Mon, 3 Oct 2022 09:31:10 -0500 +Subject: [PATCH] cmake: Fix Android build. + +Android/Bionic C library needs no special flags to have threading support. +Found when trying to build with vcpkg. +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20bdc92e..4efe834e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -556,6 +556,11 @@ endif() + if (NOT EVENT__DISABLE_THREAD_SUPPORT) + if (WIN32) + list(APPEND SRC_CORE evthread_win32.c) ++ elseif(ANDROID) ++ # pthreads is built in to bionic ++ set(EVENT__HAVE_PTHREADS 1) ++ CHECK_TYPE_SIZE(pthread_t EVENT__SIZEOF_PTHREAD_T) ++ list(APPEND SYMBOLS_TO_CHECK pthread_mutexattr_setprotocol) + else() + find_package(Threads REQUIRED) + if (NOT CMAKE_USE_PTHREADS_INIT) +-- +2.34.1 + diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index df80d0a0939e77..15d1171442d206 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( fix-file_path.patch fix-LibeventConfig_cmake_in_path.patch fix-usage.patch + fix-android-threads.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libevent/vcpkg.json b/ports/libevent/vcpkg.json index 41bcecaf14cfa2..4f4b8624807318 100644 --- a/ports/libevent/vcpkg.json +++ b/ports/libevent/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libevent", "version": "2.1.12", - "port-version": 6, + "port-version": 7, "description": "An event notification library", "homepage": "https://github.com/libevent/libevent", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 4f83cc2016e0ed..e581eaec11e924 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3666,7 +3666,7 @@ }, "libevent": { "baseline": "2.1.12", - "port-version": 6 + "port-version": 7 }, "libevhtp": { "baseline": "1.2.18", diff --git a/versions/l-/libevent.json b/versions/l-/libevent.json index 91ff598864fdb5..1176168ab2ba2c 100644 --- a/versions/l-/libevent.json +++ b/versions/l-/libevent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49a66da074def8806e42235e6c64af567987498f", + "version": "2.1.12", + "port-version": 7 + }, { "git-tree": "c1fbaddea4a9b98b61cba0d785441115c161d24f", "version": "2.1.12", From 1ce72c533c11fa8ed52feb60ebcbfb189c95483f Mon Sep 17 00:00:00 2001 From: sidy3d Date: Wed, 5 Oct 2022 18:37:32 -0400 Subject: [PATCH 722/791] [pngpp] Fix strerror_r not found error on windows (#27079) * Fix strerror_r not found error on windows * Ran x-add-version command * Update version database --- ports/pngpp/fix-stderror-win.patch | 13 +++++++++++++ ports/pngpp/portfile.cmake | 2 ++ ports/pngpp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/p-/pngpp.json | 5 +++++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 ports/pngpp/fix-stderror-win.patch diff --git a/ports/pngpp/fix-stderror-win.patch b/ports/pngpp/fix-stderror-win.patch new file mode 100644 index 00000000000000..4591e8f40879b5 --- /dev/null +++ b/ports/pngpp/fix-stderror-win.patch @@ -0,0 +1,13 @@ +diff --git a/error.hpp b/error.hpp +index 31e1801..d4b4655 100644 +--- a/error.hpp ++++ b/error.hpp +@@ -32,7 +32,7 @@ + #define PNGPP_ERROR_HPP_INCLUDED + + /* check if we have strerror_s or strerror_r, prefer the former which is C11 std */ +-#ifdef __STDC_LIB_EXT1__ ++#if defined(__STDC_LIB_EXT1__) || defined(_WIN32) + #define __STDC_WANT_LIB_EXT1__ 1 + #include + diff --git a/ports/pngpp/portfile.cmake b/ports/pngpp/portfile.cmake index 1fa23e4445ab07..f839743076237f 100644 --- a/ports/pngpp/portfile.cmake +++ b/ports/pngpp/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + fix-stderror-win.patch ) file(GLOB HEADER_FILES ${SOURCE_PATH}/*.hpp) diff --git a/ports/pngpp/vcpkg.json b/ports/pngpp/vcpkg.json index 67312ef2f9f1dd..bff3b699402b7d 100644 --- a/ports/pngpp/vcpkg.json +++ b/ports/pngpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pngpp", - "version-string": "0.2.10", + "version": "0.2.10", + "port-version": 1, "description": "A C++ wrapper for libpng library.", "dependencies": [ "libpng" diff --git a/versions/baseline.json b/versions/baseline.json index e581eaec11e924..80928bf127ec2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5742,7 +5742,7 @@ }, "pngpp": { "baseline": "0.2.10", - "port-version": 0 + "port-version": 1 }, "pngwriter": { "baseline": "0.7.0", diff --git a/versions/p-/pngpp.json b/versions/p-/pngpp.json index e10941e2f054cc..0e58928989e546 100644 --- a/versions/p-/pngpp.json +++ b/versions/p-/pngpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "088d8489ba3b0778d1612d59682ea0b6b3c2eb88", + "version": "0.2.10", + "port-version": 1 + }, { "git-tree": "4c162ef0d91f9415a77e44bd02f9bd3abf3684e1", "version-string": "0.2.10", From e7fc86a26192ad36437030c4573487960221a6ff Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:37:57 +0200 Subject: [PATCH 723/791] [tgui] update port (#27063) --- ports/tgui/portfile.cmake | 6 +++--- ports/tgui/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/tgui.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/tgui/portfile.cmake b/ports/tgui/portfile.cmake index 4ec9efbaaeb220..7eb1900174d332 100644 --- a/ports/tgui/portfile.cmake +++ b/ports/tgui/portfile.cmake @@ -11,9 +11,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO texus/TGUI - REF 6515153c2466e6677ba933679b3dca6c283daf87 - SHA512 109e64c114336979a4bd0d44765e4bc26cb4ecb6e4db92d7441230d148438b084d01cb56dd292f09a6fd28b0f7420044455ffb519147cc3aea71e322142cd9a0 - HEAD_REF 0.9 + REF v0.9.5 + SHA512 68c02679598448440ffaad69ee606a8413c2bcb508c91a59c2997ac866681617dadf6b9688f6c5eb07e5e38b5094a39bd79f0753a82236ec5f48498797c11134 + HEAD_REF 0.10 PATCHES fix-dependencies.patch devendor-stb.patch diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index b7bba45c80c22d..b7a07a0ebf1369 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tgui", - "version-date": "2021-04-19", - "port-version": 4, + "version": "0.9.5", "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 80928bf127ec2e..89b55f8e0c12bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7237,8 +7237,8 @@ "port-version": 2 }, "tgui": { - "baseline": "2021-04-19", - "port-version": 4 + "baseline": "0.9.5", + "port-version": 0 }, "theia": { "baseline": "0.8", diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json index 846a6dd1156300..23bbcafc4c6fae 100644 --- a/versions/t-/tgui.json +++ b/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99b11d7e5b91a6f1919402576952f951383e2c34", + "version": "0.9.5", + "port-version": 0 + }, { "git-tree": "71f51f9739edd1af085fd0b0c401b5e2bc297a84", "version-date": "2021-04-19", From 6a8c0e37a9e6f2c1730588d7ba7352c09edd369f Mon Sep 17 00:00:00 2001 From: Osyotr Date: Thu, 6 Oct 2022 02:03:23 +0300 Subject: [PATCH 724/791] [expat] Update to 2.4.9 (#27059) --- ports/expat/pkgconfig_fix.patch | 22 ++++++++++++++++++++++ ports/expat/portfile.cmake | 11 +++++++---- ports/expat/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/e-/expat.json | 5 +++++ 5 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 ports/expat/pkgconfig_fix.patch diff --git a/ports/expat/pkgconfig_fix.patch b/ports/expat/pkgconfig_fix.patch new file mode 100644 index 00000000000000..40fe9d3c86511f --- /dev/null +++ b/ports/expat/pkgconfig_fix.patch @@ -0,0 +1,22 @@ +--- a/expat/CMakeLists.txt ++++ b/expat/CMakeLists.txt +@@ -469,7 +469,7 @@ if(WIN32 AND NOT MINGW) + # Everything but MSVC is already adding prefix "lib", automatically. + # NOTE: "set_property(TARGET expat PROPERTY PREFIX lib)" would only affect *.dll + # files but not *.lib files, so we have to rely on property OUTPUT_NAME, instead. +- # Property CMAKE_*_POSTFIX still applies. ++ # Property EXPAT_*_POSTFIX still applies. + set(_EXPAT_OUTPUT_NAME libexpat) + set_property(TARGET expat PROPERTY OUTPUT_NAME ${_EXPAT_OUTPUT_NAME}) + else() +@@ -520,8 +520,8 @@ if(EXPAT_BUILD_PKGCONFIG) + foreach(_build_type ${CMAKE_BUILD_TYPE} Debug Release RelWithDebInfo MinSizeRel) + string(TOLOWER "${_build_type}" _build_type_lower) + string(TOUPPER "${_build_type}" _build_type_upper) +- set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_name" "expat${CMAKE_${_build_type_upper}_POSTFIX}") +- set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_output_name" "${_EXPAT_OUTPUT_NAME}${CMAKE_${_build_type_upper}_POSTFIX}") ++ set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_name" "expat${EXPAT_${_build_type_upper}_POSTFIX}") ++ set_property(TARGET expat PROPERTY "pkgconfig_${_build_type_lower}_output_name" "${_EXPAT_OUTPUT_NAME}${EXPAT_${_build_type_upper}_POSTFIX}") + if(_EXPAT_LIBM_FOUND) + set_property(TARGET expat PROPERTY "pkgconfig_libm" "-lm") + else() diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index 64cedf590d6684..f709ddcf8c4308 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -1,11 +1,14 @@ -set(EX_VERSION 2.4.8) +file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json) +string(JSON VERSION GET "${vcpkg_json}" "version") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libexpat/libexpat - REF 3bab6c09bbe8bf42d84b81563ddbcf4cca4be838 #v2.4.8 - SHA512 6bddf6514183b3bfa6bf869e63cf838cfe2912941ef04543bce00bee84a305f494368fb7cbd80404d06877a1d8da82de5ac2b44074b25e34aeaee7949d37e451 + REF R_2_4_9 + SHA512 6bf92516ce2642b2cdcbc586aaac0f706f125394fa428670f9b8b042a1f393e3b9dda1a24e58e6c8ad8b4ff3303cb5a8700628c6c04a881a06251c08be3759d3 HEAD_REF master + PATCHES + "pkgconfig_fix.patch" # https://github.com/libexpat/libexpat/pull/656 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE) @@ -23,7 +26,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/expat-${EX_VERSION}") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/expat-${VERSION}") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json index c56815d504418e..c581bbfe3067d3 100644 --- a/ports/expat/vcpkg.json +++ b/ports/expat/vcpkg.json @@ -1,7 +1,6 @@ { "name": "expat", - "version": "2.4.8", - "port-version": 1, + "version": "2.4.9", "description": "XML parser library written in C", "homepage": "https://github.com/libexpat/libexpat", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 89b55f8e0c12bf..afb50290a0db03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2185,8 +2185,8 @@ "port-version": 1 }, "expat": { - "baseline": "2.4.8", - "port-version": 1 + "baseline": "2.4.9", + "port-version": 0 }, "expected-lite": { "baseline": "0.6.2", diff --git a/versions/e-/expat.json b/versions/e-/expat.json index 812a56a83248af..225126e24e838b 100644 --- a/versions/e-/expat.json +++ b/versions/e-/expat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9bfabcd9e9f47060a34457ad5e28da5e100c027", + "version": "2.4.9", + "port-version": 0 + }, { "git-tree": "18754c99766e364a887a08bbf85c7fae06185f36", "version": "2.4.8", From 36ef0e1f29d3f65f14ec6f51f18b1963a09fed47 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Thu, 6 Oct 2022 08:06:31 +0900 Subject: [PATCH 725/791] [spine-runtimes] create a new port (#27006) * [spine-runtimes] create a new port * [spine-runtimes] update baseline * [spine-runtimes] remove -Werror * [spine-runtimes] remove customized compile flags * [spine-runtime] license null * Update ports/spine-runtimes/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/spine-runtimes/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * [spine-runtimes] version name 4.1.00 --> 4.1.0 * [spine-runtimes] remove SFML feature Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> --- ports/spine-runtimes/fix-cmake.patch | 107 +++++++++++++++++++++++++++ ports/spine-runtimes/portfile.cmake | 25 +++++++ ports/spine-runtimes/vcpkg.json | 13 ++++ versions/baseline.json | 4 + versions/s-/spine-runtimes.json | 9 +++ 5 files changed, 158 insertions(+) create mode 100644 ports/spine-runtimes/fix-cmake.patch create mode 100644 ports/spine-runtimes/portfile.cmake create mode 100644 ports/spine-runtimes/vcpkg.json create mode 100644 versions/s-/spine-runtimes.json diff --git a/ports/spine-runtimes/fix-cmake.patch b/ports/spine-runtimes/fix-cmake.patch new file mode 100644 index 00000000000000..1edd4eded2ee1d --- /dev/null +++ b/ports/spine-runtimes/fix-cmake.patch @@ -0,0 +1,107 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f77ff7f..1aeb5fc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 3.17) + project(spine) + +-set(CMAKE_INSTALL_PREFIX "./") ++include(GNUInstallDirs) + set(CMAKE_VERBOSE_MAKEFILE ON) + set(SPINE_SFML FALSE CACHE BOOL FALSE) + set(SPINE_SANITIZE FALSE CACHE BOOL FALSE) +@@ -20,12 +20,12 @@ else() + endif() + endif() + +-if((${SPINE_SFML}) OR (${CMAKE_CURRENT_BINARY_DIR} MATCHES "spine-sfml")) +- add_subdirectory(spine-c) ++add_subdirectory(spine-c) ++add_subdirectory(spine-cpp) ++if(SPINE_SFML) + add_subdirectory(spine-sfml/c) +- add_subdirectory(spine-cpp) + add_subdirectory(spine-sfml/cpp) + endif() + + # add_subdirectory(spine-c/spine-c-unit-tests) +-add_subdirectory(spine-cpp/spine-cpp-unit-tests) ++# add_subdirectory(spine-cpp/spine-cpp-unit-tests) +diff --git a/spine-c/CMakeLists.txt b/spine-c/CMakeLists.txt +index 906f7b0..c5e1f18 100644 +--- a/spine-c/CMakeLists.txt ++++ b/spine-c/CMakeLists.txt +@@ -3,6 +3,6 @@ file(GLOB INCLUDES "spine-c/include/**/*.h") + file(GLOB SOURCES "spine-c/src/**/*.c" "spine-c/src/**/*.cpp") + + add_library(spine-c STATIC ${SOURCES} ${INCLUDES}) +-target_include_directories(spine-c PUBLIC spine-c/include) +-install(TARGETS spine-c DESTINATION dist/lib) +-install(FILES ${INCLUDES} DESTINATION dist/include) +\ No newline at end of file ++target_include_directories(spine-c PUBLIC $) ++install(TARGETS spine-c DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spine) +\ No newline at end of file +diff --git a/spine-cpp/CMakeLists.txt b/spine-cpp/CMakeLists.txt +index e008c33..805aba8 100644 +--- a/spine-cpp/CMakeLists.txt ++++ b/spine-cpp/CMakeLists.txt +@@ -12,6 +12,6 @@ file(GLOB INCLUDES "spine-cpp/include/**/*.h") + file(GLOB SOURCES "spine-cpp/src/**/*.cpp") + + add_library(spine-cpp STATIC ${SOURCES} ${INCLUDES}) +-target_include_directories(spine-cpp PUBLIC spine-cpp/include) +-install(TARGETS spine-cpp DESTINATION dist/lib) +-install(FILES ${INCLUDES} DESTINATION dist/include) +\ No newline at end of file ++target_include_directories(spine-cpp PUBLIC $) ++install(TARGETS spine-cpp DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spine) +\ No newline at end of file +diff --git a/spine-sfml/c/CMakeLists.txt b/spine-sfml/c/CMakeLists.txt +index 68dcc75..2ccfb2d 100644 +--- a/spine-sfml/c/CMakeLists.txt ++++ b/spine-sfml/c/CMakeLists.txt +@@ -48,8 +48,9 @@ file(GLOB INCLUDES "src/**/*.h") + file(GLOB SOURCES "src/**/*.cpp") + add_library(spine-sfml STATIC ${SOURCES} ${INCLUDES}) + target_link_libraries(spine-sfml LINK_PUBLIC spine-c) +-install(TARGETS spine-sfml DESTINATION dist/lib) +-install(FILES ${INCLUDES} DESTINATION dist/include) ++install(TARGETS spine-sfml DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spine) ++return() + + # Define spine-sfml example executable + add_executable(spine-sfml-example example/main.cpp) +diff --git a/spine-sfml/cpp/CMakeLists.txt b/spine-sfml/cpp/CMakeLists.txt +index 903d0f7..bbcbb97 100644 +--- a/spine-sfml/cpp/CMakeLists.txt ++++ b/spine-sfml/cpp/CMakeLists.txt +@@ -57,8 +57,9 @@ file(GLOB INCLUDES "src/**/*.h") + file(GLOB SOURCES "src/**/*.cpp") + add_library(spine-sfml-cpp STATIC ${SOURCES} ${INCLUDES}) + target_link_libraries(spine-sfml-cpp LINK_PUBLIC spine-cpp) +-install(TARGETS spine-sfml-cpp DESTINATION dist/lib) +-install(FILES ${INCLUDES} DESTINATION dist/include) ++install(TARGETS spine-sfml-cpp DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES ${INCLUDES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/spine) ++return() + + # Define spine-sfml example executable + add_executable(spine-sfml-cpp-example example/main.cpp) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1aeb5fc..0a9ffb7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,8 +11,6 @@ if(MSVC) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") + set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") + else() +- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wunused-value -Wno-c++11-long-long -Wno-variadic-macros -Werror -Wextra -pedantic -Wnonportable-include-path -Wshadow -std=c89") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-value -Wno-c++11-long-long -Wno-variadic-macros -Werror -Wextra -Wnon-virtual-dtor -pedantic -Wnonportable-include-path -Wshadow -std=c++11 -fno-exceptions -fno-rtti") + + if (${SPINE_SANITIZE}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize=undefined") diff --git a/ports/spine-runtimes/portfile.cmake b/ports/spine-runtimes/portfile.cmake new file mode 100644 index 00000000000000..fc796c71d1bf95 --- /dev/null +++ b/ports/spine-runtimes/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) # the project doesn't support SHARED + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO EsotericSoftware/spine-runtimes + REF 4.1.00 + SHA512 40a352a1f5e9939802667f330c9de2f0b03bf63834d1c20514a6cecb35c1a9915fb13588ee92cbaba9effbd2205c25851cca58d2ec7f90ce9b974252bd168425 + HEAD_REF 4.1 + PATCHES + fix-cmake.patch +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_build(TARGET spine-c LOGFILE_BASE build-c) +vcpkg_cmake_build(TARGET spine-cpp LOGFILE_BASE build-cpp) +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spine-runtimes/vcpkg.json b/ports/spine-runtimes/vcpkg.json new file mode 100644 index 00000000000000..465f6a48a150a4 --- /dev/null +++ b/ports/spine-runtimes/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "spine-runtimes", + "version": "4.1.0", + "description": "2D skeletal animation runtimes for Spine", + "homepage": "https://github.com/EsotericSoftware/spine-runtimes", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index afb50290a0db03..0bcee29811bc15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6988,6 +6988,10 @@ "baseline": "1.2.1", "port-version": 0 }, + "spine-runtimes": { + "baseline": "4.1.0", + "port-version": 0 + }, "spirit-po": { "baseline": "1.1.2", "port-version": 2 diff --git a/versions/s-/spine-runtimes.json b/versions/s-/spine-runtimes.json new file mode 100644 index 00000000000000..b8417d70f95c09 --- /dev/null +++ b/versions/s-/spine-runtimes.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2f07c033a802713abd304b4a9680786cdf53ea74", + "version": "4.1.0", + "port-version": 0 + } + ] +} From fe5757109de431c2be980144867b26f96aaf422e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 5 Oct 2022 23:08:38 +0000 Subject: [PATCH 726/791] [nvtt] Clean up baseline, add supports field instead (#27048) * [vcpkg baseline][nvtt] Drop support with arm-windows * version * clean up baseline * version --- ports/nvtt/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/n-/nvtt.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/nvtt/vcpkg.json b/ports/nvtt/vcpkg.json index 0dddd028a222f3..77496f51a49f34 100644 --- a/ports/nvtt/vcpkg.json +++ b/ports/nvtt/vcpkg.json @@ -1,11 +1,11 @@ { "name": "nvtt", "version": "2.1.2", - "port-version": 5, + "port-version": 6, "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", "homepage": "https://github.com/castano/nvidia-texture-tools", "license": "MIT", - "supports": "!x86", + "supports": "!x86 & !(windows & (arm | uwp))", "dependencies": [ "libsquish", { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3b146cd42c936c..7ed698cdef3a13 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -711,9 +711,6 @@ numactl:x64-windows=fail numactl:x64-windows-static=fail numactl:x64-windows-static-md=fail numactl:x86-windows=fail -nvtt:arm64-windows=fail -nvtt:arm-uwp=fail -nvtt:x64-uwp=fail ocilib:arm-uwp=fail ocilib:arm64-windows=fail ocilib:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 0bcee29811bc15..1ce11b58087b96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5178,7 +5178,7 @@ }, "nvtt": { "baseline": "2.1.2", - "port-version": 5 + "port-version": 6 }, "oatpp": { "baseline": "1.3.0", diff --git a/versions/n-/nvtt.json b/versions/n-/nvtt.json index 876fe47d006a8f..aa701042d74827 100644 --- a/versions/n-/nvtt.json +++ b/versions/n-/nvtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9dab908526770ce18285ce3713359ca5bdaf0999", + "version": "2.1.2", + "port-version": 6 + }, { "git-tree": "b1a685fa7402dce13182820ddd1dce2c6126b69f", "version": "2.1.2", From b80c59a8297e7ce0432aa2f7ce20b03b4c5c48d6 Mon Sep 17 00:00:00 2001 From: blavallee Date: Thu, 6 Oct 2022 14:42:16 -0400 Subject: [PATCH 727/791] [Bitmagic] Update to 7.12.3 (#27120) * [Bitmagic] Update to 7.12.3 * Add versions --- ports/bitmagic/portfile.cmake | 4 ++-- ports/bitmagic/vcpkg.json | 2 +- versions/b-/bitmagic.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bitmagic/portfile.cmake b/ports/bitmagic/portfile.cmake index 90c0bd4460a5f6..240a52cf698d40 100644 --- a/ports/bitmagic/portfile.cmake +++ b/ports/bitmagic/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tlk00/BitMagic - REF v7.11.2 - SHA512 182456fc351a7df0cba0bb5b35d91bb8055891bf91a09fc5394149f3b0b1bd85b63ce88497d62ed68bb892481c15264cf44059d43023d1f2155ed43cafe3b933 + REF v7.12.3 + SHA512 03b9261d102b3c610a4b284f74092feb451b7a5fe80d60002dd2a42e2eeae4b763d212d2647eeb1fc9a61c93500f006ab2bcc46598207903682b70b1e4336b6a HEAD_REF master ) diff --git a/ports/bitmagic/vcpkg.json b/ports/bitmagic/vcpkg.json index 0a675acfb52030..93a900be1e3b84 100644 --- a/ports/bitmagic/vcpkg.json +++ b/ports/bitmagic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bitmagic", - "version": "7.11.2", + "version": "7.12.3", "description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.", "homepage": "http://bitmagic.io" } diff --git a/versions/b-/bitmagic.json b/versions/b-/bitmagic.json index 7b1030f1565706..b086c0a2d5616f 100644 --- a/versions/b-/bitmagic.json +++ b/versions/b-/bitmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8f4a3a305e2872a295f493450a96b093ad39ef7", + "version": "7.12.3", + "port-version": 0 + }, { "git-tree": "0b5257f630778f4e1acbee7661041a1a67c7f21d", "version": "7.11.2", diff --git a/versions/baseline.json b/versions/baseline.json index 1ce11b58087b96..8d193c03930cbb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -493,7 +493,7 @@ "port-version": 1 }, "bitmagic": { - "baseline": "7.11.2", + "baseline": "7.12.3", "port-version": 0 }, "bitserializer": { From e2667a41fc2fc578474e9521d7eb90b769569c83 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Fri, 7 Oct 2022 03:52:26 +0900 Subject: [PATCH 728/791] [easyexif] create a new port (#27118) * [easyexif] create a new port * [easyexif] update versions JSON * [easyexif] misc changes * [easyexif] fix mistype in install(TARGETS) --- ports/easyexif/CMakeLists.txt | 21 +++++++++++++++++++++ ports/easyexif/portfile.cmake | 20 ++++++++++++++++++++ ports/easyexif/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 4 ++++ versions/e-/easyexif.json | 9 +++++++++ 5 files changed, 67 insertions(+) create mode 100644 ports/easyexif/CMakeLists.txt create mode 100644 ports/easyexif/portfile.cmake create mode 100644 ports/easyexif/vcpkg.json create mode 100644 versions/e-/easyexif.json diff --git a/ports/easyexif/CMakeLists.txt b/ports/easyexif/CMakeLists.txt new file mode 100644 index 00000000000000..c2793430ea94a7 --- /dev/null +++ b/ports/easyexif/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.11) +project(easyexif CXX) +include(GNUInstallDirs) + +add_library(easyexif STATIC + exif.h + exif.cpp +) + +set_target_properties(easyexif +PROPERTIES + CXX_STANDARD 11 + PUBLIC_HEADER exif.h +) + +install(TARGETS easyexif + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) +install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) # share/easyexif diff --git a/ports/easyexif/portfile.cmake b/ports/easyexif/portfile.cmake new file mode 100644 index 00000000000000..d229ef87f8bc9d --- /dev/null +++ b/ports/easyexif/portfile.cmake @@ -0,0 +1,20 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mayanklahiri/easyexif + REF cd994a3b6009bc3c1f84062e96bd7f5ad16e85f6 + SHA512 f421ff0900ae456165917106caa1c222ed8005706edc62983ad1ea72baffdfc99c581a015cf00132c7255ac32e64ec24bd8d65c9b32e9f4d05809baf7f37516d + 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" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share" +) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/easyexif/vcpkg.json b/ports/easyexif/vcpkg.json new file mode 100644 index 00000000000000..e9bcfdf2a6be75 --- /dev/null +++ b/ports/easyexif/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "easyexif", + "version-date": "2022-10-07", + "description": "Tiny ISO-compliant C++ EXIF parsing library, third-party dependency free", + "homepage": "https://github.com/mayanklahiri/easyexif", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8d193c03930cbb..51a2caad19845f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2072,6 +2072,10 @@ "baseline": "0.3", "port-version": 1 }, + "easyexif": { + "baseline": "2022-10-07", + "port-version": 0 + }, "easyhook": { "baseline": "2.7.7097.0", "port-version": 5 diff --git a/versions/e-/easyexif.json b/versions/e-/easyexif.json new file mode 100644 index 00000000000000..f1d8acbe126f33 --- /dev/null +++ b/versions/e-/easyexif.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "56500b421a6b0129d43c562af4ebe0bccf8ca6de", + "version-date": "2022-10-07", + "port-version": 0 + } + ] +} From 1704a11b5e0bc072d1fcf35ff440149c6c76a080 Mon Sep 17 00:00:00 2001 From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Date: Sat, 8 Oct 2022 10:25:28 -0700 Subject: [PATCH 729/791] [baseline][bitserializer, tbb] Remove from ci.baseline.txt (#27144) * [baseline] Remove from ci.baseline.txt * revert libui --- scripts/ci.baseline.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7ed698cdef3a13..43a168388bf37a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -38,7 +38,6 @@ apr:arm64-windows=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail -bitserializer:x64-osx=fail bitserializer:arm64-osx=fail blitz:x64-uwp=fail blitz:arm64-windows=fail @@ -1079,9 +1078,6 @@ symengine:arm-uwp=fail systemc:arm64-windows=fail systemc:arm-uwp=fail systemc:x64-uwp=fail -tbb:arm64-windows=fail -tbb:arm-uwp=fail -tbb:x64-uwp=fail tcl:arm-uwp=fail tcl:arm64-windows=fail tcl:x64-uwp=fail From a5e5f4de45fb6056670e0fc10016f6ab3a016777 Mon Sep 17 00:00:00 2001 From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com> Date: Sun, 9 Oct 2022 12:09:22 +0800 Subject: [PATCH 730/791] [folly]: fix lib dependency (#25335) * [folly]: fix lib dependency * [folly]: fix dependency * use file op delete cmake files * fix cmake config package * fix folly-config, minmax * delete fix-cmake-module.patch * revert LZ4 snappy * fix lz4 * fix libevent targert * fix bzip2 * remove sodium * add version * fix windows build * fix deps * fix deps * fix deps * fix deps * fix deps * fix deps * fix Required find_dependenct * fix feature --- ports/folly/FindLZ4.cmake | 13 ---- ports/folly/FindSnappy.cmake | 13 ---- ports/folly/fix-deps.patch | 144 +++++++++++++++++++++++++++++++++++ ports/folly/portfile.cmake | 26 +++---- ports/folly/vcpkg.json | 7 ++ versions/baseline.json | 2 +- versions/f-/folly.json | 5 ++ 7 files changed, 169 insertions(+), 41 deletions(-) delete mode 100644 ports/folly/FindLZ4.cmake delete mode 100644 ports/folly/FindSnappy.cmake create mode 100644 ports/folly/fix-deps.patch diff --git a/ports/folly/FindLZ4.cmake b/ports/folly/FindLZ4.cmake deleted file mode 100644 index f80962c66e40ba..00000000000000 --- a/ports/folly/FindLZ4.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(LZ4_INCLUDE_DIR lz4.h) - -find_library(LZ4_LIBRARY_DEBUG NAMES lz4d) -find_library(LZ4_LIBRARY_RELEASE NAMES lz4) - -include(SelectLibraryConfigurations) -select_library_configurations(LZ4) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - LZ4 DEFAULT_MSG - LZ4_LIBRARY LZ4_INCLUDE_DIR -) diff --git a/ports/folly/FindSnappy.cmake b/ports/folly/FindSnappy.cmake deleted file mode 100644 index 253d0d84cf2571..00000000000000 --- a/ports/folly/FindSnappy.cmake +++ /dev/null @@ -1,13 +0,0 @@ -find_path(SNAPPY_INCLUDE_DIR snappy.h) - -find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd) -find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy) - -include(SelectLibraryConfigurations) -select_library_configurations(SNAPPY) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS( - SNAPPY DEFAULT_MSG - SNAPPY_LIBRARY SNAPPY_INCLUDE_DIR -) diff --git a/ports/folly/fix-deps.patch b/ports/folly/fix-deps.patch new file mode 100644 index 00000000000000..f08bb83c6b202f --- /dev/null +++ b/ports/folly/fix-deps.patch @@ -0,0 +1,144 @@ +diff --git a/CMake/folly-config.cmake.in b/CMake/folly-config.cmake.in +index 1689f9a..9adf390 100644 +--- a/CMake/folly-config.cmake.in ++++ b/CMake/folly-config.cmake.in +@@ -28,10 +28,18 @@ endif() + set(FOLLY_LIBRARIES Folly::folly) + + # Find folly's dependencies +-find_dependency(fmt) ++find_dependency(double-conversion CONFIG) ++find_dependency(glog CONFIG) ++find_dependency(gflags CONFIG) ++find_dependency(Libevent CONFIG) ++find_dependency(zstd CONFIG) ++find_dependency(ZLIB MODULE) ++find_dependency(OpenSSL MODULE) ++find_dependency(unofficial-sodium CONFIG) ++find_dependency(fmt CONFIG) + + set(Boost_USE_STATIC_LIBS "@FOLLY_BOOST_LINK_STATIC@") +-find_dependency(Boost 1.51.0 MODULE ++find_dependency(Boost + COMPONENTS + context + filesystem +diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake +index 4b78e9f..f581b9a 100644 +--- a/CMake/folly-deps.cmake ++++ b/CMake/folly-deps.cmake +@@ -35,7 +35,7 @@ else() + endif() + set(Boost_USE_STATIC_LIBS "${FOLLY_BOOST_LINK_STATIC}") + +-find_package(Boost 1.51.0 MODULE ++find_package(Boost + COMPONENTS + context + filesystem +@@ -45,30 +45,29 @@ find_package(Boost 1.51.0 MODULE + thread + REQUIRED + ) ++set (Boost_LIBRARIES Boost::context Boost::filesystem Boost::program_options Boost::regex Boost::system Boost::thread ++ ) + list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) + +-find_package(DoubleConversion MODULE REQUIRED) +-list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR}) ++find_package(double-conversion CONFIG REQUIRED) ++list(APPEND FOLLY_LINK_LIBRARIES double-conversion::double-conversion) + +-find_package(Glog CONFIG REQUIRED) +-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND}) ++find_package(glog CONFIG REQUIRED) ++set(FOLLY_HAVE_LIBGLOG 1) + list(APPEND FOLLY_LINK_LIBRARIES glog::glog) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR}) +- +-find_package(Gflags MODULE) +-set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND}) +-if(LIBGFLAGS_FOUND) +- list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY}) +- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR}) +- set(FOLLY_LIBGFLAGS_LIBRARY ${LIBGFLAGS_LIBRARY}) +- set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR}) ++ ++find_package(gflags CONFIG) ++if(TARGET gflags::gflags) ++ set(FOLLY_HAVE_LIBGFLAGS 1) ++ list(APPEND FOLLY_LINK_LIBRARIES gflags::gflags) ++ set(FOLLY_LIBGFLAGS_LIBRARY gflags::gflags) + endif() + +-find_package(LibEvent MODULE REQUIRED) +-list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) ++find_package(Libevent CONFIG REQUIRED) ++list(APPEND FOLLY_LINK_LIBRARIES libevent::core libevent::extra) ++if(NOT WIN32) ++ list(APPEND FOLLY_LINK_LIBRARIES libevent::pthreads) ++endif() + + find_package(ZLIB MODULE) + set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND}) +@@ -111,11 +110,13 @@ if (LZ4_FOUND) + list(APPEND FOLLY_LINK_LIBRARIES ${LZ4_LIBRARY}) + endif() + +-find_package(Zstd MODULE) +-set(FOLLY_HAVE_LIBZSTD ${ZSTD_FOUND}) +-if(ZSTD_FOUND) +- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR}) +- list(APPEND FOLLY_LINK_LIBRARIES ${ZSTD_LIBRARY}) ++find_package(zstd CONFIG) ++if(TARGET zstd::libzstd_shared ) ++ set(FOLLY_HAVE_LIBZSTD 1) ++ list(APPEND FOLLY_LINK_LIBRARIES zstd::libzstd_shared) ++elseif( TARGET zstd::libzstd_static ) ++ set(FOLLY_HAVE_LIBZSTD 1) ++ list(APPEND FOLLY_LINK_LIBRARIES zstd::libzstd_static) + endif() + + find_package(Snappy MODULE) +@@ -141,9 +142,10 @@ find_package(LibUring) + list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES}) + list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS}) + +-find_package(Libsodium) +-list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS}) ++find_package(unofficial-sodium CONFIG) ++if(TARGET unofficial-sodium::sodium) ++ list(APPEND FOLLY_LINK_LIBRARIES unofficial-sodium::sodium) ++endif() + + list(APPEND FOLLY_LINK_LIBRARIES ${CMAKE_DL_LIBS}) + list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS}) +@@ -154,9 +156,9 @@ if (PYTHON_EXTENSIONS) + endif () + + find_package(LibUnwind) +-list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES}) +-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS}) + if (LIBUNWIND_FOUND) ++ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES}) ++ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS}) + set(FOLLY_HAVE_LIBUNWIND ON) + endif() + if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +@@ -299,11 +301,7 @@ endif() + + add_library(folly_deps INTERFACE) + +-find_package(fmt CONFIG) +-if (NOT DEFINED fmt_CONFIG) +- # Fallback on a normal search on the current system +- find_package(Fmt MODULE REQUIRED) +-endif() ++find_package(fmt CONFIG REQUIRED) + target_link_libraries(folly_deps INTERFACE fmt::fmt) + + list(REMOVE_DUPLICATES FOLLY_INCLUDE_DIRECTORIES) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index db3bed6de2c4da..b991a447366486 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -16,14 +16,19 @@ vcpkg_from_github( disable-non-underscore-posix-names.patch boost-1.70.patch fix-windows-minmax.patch + fix-deps.patch ) -file(COPY - "${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/FindFmt.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/FindLibsodium.cmake") +file(REMOVE "${SOURCE_PATH}/CMake/FindZstd.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindDoubleConversion.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake") +file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake") if(VCPKG_CRT_LINKAGE STREQUAL static) set(MSVC_USE_STATIC_RUNTIME ON) @@ -47,6 +52,7 @@ feature(lzma LibLZMA) feature(lz4 LZ4) feature(zstd Zstd) feature(snappy Snappy) +feature(libsodium unofficial-sodium) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} @@ -77,14 +83,6 @@ STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/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" -"include(CMakeFindDependencyMacro) -find_dependency(Threads) -find_dependency(glog CONFIG) -find_dependency(gflags CONFIG REQUIRED) -find_dependency(ZLIB) -${_contents}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 5d9e7dda030888..1fdc06cfbfabaf 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,6 +1,7 @@ { "name": "folly", "version-string": "2022.08.15.00", + "port-version": 1, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "license": "Apache-2.0", @@ -43,6 +44,12 @@ "bzip2" ] }, + "libsodium": { + "description": "Support libsodium for cryto", + "dependencies": [ + "libsodium" + ] + }, "lz4": { "description": "Support lz4 for compression", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 51a2caad19845f..fb48a37c8952b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2374,7 +2374,7 @@ }, "folly": { "baseline": "2022.08.15.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.1.0", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 5226756b3e0033..62a39de726e386 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "968cb6f9f5300306d010ffabc297339c40ade808", + "version-string": "2022.08.15.00", + "port-version": 1 + }, { "git-tree": "f046523ca3488aa4e35d11656fcb15acb5b0f4f3", "version-string": "2022.08.15.00", From 26a09951e7e57cac4a54827f50c160a006dae750 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 9 Oct 2022 06:10:53 +0200 Subject: [PATCH 731/791] [libui] Revise platform support (#27141) * Fix port issues * Update versions * Fix mingw * Update versions --- ports/libui/portfile.cmake | 18 ++++++++++-------- ports/libui/vcpkg.json | 20 ++++++++++++++++++-- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/l-/libui.json | 5 +++++ 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake index d975cdfe81ab83..56eea00cffd6b7 100644 --- a/ports/libui/portfile.cmake +++ b/ports/libui/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_MINGW) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andlabs/libui @@ -10,18 +14,16 @@ vcpkg_from_github( "003-fix-system-link.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libui TARGET_PATH share/unofficial-libui) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libui PACKAGE_NAME unofficial-libui) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/libui/vcpkg.json b/ports/libui/vcpkg.json index 5d7ff38eb6924e..40140786a8651f 100644 --- a/ports/libui/vcpkg.json +++ b/ports/libui/vcpkg.json @@ -1,7 +1,23 @@ { "name": "libui", "version-date": "2018-11-03", - "port-version": 2, + "port-version": 3, "description": "Simple and portable (but not inflexible) native GUI library in C.", - "homepage": "https://github.com/andlabs/libui" + "homepage": "https://github.com/andlabs/libui", + "license": "MIT", + "supports": "!android & !emscripten & !ios & !uwp", + "dependencies": [ + { + "name": "gtk3", + "platform": "!windows & !osx" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 43a168388bf37a..89e799404b5eff 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -518,9 +518,6 @@ libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail libtomcrypt:arm-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 diff --git a/versions/baseline.json b/versions/baseline.json index fb48a37c8952b0..a67701a07f3291 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4274,7 +4274,7 @@ }, "libui": { "baseline": "2018-11-03", - "port-version": 2 + "port-version": 3 }, "libunibreak": { "baseline": "5.0", diff --git a/versions/l-/libui.json b/versions/l-/libui.json index 2c5c16298a5f3e..15e4599ca71a8e 100644 --- a/versions/l-/libui.json +++ b/versions/l-/libui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eac6098c733ccc84e2c69092ac8cfd6499af3be", + "version-date": "2018-11-03", + "port-version": 3 + }, { "git-tree": "941bfc035a8cfa6020be3475769732b027249a1d", "version-date": "2018-11-03", From 77fc723d479ed64d0c68518f43f36608db7d191e Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sun, 9 Oct 2022 07:13:50 +0300 Subject: [PATCH 732/791] [expat] Fix static builds with mingw (#27137) Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> --- ports/expat/mingw_static_fix.patch | 11 +++++++++++ ports/expat/portfile.cmake | 1 + ports/expat/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/expat.json | 5 +++++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ports/expat/mingw_static_fix.patch diff --git a/ports/expat/mingw_static_fix.patch b/ports/expat/mingw_static_fix.patch new file mode 100644 index 00000000000000..b02634e8629b9d --- /dev/null +++ b/ports/expat/mingw_static_fix.patch @@ -0,0 +1,11 @@ +--- a/expat/CMakeLists.txt ++++ b/expat/CMakeLists.txt +@@ -459,7 +459,7 @@ if(NOT WIN32) + endif() + endif() + +-if(MINGW) ++if(MINGW AND EXPAT_SHARED_LIBS) + set_target_properties(expat PROPERTIES SUFFIX "-${LIBCURRENT_MINUS_AGE}.dll") + endif() + diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index f709ddcf8c4308..29337af68b5499 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( HEAD_REF master PATCHES "pkgconfig_fix.patch" # https://github.com/libexpat/libexpat/pull/656 + "mingw_static_fix.patch" # https://github.com/libexpat/libexpat/pull/658 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE) diff --git a/ports/expat/vcpkg.json b/ports/expat/vcpkg.json index c581bbfe3067d3..28501d71258f3a 100644 --- a/ports/expat/vcpkg.json +++ b/ports/expat/vcpkg.json @@ -1,6 +1,7 @@ { "name": "expat", "version": "2.4.9", + "port-version": 1, "description": "XML parser library written in C", "homepage": "https://github.com/libexpat/libexpat", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index a67701a07f3291..f822d410f3bcfb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2190,7 +2190,7 @@ }, "expat": { "baseline": "2.4.9", - "port-version": 0 + "port-version": 1 }, "expected-lite": { "baseline": "0.6.2", diff --git a/versions/e-/expat.json b/versions/e-/expat.json index 225126e24e838b..fa9181118f12e3 100644 --- a/versions/e-/expat.json +++ b/versions/e-/expat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "755ce6df1ddbca1c1fcb0d2fe7cbd2b5bd074121", + "version": "2.4.9", + "port-version": 1 + }, { "git-tree": "e9bfabcd9e9f47060a34457ad5e28da5e100c027", "version": "2.4.9", From ac0807ed17d09f2c4ff7f02b40dc896918066607 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sun, 9 Oct 2022 06:15:02 +0200 Subject: [PATCH 733/791] [scripts] add policy VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK (#27128) --- scripts/build_info.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/build_info.cmake b/scripts/build_info.cmake index 112e074654f818..354c88a38a9944 100644 --- a/scripts/build_info.cmake +++ b/scripts/build_info.cmake @@ -38,6 +38,9 @@ endif() if (DEFINED VCPKG_POLICY_CMAKE_HELPER_PORT) file(APPEND ${BUILD_INFO_FILE_PATH} "PolicyCmakeHelperPort: ${VCPKG_POLICY_CMAKE_HELPER_PORT}\n") endif() +if (DEFINED VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK) + file(APPEND ${BUILD_INFO_FILE_PATH} "PolicySkipAbsolutePathsCheck: ${VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK}\n") +endif() if (DEFINED VCPKG_HEAD_VERSION) file(APPEND ${BUILD_INFO_FILE_PATH} "Version: ${VCPKG_HEAD_VERSION}\n") endif() From 144fbe956a72b93258b8958b6a8bebc6efaa58f0 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Sun, 9 Oct 2022 13:15:57 +0900 Subject: [PATCH 734/791] [pango] Update to 1.50.11 (#27127) * [pango] Update to 1.50.11 (microsoft#27126) * [pango] Regenerate versions registries (microsoft#27126) --- ports/pango/portfile.cmake | 4 ++-- ports/pango/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pango.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index 0132f369f8d580..d7d149b9d8e519 100644 --- a/ports/pango/portfile.cmake +++ b/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 a3517dcc6de9bae1193075b7112aa7db97b39dcc #v1.50.9 - SHA512 d09bc672e65897f5a3deae45f6e7f91844fb6d72c43944d3480a4b9e84b43fcb0e701b0b84d864b15d8520287f6d0d02b489a42775df6746ffe6673588f8f05c + REF eabdbd54ee38fa658be574c4fa4574a05c755f16 #v1.50.11 + SHA512 06077e3cda5f1f5cda1fa37958e981b462715ac119af42e48e78f33807d082c31e903c2e4e753624e5fbf9759f0a66ee1dda055286b11a9e3d8698d5d8dffcb7 HEAD_REF master # branch name ) diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 566a8a0bc8963c..48e553ca63a991 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pango", - "version": "1.50.9", + "version": "1.50.11", "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "license": "LGPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index f822d410f3bcfb..9c9ce24c3eb564 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5553,7 +5553,7 @@ "port-version": 0 }, "pango": { - "baseline": "1.50.9", + "baseline": "1.50.11", "port-version": 0 }, "pangolin": { diff --git a/versions/p-/pango.json b/versions/p-/pango.json index de2a65bc1c9584..e345c5ea80703b 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "603dfcd1767e9e61cff29bf3552cda854a225329", + "version": "1.50.11", + "port-version": 0 + }, { "git-tree": "f5c70fae168a14f944757f55afaeb847f1a0d026", "version": "1.50.9", From 7497b024d3c1bc72a4af0e03f1c833439b2701f6 Mon Sep 17 00:00:00 2001 From: Sean Farrell Date: Sun, 9 Oct 2022 06:16:21 +0200 Subject: [PATCH 735/791] [rioki-glow] Update glow 0.2.1 (#27123) * [rioki-glow] Update to 0.2.1 [rioki-glow] Update to 0.2.1 * [rioki-glow] Update baseline --- ports/rioki-glow/portfile.cmake | 4 ++-- ports/rioki-glow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rioki-glow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/rioki-glow/portfile.cmake b/ports/rioki-glow/portfile.cmake index c7332260d81798..766a26ac858403 100644 --- a/ports/rioki-glow/portfile.cmake +++ b/ports/rioki-glow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rioki/glow - REF v0.2.0 - SHA512 ff81b56ce8bbceb5119c5cf48764cc1978bb0d3c4cddccc85ef0d3f7c85188c1dab53e083e09509d6ca96e4ac30ba277fc6915ba9ae388422c35cc8cd08c3978 + REF v0.2.1 + SHA512 410d0bcc98f9587321dceab498ed84fe2cffbf1f38ba59592d5f7eded9eea67c17e40415966d14f548b7e91f23e17fc0162c216c34b905c641647f90274af5b1 ) vcpkg_cmake_configure( diff --git a/ports/rioki-glow/vcpkg.json b/ports/rioki-glow/vcpkg.json index d72dc4351d4874..8b300231b9f893 100644 --- a/ports/rioki-glow/vcpkg.json +++ b/ports/rioki-glow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rioki-glow", - "version-semver": "0.2.0", + "version-semver": "0.2.1", "description": "OpenGL Object Wrapper", "homepage": "https://github.com/rioki/glow", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 9c9ce24c3eb564..62e80d20550d0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6493,7 +6493,7 @@ "port-version": 0 }, "rioki-glow": { - "baseline": "0.2.0", + "baseline": "0.2.1", "port-version": 0 }, "rmlui": { diff --git a/versions/r-/rioki-glow.json b/versions/r-/rioki-glow.json index 1b46f5b295c43d..73625406e7881f 100644 --- a/versions/r-/rioki-glow.json +++ b/versions/r-/rioki-glow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "626e258c92e0d41283d63d2c264dfbe78239d2d5", + "version-semver": "0.2.1", + "port-version": 0 + }, { "git-tree": "c7d83181fde1e5535022c2dc3fccfaa38c37c3ab", "version-semver": "0.2.0", From d04bb15e3540f0c2c88d6d2e44ee671ccd7fc8af Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sun, 9 Oct 2022 06:17:48 +0200 Subject: [PATCH 736/791] [nrf-ble-driver] update and fix arm64-osx (#27116) --- ports/nrf-ble-driver/portfile.cmake | 11 ++- ports/nrf-ble-driver/support-arm64-osx.diff | 78 +++++++++++++++++++++ ports/nrf-ble-driver/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/n-/nrf-ble-driver.json | 5 ++ 5 files changed, 95 insertions(+), 6 deletions(-) create mode 100644 ports/nrf-ble-driver/support-arm64-osx.diff diff --git a/ports/nrf-ble-driver/portfile.cmake b/ports/nrf-ble-driver/portfile.cmake index 0033cae693d616..0cc7a6834db833 100644 --- a/ports/nrf-ble-driver/portfile.cmake +++ b/ports/nrf-ble-driver/portfile.cmake @@ -9,11 +9,12 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NordicSemiconductor/pc-ble-driver - REF v4.1.2 - SHA512 625a52151f2c78421e48e90ff60292c6106e8504b55a26c7df716df75e051a40d2ee4a26c57b5daaa370e53a79002fe965aee8a0d8749f7dce380e8e4a617c95 + REF v4.1.4 + SHA512 8f35e757dddc27c9b11cdb3b9920562bbe09ceac715d65957e56ec8479e8ffedf12df2f976e484ed0d24b9325d9ef2b8ad6576cccefd2de8d7fa6fa8d58b03e5 HEAD_REF master PATCHES 001-arm64-support.patch + support-arm64-osx.diff # from https://github.com/NordicSemiconductor/pc-ble-driver/pull/271 ) # Ensure that git is found within CMakeLists.txt by appending vcpkg's git executable dirpath to $PATH. @@ -23,6 +24,11 @@ vcpkg_find_acquire_program(GIT) get_filename_component(GIT_EXE_PATH "${GIT}" DIRECTORY) vcpkg_add_to_path("${GIT_EXE_PATH}") +set(OPTIONS) +if (VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(OPTIONS "-DARCH=${VCPKG_TARGET_ARCHITECTURE}") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -30,6 +36,7 @@ vcpkg_cmake_configure( -DDISABLE_TESTS=ON -DNRF_BLE_DRIVER_VERSION=4.1.2 -DCONNECTIVITY_VERSION=4.1.2 + ${OPTIONS} MAYBE_UNUSED_VARIABLES DISABLE_EXAMPLES DISABLE_TESTS diff --git a/ports/nrf-ble-driver/support-arm64-osx.diff b/ports/nrf-ble-driver/support-arm64-osx.diff new file mode 100644 index 00000000000000..37e22bcf194707 --- /dev/null +++ b/ports/nrf-ble-driver/support-arm64-osx.diff @@ -0,0 +1,78 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ec7b4d2d7..16c136958 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -298,7 +298,17 @@ include (cmake/clang-dev-tools.cmake) + set(ARCH_SUFFIX "unknown") + + if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") +- set(ARCH_SUFFIX "x86_64") ++ if(APPLE) ++ if(${ARCH} STREQUAL not_set OR ${ARCH} STREQUAL x86_64) ++ set(ARCH_SUFFIX "x86_64") ++ elseif(${ARCH} STREQUAL arm64) ++ set(ARCH_SUFFIX "arm64") ++ else() ++ message(FATAL_ERROR "Invalid ARCH_SUFFIX: ARCH=${ARCH}.") ++ endif() ++ else() ++ set(ARCH_SUFFIX "x86_64") ++ endif() + else() + set(ARCH_SUFFIX "x86_32") + endif() +diff --git a/cmake/apple.cmake b/cmake/apple.cmake +index c413cfa7e..cef762cf1 100644 +--- a/cmake/apple.cmake ++++ b/cmake/apple.cmake +@@ -1,4 +1,13 @@ +-set(CMAKE_OSX_ARCHITECTURES "x86_64") ++if(${ARCH} STREQUAL not_set) ++ message(STATUS "macOS Architecture not set, using x86_64 as default.") ++ SET(CMAKE_OSX_ARCHITECTURES "x86_64") ++else() ++ if(${ARCH} STREQUAL x86_64 OR ${ARCH} STREQUAL arm64) ++ set(CMAKE_OSX_ARCHITECTURES "${ARCH}") ++ else() ++ message(FATAL_ERROR "Invalid CMAKE_OSX_ARCHITECTURES: ARCH=${ARCH}.") ++ endif() ++endif() + + set(CMAKE_SKIP_BUILD_RPATH TRUE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +diff --git a/cmake/nrf-ble-driver.cmake b/cmake/nrf-ble-driver.cmake +index d81608c72..467afd0e9 100644 +--- a/cmake/nrf-ble-driver.cmake ++++ b/cmake/nrf-ble-driver.cmake +@@ -8,7 +8,7 @@ math(EXPR COMPILER_ARCH_BITS "8*${CMAKE_SIZEOF_VOID_P}") + # Default to compiler architecture + set(ARCH_BITS ${COMPILER_ARCH_BITS}) + +-SET(ARCH not_set CACHE STRING "Architecture (x86_32 or x86_64)") ++SET(ARCH not_set CACHE STRING "Architecture (x86_32, x86_64, arm or arm64)") + string(TOLOWER "${ARCH}" ARCH) + + if(${ARCH} STREQUAL not_set) +@@ -16,17 +16,19 @@ if(${ARCH} STREQUAL not_set) + else() + if(MSVC) + message(FATAL_ERROR "ARCH not available with MSVC. Use -G \"Visual Studio XX \" instead.") +- elseif(APPLE) +- message(FATAL_ERROR "ARCH not available on macOS / OS X. Universal 32 and 64-bit binaries will be built.") + endif() + if(${ARCH} STREQUAL x86_32) + set(ARCH_BITS 32) + elseif(${ARCH} STREQUAL x86_64) + set(ARCH_BITS 64) ++ elseif(${ARCH} STREQUAL arm) ++ set(ARCH_BITS 32) ++ elseif(${ARCH} STREQUAL arm64) ++ set(ARCH_BITS 64) + else() + message(FATAL_ERROR "Invalid architecture: ARCH=${ARCH}.") + endif() +- message(STATUS "Building ${ARCH_BITS}-bit targets with ${COMPILER_ARCH_BITS}-bit toolchain.") ++ message(STATUS "Building ${ARCH} ${ARCH_BITS}-bit targets with ${COMPILER_ARCH_BITS}-bit toolchain.") + endif() + + if(NOT MSVC) diff --git a/ports/nrf-ble-driver/vcpkg.json b/ports/nrf-ble-driver/vcpkg.json index 1e196e9befe9eb..7db000b64b96d3 100644 --- a/ports/nrf-ble-driver/vcpkg.json +++ b/ports/nrf-ble-driver/vcpkg.json @@ -1,7 +1,6 @@ { "name": "nrf-ble-driver", - "version": "4.1.2", - "port-version": 2, + "version": "4.1.4", "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.", "homepage": "https://github.com/NordicSemiconductor/pc-ble-driver", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 62e80d20550d0c..5a8a5cdc2ff90e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5141,8 +5141,8 @@ "port-version": 0 }, "nrf-ble-driver": { - "baseline": "4.1.2", - "port-version": 2 + "baseline": "4.1.4", + "port-version": 0 }, "nspr": { "baseline": "4.33", diff --git a/versions/n-/nrf-ble-driver.json b/versions/n-/nrf-ble-driver.json index 6e6d7e6091bef7..d7907e56dec107 100644 --- a/versions/n-/nrf-ble-driver.json +++ b/versions/n-/nrf-ble-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7eb0b4a2be63dfe15611d96725869023f7b438c", + "version": "4.1.4", + "port-version": 0 + }, { "git-tree": "82619c9f6f7860cb053b79c1091a39e0483b7d85", "version": "4.1.2", From b0956f6170685ec37d1bfa61f2d7ff6eb59e4ec0 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Sat, 8 Oct 2022 23:21:44 -0500 Subject: [PATCH 737/791] [protobuf] Teach about crosscompile (#27089) * [protobuf] Teach the cmake wrapper about cross-compiling. * Update versions --- ports/protobuf/vcpkg-cmake-wrapper.cmake | 2 +- ports/protobuf/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ports/protobuf/vcpkg-cmake-wrapper.cmake index 7269aedcca508f..542a16c2b8a300 100644 --- a/ports/protobuf/vcpkg-cmake-wrapper.cmake +++ b/ports/protobuf/vcpkg-cmake-wrapper.cmake @@ -11,6 +11,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) cmake_policy(POP) endif() -find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../tools/protobuf" NO_DEFAULT_PATH) +find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH) _find_package(${ARGS}) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 99afe602615ce1..18a26adabbb964 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "protobuf", "version": "3.21.6", + "port-version": 1, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 5a8a5cdc2ff90e..84a6ff81a76ba9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5846,7 +5846,7 @@ }, "protobuf": { "baseline": "3.21.6", - "port-version": 0 + "port-version": 1 }, "protobuf-c": { "baseline": "1.4.0", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 4897c20ca608a4..c3f185d41dcd97 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76da95f37a73965df86c5cfc317a2dfb677e0add", + "version": "3.21.6", + "port-version": 1 + }, { "git-tree": "1d2c32252e568decb813b1109f1d86e6023af6dd", "version": "3.21.6", From 2909a549a9e1515072ed0ecf542c00765012644c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 9 Oct 2022 06:26:00 +0200 Subject: [PATCH 738/791] [wxwidgets] Use vcpkg gtk3 for linux et al., fix mingw cross builds (#27087) * Minor port corrections * Use vcpkg gtk3 for linux et al. * Update versions * Update cmake-user * Use vcpkg sdl2 cmake config * Update versions * Add direct cairo dependency * Declare maybe-unused variables * Fix mingw cross builds * Update versions --- ports/wxwidgets/portfile.cmake | 50 +++++++---------------- ports/wxwidgets/sdl2.patch | 29 +++++++++++++ ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 9 +--- ports/wxwidgets/vcpkg.json | 26 +++++++++++- scripts/ci.baseline.txt | 2 +- scripts/test_ports/cmake-user/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++ 8 files changed, 79 insertions(+), 46 deletions(-) create mode 100644 ports/wxwidgets/sdl2.patch diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 6dd536089f7be6..a412fee1307480 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -11,31 +11,16 @@ vcpkg_from_github( fix-libs-export.patch fix-pcre2.patch gtk3-link-libraries.patch + sdl2.patch ) -if(VCPKG_TARGET_IS_LINUX) - message(WARNING [[ -Port wxwidgets currently requires the following packages from the system package manager: - pkg-config - GTK 3 - libsecret - libgcrypt - libsystemd -These development packages can be installed on Ubuntu systems via - sudo apt-get install pkg-config libgtk-3-dev libsecret-1-dev libgcrypt20-dev libsystemd-dev -]]) - foreach(conflicting_port IN ITEMS freetype glib) - if(EXISTS "${CURRENT_INSTALLED_DIR}/share/${conflicting_port}/copyright") - message(FATAL_ERROR "Port ${conflicting_port} must not be installed when building ${PORT}:${TARGET_TRIPLET}.") - endif() - endforeach() -endif() - vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - sound wxUSE_SOUND fonts wxUSE_PRIVATE_FONTS + media wxUSE_MEDIACTRL + sound wxUSE_SOUND + webview wxUSE_WEBVIEW webview wxUSE_WEBVIEW_EDGE ) @@ -58,19 +43,6 @@ else() list(APPEND OPTIONS -DwxUSE_WEBREQUEST_CURL=ON) endif() -if(DEFINED ENV{PKG_CONFIG}) - set(PKGCONFIG "$ENV{PKG_CONFIG}") -elseif(VCPKG_TARGET_IS_LINUX AND NOT VCPKG_CROSSCOMPILING) - # wxWidgets on Linux currently needs to find the system's `gtk+-3.0.pc`. - # vcpkg's port pkgconf would prevent this lookup. - find_program(system_pkg_config NAMES pkg-config) - if(system_pkg_config) - set(PKGCONFIG "${system_pkg_config}") - endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND OPTIONS -DPKG_CONFIG_ARGN=--static) - endif() -endif() vcpkg_find_acquire_program(PKGCONFIG) # This may be set to ON by users in a custom triplet. @@ -95,9 +67,14 @@ vcpkg_cmake_configure( -DwxUSE_LIBPNG=sys -DwxUSE_LIBTIFF=sys -DwxUSE_NANOSVG=sys - -DwxUSE_SECRETSTORE=FALSE + -DwxUSE_LIBGNOMEVFS=OFF + -DwxUSE_LIBNOTIFY=OFF + -DwxUSE_SECRETSTORE=OFF -DwxUSE_STL=${WXWIDGETS_USE_STL} -DwxUSE_STD_CONTAINERS=${WXWIDGETS_USE_STD_CONTAINERS} + -DwxUSE_UIACTIONSIMULATOR=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_GSPELL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_MSPACK=ON ${OPTIONS} "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" # The minimum cmake version requirement for Cotire is 2.8.12. @@ -105,6 +82,9 @@ vcpkg_cmake_configure( -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=ON OPTIONS_RELEASE ${OPTIONS_RELEASE} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_GSPELL + CMAKE_DISABLE_FIND_PACKAGE_MSPACK ) vcpkg_cmake_install() @@ -117,7 +97,7 @@ file(REMOVE_RECURSE ) set(tools wxrc) -if(NOT VCPKG_TARGET_IS_WINDOWS OR NOT VCPKG_HOST_IS_WINDOWS) +if(NOT VCPKG_TARGET_IS_WINDOWS) list(APPEND tools wxrc-3.2) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/wx-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wx-config") @@ -189,7 +169,7 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h") endif() if(NOT "debug-support" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_HOST_IS_WINDOWS) + if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0") else() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/wx-3.2/wx/debug.h" "#define wxDEBUG_LEVEL 1" "#define wxDEBUG_LEVEL 0") diff --git a/ports/wxwidgets/sdl2.patch b/ports/wxwidgets/sdl2.patch new file mode 100644 index 00000000000000..24aaf8011e7e4c --- /dev/null +++ b/ports/wxwidgets/sdl2.patch @@ -0,0 +1,29 @@ +diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake +index 7bd00d3..d903584 100644 +--- a/build/cmake/init.cmake ++++ b/build/cmake/init.cmake +@@ -493,7 +493,9 @@ if(wxUSE_GUI) + endif() + + if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE) +- find_package(SDL2) ++ find_package(SDL2 CONFIG REQUIRED) ++ set(SDL2_INCLUDE_DIR "" CACHE INTERNAL "") ++ set(SDL2_LIBRARY SDL2::SDL2 CACHE INTERNAL "") + if(NOT SDL2_FOUND) + find_package(SDL) + endif() +diff --git a/build/cmake/wxWidgetsConfig.cmake.in b/build/cmake/wxWidgetsConfig.cmake.in +index 248a701..f617dc4 100644 +--- a/build/cmake/wxWidgetsConfig.cmake.in ++++ b/build/cmake/wxWidgetsConfig.cmake.in +@@ -2,6 +2,9 @@ + + include(CMakeFindDependencyMacro) + find_dependency(unofficial-nanosvg CONFIG) ++if("@wxUSE_LIBSDL@") ++ find_dependency(SDL2 CONFIG) ++endif() + + # determine target from compiler, platform and library type + if(WIN32 AND NOT CYGWIN AND NOT MSYS) diff --git a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake index 5737945d08d139..1e1bd2c76602df 100644 --- a/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ b/ports/wxwidgets/vcpkg-cmake-wrapper.cmake @@ -7,7 +7,7 @@ set(wxWidgets_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") set(WX_ROOT_DIR "${_vcpkg_wx_root}" CACHE INTERNAL "") unset(_vcpkg_wx_root) -if(WIN32 AND CMAKE_HOST_WIN32) +if(WIN32) # Find all libs with "32" infix which is unknown to FindwxWidgets.cmake function(z_vcpkg_wxwidgets_find_base_library BASENAME) find_library(WX_${BASENAME}d wx${BASENAME}32ud NAMES wx${BASENAME}d PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) @@ -31,11 +31,6 @@ if(WIN32 AND CMAKE_HOST_WIN32) set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "") else() # FindwxWidgets.cmake unix mode, single-config - if(MINGW) - # Force FindwxWidgets.cmake unix mode for mingw cross builds - set(_vcpkg_wxwidgets_backup_crosscompiling "${CMAKE_CROSSCOMPILING}") - set(CMAKE_CROSSCOMPILING 1) - endif() set(_vcpkg_wxconfig "") if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST MAP_IMPORTED_CONFIG_${CMAKE_BUILD_TYPE}) # Debug @@ -59,7 +54,7 @@ if(DEFINED _vcpkg_wxwidgets_backup_crosscompiling) unset(_vcpkg_wxwidgets_backup_crosscompiling) endif() -if(WIN32 AND CMAKE_HOST_WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT "wx::core" IN_LIST wxWidgets_LIBRARIES) +if(WIN32 AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT "wx::core" IN_LIST wxWidgets_LIBRARIES) find_package(EXPAT QUIET) find_package(JPEG QUIET) find_package(PNG QUIET) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index d724fb32238b88..17789158aa48c3 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "wxwidgets", "version": "3.2.1", + "port-version": 1, "description": [ "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option.", @@ -10,12 +11,25 @@ "license": "LGPL-2.0-or-later WITH WxWindows-exception-3.1", "supports": "!uwp", "dependencies": [ + { + "name": "cairo", + "default-features": false, + "platform": "!windows & !osx & !ios" + }, { "name": "curl", "default-features": false, "platform": "!windows & !osx" }, "expat", + { + "name": "gtk3", + "platform": "!windows & !osx & !ios" + }, + { + "name": "libiconv", + "platform": "!windows" + }, "libjpeg-turbo", "libpng", "nanosvg", @@ -55,13 +69,23 @@ } ] }, + "media": { + "description": "Build wxMediaCtrl support", + "dependencies": [ + { + "name": "gstreamer", + "default-features": false, + "platform": "!windows & !osx & !ios" + } + ] + }, "sound": { "description": "Build wxSound support", "dependencies": [ { "name": "sdl2", "default-features": false, - "platform": "!windows & !osx" + "platform": "!windows & !osx & !ios" } ] }, diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 89e799404b5eff..79d8401365549e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1176,7 +1176,6 @@ wpilib:arm64-windows=fail wpilib:x64-osx=fail wincrypt:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 wxchartdir:x64-osx=fail -wxwidgets:x64-linux=fail x265:arm64-windows=fail x265:arm-uwp=fail x265:x64-uwp=fail @@ -1293,6 +1292,7 @@ vcpkg-ci-paraview:x64-windows-static=pass vcpkg-ci-paraview:x64-windows=pass vcpkg-ci-paraview:x86-windows=pass vcpkg-ci-wxwidgets:arm64-windows=pass +vcpkg-ci-wxwidgets:x64-linux=pass vcpkg-ci-wxwidgets:x64-osx=pass vcpkg-ci-wxwidgets:x64-windows-static-md=pass vcpkg-ci-wxwidgets:x64-windows-static=pass diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json index 8b476c587b046c..7dea8fd6fcea92 100644 --- a/scripts/test_ports/cmake-user/vcpkg.json +++ b/scripts/test_ports/cmake-user/vcpkg.json @@ -122,7 +122,7 @@ "$package": "wxWidgets", "name": "wxwidgets", "default-features": false, - "platform": "!linux & !uwp" + "platform": "!uwp" }, { "$package": "ZLIB", diff --git a/versions/baseline.json b/versions/baseline.json index 84a6ff81a76ba9..06742e3010f4ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7894,7 +7894,7 @@ }, "wxwidgets": { "baseline": "3.2.1", - "port-version": 0 + "port-version": 1 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 715eb5b9b73562..72e48ed03c7621 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a640144a98d7909a92ba363114f95bcaff554e5", + "version": "3.2.1", + "port-version": 1 + }, { "git-tree": "a113e248e95bf2305a91b4d7c2a93579cc911b15", "version": "3.2.1", From 5a9f73ae88cfca3f1a13a75c0a622a028a5bfa0b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sun, 9 Oct 2022 06:27:45 +0200 Subject: [PATCH 739/791] [chmlib] support on arm (#27064) --- ports/chmlib/all-platforms.patch | 20 ++++++++++++++++++++ ports/chmlib/portfile.cmake | 18 +++++++++--------- ports/chmlib/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 2 +- versions/c-/chmlib.json | 5 +++++ 5 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 ports/chmlib/all-platforms.patch diff --git a/ports/chmlib/all-platforms.patch b/ports/chmlib/all-platforms.patch new file mode 100644 index 00000000000000..62dca58ec21331 --- /dev/null +++ b/ports/chmlib/all-platforms.patch @@ -0,0 +1,20 @@ +diff --git a/src/chm_lib.c b/src/chm_lib.c +index 6c6736c..d532691 100644 +--- a/src/chm_lib.c ++++ b/src/chm_lib.c +@@ -175,8 +175,13 @@ typedef unsigned long UInt64; + + #else + +-/* yielding an error is preferable to yielding incorrect behavior */ +-#error "Please define the sized types for your platform in chm_lib.c" ++typedef unsigned char UChar; ++typedef int16_t Int16; ++typedef uint16_t UInt16; ++typedef int32_t Int32; ++typedef uint32_t UInt32; ++typedef int64_t Int64; ++typedef uint64_t UInt64; + #endif + + /* GCC */ diff --git a/ports/chmlib/portfile.cmake b/ports/chmlib/portfile.cmake index 32ac77243b491c..7559b7c077e290 100644 --- a/ports/chmlib/portfile.cmake +++ b/ports/chmlib/portfile.cmake @@ -13,21 +13,21 @@ vcpkg_download_distfile( vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" + PATCHES + all-platforms.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_RELEASE -DBUILD_TOOLS=ON OPTIONS_DEBUG -DBUILD_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/src/chm_lib.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/src/chm_lib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/chmlib) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/chmlib/COPYING ${CURRENT_PACKAGES_DIR}/share/chmlib/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/chmlib/vcpkg.json b/ports/chmlib/vcpkg.json index f3fcf3d84c7e16..1abad01f8dbeb3 100644 --- a/ports/chmlib/vcpkg.json +++ b/ports/chmlib/vcpkg.json @@ -1,7 +1,14 @@ { "name": "chmlib", - "version-string": "0.40", - "port-version": 5, + "version": "0.40", + "port-version": 6, "description": "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.", - "homepage": "https://www.jedrea.com/chmlib/" + "homepage": "http://www.jedrea.com/chmlib/", + "license": "LGPL-2.1-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 06742e3010f4ff..82dd51f0d339e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1402,7 +1402,7 @@ }, "chmlib": { "baseline": "0.40", - "port-version": 5 + "port-version": 6 }, "chromaprint": { "baseline": "1.5.0", diff --git a/versions/c-/chmlib.json b/versions/c-/chmlib.json index 1986f3145af10e..4b0e16833c8b70 100644 --- a/versions/c-/chmlib.json +++ b/versions/c-/chmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb8f888eae3c5747154d09844daadc5c117a8c38", + "version": "0.40", + "port-version": 6 + }, { "git-tree": "44371d51f30e27d0ccda47b2069b194c3c570ea4", "version-string": "0.40", From 1ece5ec4ada78098030460ba03c3947d762aa1e3 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sun, 9 Oct 2022 06:31:31 +0200 Subject: [PATCH 740/791] [s2geometry] update port (#27072) --- ports/s2geometry/CMakeLists.txt.patch | 61 +++++++++++---------------- ports/s2geometry/portfile.cmake | 16 +++---- ports/s2geometry/vcpkg.json | 10 +++-- versions/baseline.json | 4 +- versions/s-/s2geometry.json | 5 +++ 5 files changed, 45 insertions(+), 51 deletions(-) diff --git a/ports/s2geometry/CMakeLists.txt.patch b/ports/s2geometry/CMakeLists.txt.patch index 262b0bcd0b5055..69a63dced8aec4 100644 --- a/ports/s2geometry/CMakeLists.txt.patch +++ b/ports/s2geometry/CMakeLists.txt.patch @@ -1,15 +1,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ecd280..9859890 100644 +index f080b4b..ba80cbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -20,16 +20,8 @@ set(CMAKE_CXX_EXTENSIONS OFF) +@@ -26,16 +26,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/third_party/cmake") -option(WITH_GFLAGS "Use gflags to change command line flags." OFF) -add_feature_info(GFLAGS WITH_GFLAGS - "allows changing command line flags.") - +- -# glog option can only be turned on if gflags is on. -cmake_dependent_option(WITH_GLOG "Use glog for logging." ON - "WITH_GFLAGS" OFF) @@ -20,7 +20,7 @@ index 5ecd280..9859890 100644 add_feature_info(SHARED_LIBS BUILD_SHARED_LIBS "builds shared libraries instead of static.") -@@ -37,26 +29,19 @@ option(BUILD_EXAMPLES "Build s2 documentation examples." ON) +@@ -46,26 +37,19 @@ add_feature_info(PYTHON WITH_PYTHON "provides python interface to S2") feature_summary(WHAT ALL) @@ -55,17 +55,18 @@ index 5ecd280..9859890 100644 endif() +add_definitions(-DS2_USE_GFLAGS) + find_package(absl REQUIRED) find_package(OpenSSL REQUIRED) - # pthreads isn't used directly, but this is still required for std::thread. -@@ -204,14 +189,18 @@ add_library(s2testing STATIC - src/s2/s2testing.cc) - target_link_libraries( - s2 -- ${GFLAGS_LIBRARIES} ${GLOG_LIBRARIES} ${OPENSSL_LIBRARIES} -+ gflags::gflags glog::glog OpenSSL::SSL OpenSSL::Crypto - ${CMAKE_THREAD_LIBS_INIT}) +@@ -101,7 +85,7 @@ endif() + # something like: + # OPENSSL_ROOT_DIR=/usr/local/opt/openssl cmake .. + include_directories( +- ${GFLAGS_INCLUDE_DIRS} ${GLOG_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR}) ++ gflags::gflags glog::glog OpenSSL::SSL OpenSSL::Crypto) - # Allow other CMake projects to use this one with: + if (WITH_PYTHON) + include_directories(${Python3_INCLUDE_DIRS}) +@@ -253,7 +237,10 @@ endif() # list(APPEND CMAKE_MODULE_PATH "/third_party/cmake") # add_subdirectory( s2geometry) # target_link_libraries( s2) @@ -74,22 +75,14 @@ index 5ecd280..9859890 100644 + $ + $ +) -+ - # We don't need to install all headers, only those - # transitively included by s2 headers we are exporting. -@@ -407,7 +396,18 @@ install(FILES src/s2/util/math/mathutil.h - install(FILES src/s2/util/units/length-units.h - src/s2/util/units/physical-units.h - DESTINATION include/s2/util/units) --install(TARGETS s2 s2testing DESTINATION lib) -+ install(TARGETS s2 s2testing -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) -+install(TARGETS s2 -+ EXPORT unofficial-s2Targets -+ ) + # Add version information to the target + set_target_properties(s2 PROPERTIES +@@ -427,6 +414,12 @@ install(TARGETS ${S2_TARGETS} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") ++install(TARGETS s2 EXPORT unofficial-s2Targets) +install(EXPORT unofficial-s2Targets + NAMESPACE unofficial-s2 + FILE unofficial-s2Targets.cmake @@ -98,12 +91,11 @@ index 5ecd280..9859890 100644 message("GTEST_ROOT: ${GTEST_ROOT}") if (GTEST_ROOT) -@@ -534,3 +534,17 @@ endif() - if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND}) +@@ -569,3 +562,13 @@ endif() + if (${SWIG_FOUND} AND ${Python3_FOUND}) add_subdirectory("src/python" python) endif() + -+ +include(CMakePackageConfigHelpers) +# generate the config file that is includes the exports +configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in @@ -111,8 +103,5 @@ index 5ecd280..9859890 100644 + INSTALL_DESTINATION "share/unofficial-s2/" + NO_SET_AND_CHECK_MACRO + NO_CHECK_REQUIRED_COMPONENTS_MACRO -+ ) -+ install(FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake -+ DESTINATION "share/unofficial-s2/" -+ ) ++) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-s2Config.cmake DESTINATION "share/unofficial-s2/") diff --git a/ports/s2geometry/portfile.cmake b/ports/s2geometry/portfile.cmake index 8eeeccaf1be23e..72715dbdf74f06 100644 --- a/ports/s2geometry/portfile.cmake +++ b/ports/s2geometry/portfile.cmake @@ -1,27 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/s2geometry - REF v0.9.0 - SHA512 854ec84a54aff036b3092a6233be0f5fc0e4846ac5f882326bbb3f2b9ce88bd5c866a80ae352d8e7d5ae00b9c9a8ab1cff6a95412f990b7bc1fdc5ca3d632b9c + REF v0.10.0 + SHA512 04fe955f71b584bca7e492b935ec6061ce1348ff1731797451cdaa538adb88274cb1634d91a844d5d6e3ad0ed11e865322002115d2e746d9a0127f38cabc34e3 HEAD_REF main PATCHES CMakeLists.txt.patch Config.cmake.in.patch ) - vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DBUILD_EXAMPLES=OFF - -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES BUILD_TESTING ) - vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-s2) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry/" RENAME copyright) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/s2geometry/") diff --git a/ports/s2geometry/vcpkg.json b/ports/s2geometry/vcpkg.json index e6f274b11f3bd3..cb729273d010d8 100644 --- a/ports/s2geometry/vcpkg.json +++ b/ports/s2geometry/vcpkg.json @@ -1,18 +1,22 @@ { "name": "s2geometry", - "version": "0.9.0", - "port-version": 1, + "version": "0.10.0", "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", + "license": "Apache-2.0", "supports": "!windows", "dependencies": [ + "abseil", "gflags", "glog", - "gtest", "openssl", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 82dd51f0d339e3..fad57c73d22d37 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6593,8 +6593,8 @@ "port-version": 6 }, "s2geometry": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "0.10.0", + "port-version": 0 }, "s2n": { "baseline": "1.3.5", diff --git a/versions/s-/s2geometry.json b/versions/s-/s2geometry.json index d7824d9754c29f..037c957f9b1c45 100644 --- a/versions/s-/s2geometry.json +++ b/versions/s-/s2geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a42a3249df4efb18f66fccab283c69973e1a535b", + "version": "0.10.0", + "port-version": 0 + }, { "git-tree": "e72b94e77bff8c357c4cd2430094c4dadf21c174", "version": "0.9.0", From 27b04e77aa4f3b911d91e269b2d19673c4d7bc78 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 9 Oct 2022 06:36:46 +0200 Subject: [PATCH 741/791] [scripts|world rebuild] Retry 'make install' in non-parallel mode (#27105) * Retry 'make install' in non-parallel mode * CI [skip actions] --- scripts/cmake/vcpkg_build_make.cmake | 4 ++++ scripts/cmake/vcpkg_execute_build_process.cmake | 2 ++ 2 files changed, 6 insertions(+) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 11e4072cc015b1..918793c9da7c2b 100644 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -51,6 +51,7 @@ function(vcpkg_build_make) string(REPLACE " " [[\ ]] vcpkg_package_prefix "${CURRENT_PACKAGES_DIR}") string(REGEX REPLACE [[([a-zA-Z]):/]] [[/\1/]] vcpkg_package_prefix "${vcpkg_package_prefix}") vcpkg_list(SET install_opts -j ${VCPKG_CONCURRENCY} --trace -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${vcpkg_package_prefix}) + vcpkg_list(SET no_parallel_install_opts -j 1 --trace -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${vcpkg_package_prefix}) #TODO: optimize for install-data (release) and install-exec (release/debug) else() @@ -63,6 +64,7 @@ function(vcpkg_build_make) vcpkg_list(SET make_opts ${arg_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) vcpkg_list(SET no_parallel_make_opts ${arg_MAKE_OPTIONS} V=1 -j 1 -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) vcpkg_list(SET install_opts -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) + vcpkg_list(SET no_parallel_install_opts -j 1 -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) endif() # Since includes are buildtype independent those are setup by vcpkg_configure_make @@ -160,8 +162,10 @@ function(vcpkg_build_make) if (arg_ENABLE_INSTALL) message(STATUS "Installing ${TARGET_TRIPLET}${short_buildtype}") vcpkg_list(SET make_cmd_line ${make_command} ${install_opts}) + vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${no_parallel_install_opts}) vcpkg_execute_build_process( COMMAND ${make_cmd_line} + NO_PARALLEL_COMMAND ${no_parallel_make_cmd_line} WORKING_DIRECTORY "${working_directory}" LOGNAME "install-${TARGET_TRIPLET}${short_buildtype}" ) diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 8f3c9cdcc2dfa3..517b0b66987937 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -12,6 +12,8 @@ set(Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES "Cannot write file" # Multiple threads caused the wrong order of creating folders and creating files in folders "Can't open" + # `make install` may stumble over concurrency, in particular with `mkdir` on osx. + "mkdir [^:]*: File exists" ) list(JOIN Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES "|" Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES) From cc115450e00012179aa97529bd037dc0aaa65643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E8=8D=89=E9=85=B8=E9=85=AF?= <17663689+kotori2@users.noreply.github.com> Date: Sun, 9 Oct 2022 00:38:15 -0400 Subject: [PATCH 742/791] [libmariadb] add zstd to option list (#26931) * [libmariadb] add zstd to macOS build * update manifests * add zstd switch * update version * update * update version --- ports/libmariadb/portfile.cmake | 3 +++ ports/libmariadb/vcpkg.json | 8 +++++++- ports/libmariadb/zstd.patch | 13 +++++++++++++ versions/baseline.json | 2 +- versions/l-/libmariadb.json | 5 +++++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ports/libmariadb/zstd.patch diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 281ad55d7cd5a3..99db6409cf00b6 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -20,12 +20,14 @@ vcpkg_from_github( pkgconfig.patch fix-openssl.patch fix-CMakeLists.patch + zstd.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES iconv WITH_ICONV mariadbclient VCPKG_MARIADBCLIENT + zstd WITH_ZSTD ) if("openssl" IN_LIST FEATURES) @@ -49,6 +51,7 @@ vcpkg_cmake_configure( -DWITH_SSL=${WITH_SSL} -DREMOTEIO_PLUGIN_TYPE=OFF -DAUTH_GSSAPI_PLUGIN_TYPE=OFF + -DWITH_ZSTD=${WITH_ZSTD} MAYBE_UNUSED_VARIABLES AUTH_GSSAPI_PLUGIN_TYPE ) diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json index 0d40cc465db0c6..3718a3a914f1d7 100644 --- a/ports/libmariadb/vcpkg.json +++ b/ports/libmariadb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmariadb", "version-semver": "3.3.1", - "port-version": 1, + "port-version": 2, "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", "license": "LGPL-2.1-or-later", @@ -63,6 +63,12 @@ }, "zlib": { "description": "Obsolete. zlib is always used. This feature is left for compatibility." + }, + "zstd": { + "description": "Build zstd compression plugin.", + "dependencies": [ + "zstd" + ] } } } diff --git a/ports/libmariadb/zstd.patch b/ports/libmariadb/zstd.patch new file mode 100644 index 00000000000000..26c1adb78e8541 --- /dev/null +++ b/ports/libmariadb/zstd.patch @@ -0,0 +1,13 @@ +diff --git a/plugins/compress/CMakeLists.txt b/plugins/compress/CMakeLists.txt +index f6dab85..0bbdf47 100644 +--- a/plugins/compress/CMakeLists.txt ++++ b/plugins/compress/CMakeLists.txt +@@ -12,7 +12,7 @@ REGISTER_PLUGIN(TARGET zlib + SOURCES ${COMPRESS_PLUGIN_DIR}/c_zlib.c) + + #zstd compression +-IF(${ZSTD_FOUND}) ++IF(${WITH_ZSTD}) + INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIRS}) + REGISTER_PLUGIN(TARGET zstd + TYPE MARIADB_CLIENT_COMPRESSION_PLUGIN diff --git a/versions/baseline.json b/versions/baseline.json index fad57c73d22d37..82b641df413ef3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3898,7 +3898,7 @@ }, "libmariadb": { "baseline": "3.3.1", - "port-version": 1 + "port-version": 2 }, "libmaxminddb": { "baseline": "1.4.3", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index 6b89163e9bf04b..806f9ba2ac34d7 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99cf48b4599872b087d938a2f4ccdbca34f61f1a", + "version-semver": "3.3.1", + "port-version": 2 + }, { "git-tree": "34106302d34bd62e9298357aa8b47b2c3aabf204", "version-semver": "3.3.1", From 4d85e1693712d06d8b7b84539c4894a2728761c2 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sun, 9 Oct 2022 06:43:29 +0200 Subject: [PATCH 743/791] [dbus] no absolute paths (#27036) --- ports/dbus/portfile.cmake | 9 ++++++++- ports/dbus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/dbus.json | 5 +++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ports/dbus/portfile.cmake b/ports/dbus/portfile.cmake index 6216aa90f785ea..f351d90c06572a 100644 --- a/ports/dbus/portfile.cmake +++ b/ports/dbus/portfile.cmake @@ -47,7 +47,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var/" "${CURRENT_PACKAGES_DIR}/share/dbus-1/services" "${CURRENT_PACKAGES_DIR}/share/dbus-1/session.d" "${CURRENT_PACKAGES_DIR}/share/dbus-1/system-services" - "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.d") + "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.d" + "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.conf" + "${CURRENT_PACKAGES_DIR}/share/dbus-1/system.conf" + "${CURRENT_PACKAGES_DIR}/etc") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/session.conf" "${CURRENT_PACKAGES_DIR}/etc/dbus/dbus-1/session.conf" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/session.conf" "${CURRENT_PACKAGES_DIR}/etc/dbus/dbus-1/session.d" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/dbus-1/session.conf" "${CURRENT_PACKAGES_DIR}/etc/dbus/dbus-1/session-local.conf" "") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") set(TOOLS daemon launch monitor run-session send test-tool update-activation-environment) diff --git a/ports/dbus/vcpkg.json b/ports/dbus/vcpkg.json index 19988447ab91a2..13204a21d1c6d6 100644 --- a/ports/dbus/vcpkg.json +++ b/ports/dbus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dbus", "version": "1.13.18", - "port-version": 1, + "port-version": 2, "description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon", "homepage": "https://gitlab.freedesktop.org/dbus/dbus", "license": "AFL-2.1 OR GPL-2.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 82b641df413ef3..b171e2e9ffa6d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1886,7 +1886,7 @@ }, "dbus": { "baseline": "1.13.18", - "port-version": 1 + "port-version": 2 }, "dcmtk": { "baseline": "3.6.7", diff --git a/versions/d-/dbus.json b/versions/d-/dbus.json index 957653d5ec28b9..5383f46680820b 100644 --- a/versions/d-/dbus.json +++ b/versions/d-/dbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68f92ce062e5a0bfb408087a34e1c5b7d0a8315a", + "version": "1.13.18", + "port-version": 2 + }, { "git-tree": "18e1551271c49540ec2170dcd0d770395717c7c3", "version": "1.13.18", From 3d8c3f5ec09d5539f07ed0fc6d8d90c4b420ff77 Mon Sep 17 00:00:00 2001 From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com> Date: Sun, 9 Oct 2022 06:47:42 +0200 Subject: [PATCH 744/791] [mfl] Fix supports for building on normal triplets (#26951) * fbthrift * mfl * version * Disable tests * version * revert fbthrift --- ports/mfl/disable-tests.patch | 22 ++++++++++++++++++++++ ports/mfl/portfile.cmake | 14 ++++++-------- ports/mfl/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/m-/mfl.json | 5 +++++ 5 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 ports/mfl/disable-tests.patch diff --git a/ports/mfl/disable-tests.patch b/ports/mfl/disable-tests.patch new file mode 100644 index 00000000000000..276e1832828746 --- /dev/null +++ b/ports/mfl/disable-tests.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c411d11..9336e1d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,17 +18,6 @@ include(cmake/StaticAnalyzers.cmake) + + + add_subdirectory(src) +-add_subdirectory(tests/fonts_for_tests) +-add_subdirectory(tests/unit_tests) +- +-# Building approval tests causes ICE on msvc +-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- add_subdirectory(tests/approval_tests) +-endif() +- +-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- add_subdirectory(tests/fuzz_tests) +-endif() + + include(GNUInstallDirs) + diff --git a/ports/mfl/portfile.cmake b/ports/mfl/portfile.cmake index 3bb9cbceb5d53b..7c5694ca8037dc 100644 --- a/ports/mfl/portfile.cmake +++ b/ports/mfl/portfile.cmake @@ -10,15 +10,13 @@ vcpkg_from_github( REF v0.0.1 SHA512 a609b4ff23a01e9f9d9bf60bfa6e0b2346b054cf0c27e74e6da574dcfd2a6ead30dcb8464cf03cae2bb9995f15f01ffda5f862c0ec2744a9ad38b856ff27f073 HEAD_REF master + PATCHES + disable-tests.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mfl) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mfl) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mfl/vcpkg.json b/ports/mfl/vcpkg.json index 88dc46f3c03f62..17f28d4cc03305 100644 --- a/ports/mfl/vcpkg.json +++ b/ports/mfl/vcpkg.json @@ -1,16 +1,24 @@ { "name": "mfl", "version": "0.0.1", + "port-version": 1, "description": "Computes the layout information for mathematical formulas provided in TeX-like syntax.", "homepage": "https://github.com/cpp-niel/mfl", "license": "MIT", - "supports": "static", "dependencies": [ "cairo", "doctest", "fmt", "freetype", "harfbuzz", - "range-v3" + "range-v3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b171e2e9ffa6d4..93141b57d5543c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4722,7 +4722,7 @@ }, "mfl": { "baseline": "0.0.1", - "port-version": 0 + "port-version": 1 }, "mgnlibs": { "baseline": "2019-09-29", diff --git a/versions/m-/mfl.json b/versions/m-/mfl.json index 37f9797621be83..909eeef75e3711 100644 --- a/versions/m-/mfl.json +++ b/versions/m-/mfl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ad7af919e311136c6d46434a2a71b5e064a2d67", + "version": "0.0.1", + "port-version": 1 + }, { "git-tree": "a01a0e6d38ab404c3ae58d21d734969a089ef82c", "version": "0.0.1", From 11967e7797ea18a99c1950cf9f651c5793aae8e9 Mon Sep 17 00:00:00 2001 From: day253 <9634619+day253@users.noreply.github.com> Date: Sun, 9 Oct 2022 12:48:41 +0800 Subject: [PATCH 745/791] [vcpkg] GENERATOR with Makefiles can build parallel (#26780) * GENERATOR with Makefiles can build parallel * resolved conflicts Co-authored-by: JackBoosY --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_build.cmake | 10 +++++----- scripts/cmake/vcpkg_build_cmake.cmake | 10 +++++----- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index f6f66b21a4ac9f..741394d5be7320 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-08-18", + "version-date": "2022-09-13", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake index efdb194fa173b7..47933b3fe9f89c 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_build.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_build.cmake @@ -26,12 +26,12 @@ function(vcpkg_cmake_build) elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") - vcpkg_list(SET build_args "VERBOSE=1") - vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args "") + vcpkg_list(SET build_param "VERBOSE=1") + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") - vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args -jobs 1) + vcpkg_list(SET parallel_param -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param -jobs 1) else() message(WARNING "Unrecognized GENERATOR setting from vcpkg_cmake_configure().") endif() diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index 592f6508ee6951..8a8c25ebc50414 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -30,12 +30,12 @@ function(vcpkg_build_cmake) elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Unix Makefiles") - vcpkg_list(SET build_args "VERBOSE=1") - vcpkg_list(SET parallel_args "-j${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args "") + vcpkg_list(SET build_param "VERBOSE=1") + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "") elseif(Z_VCPKG_CMAKE_GENERATOR STREQUAL "Xcode") - vcpkg_list(SET parallel_args -jobs "${VCPKG_CONCURRENCY}") - vcpkg_list(SET no_parallel_args -jobs 1) + vcpkg_list(SET parallel_param -jobs "${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param -jobs 1) else() message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") endif() diff --git a/versions/baseline.json b/versions/baseline.json index 93141b57d5543c..d388dec67adbd4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7637,7 +7637,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-08-18", + "baseline": "2022-09-13", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 93f0c66974a2f1..f1bdb7e13448b6 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72b6903c393330b7c9042096d84cbd733619644e", + "version-date": "2022-09-13", + "port-version": 0 + }, { "git-tree": "84c200e8e625d4d99b1649525fcdf81a73197078", "version-date": "2022-08-18", From a29baafabc04dea13d92cea830d0b00e8ff5bca0 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Sun, 9 Oct 2022 06:54:58 +0200 Subject: [PATCH 746/791] [ffmpeg] srt support (#26679) --- ports/ffmpeg/portfile.cmake | 6 +++++ ports/ffmpeg/vcpkg.json | 15 +++++++++++ ports/libsrt/fix-static.patch | 26 +++++++++++++++++++ ports/libsrt/portfile.cmake | 4 ++- ports/openssl/install-pc-files.cmake | 2 +- ports/openssl/vcpkg.json | 2 +- scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 5 ++-- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 2 +- versions/l-/libsrt.json | 2 +- versions/o-/openssl.json | 5 ++++ 11 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 ports/libsrt/fix-static.patch diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 680eefa80807b0..2c049c72a0b092 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -456,6 +456,12 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() +if ("srt" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libsrt") +else() + set(OPTIONS "${OPTIONS} --disable-libsrt") +endif() + if (VCPKG_TARGET_IS_OSX) set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 8a5884e02dc439..cb7d574e00bd43 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -123,6 +123,14 @@ ], "platform": "!uwp" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "srt" + ], + "platform": "!uwp" + }, { "name": "ffmpeg", "default-features": false, @@ -548,6 +556,13 @@ "speex" ] }, + "srt": { + "description": "Haivision SRT protocol", + "supports": "!uwp", + "dependencies": [ + "libsrt" + ] + }, "ssh": { "description": "SFTP protocol via libssh", "dependencies": [ diff --git a/ports/libsrt/fix-static.patch b/ports/libsrt/fix-static.patch new file mode 100644 index 00000000000000..73c027ab0ba985 --- /dev/null +++ b/ports/libsrt/fix-static.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9931589..e5a588e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -931,20 +931,7 @@ endif() + + if (srt_libspec_static) + add_library(${TARGET_srt}_static STATIC ${OBJECT_LIB_SUPPORT} ${VIRTUAL_srt}) +- +- # For Windows, leave the name to be "srt_static.lib". +- # Windows generates two different library files: +- # - a usual static library for static linkage +- # - a shared library exposer, which allows pre-resolution and later dynamic +- # linkage when running the executable +- # Both having unfortunately the same names created by MSVC compiler. +- # It's not the case of Cygwin/MINGW - they are named there libsrt.a and libsrt.dll.a +- if (MICROSOFT) +- # Keep _static suffix. By unknown reason, the name must still be set explicitly. +- set_property(TARGET ${TARGET_srt}_static PROPERTY OUTPUT_NAME ${TARGET_srt}_static) +- else() +- set_property(TARGET ${TARGET_srt}_static PROPERTY OUTPUT_NAME ${TARGET_srt}) +- endif() ++ set_property(TARGET ${TARGET_srt}_static PROPERTY OUTPUT_NAME ${TARGET_srt}) + + list (APPEND INSTALL_TARGETS ${TARGET_srt}_static) + if (ENABLE_ENCRYPTION) diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index d06f669d29e49b..8f2654a9cc3ed2 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF v1.5.0 SHA512 68ab5fe316cfbbbba31b5b2354f657e23c90e14674f8dac01df2bf98c4776a7fafcd690a4dfad3a340e6be577a22360ca04ef2397c8a0dd507adebdd54dc22fb HEAD_REF master - PATCHES fix-dependency-install.patch + PATCHES + fix-dependency-install.patch + fix-static.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) diff --git a/ports/openssl/install-pc-files.cmake b/ports/openssl/install-pc-files.cmake index eb8d2b8c288473..04897faed78b2b 100644 --- a/ports/openssl/install-pc-files.cmake +++ b/ports/openssl/install-pc-files.cmake @@ -25,7 +25,7 @@ install_pc_file(libcrypto [[ Name: OpenSSL-libcrypto Description: OpenSSL cryptography library Libs: -L"${libdir}" -llibcrypto -Libs.private: -lcrypt32 -lws2_32 +Libs.private: -lcrypt32 -lws2_32 -ladvapi32 -luser32 Cflags: -I"${includedir}" ]]) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index b40155bdecc640..f96750f7ca4781 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version": "3.0.5", - "port-version": 4, + "port-version": 5, "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", diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json index 48c23accf60da2..4d2f2b13818800 100644 --- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vcpkg-ci-ffmpeg", "version-string": "1", - "port-version": 1, + "port-version": 2, "description": "Port to force features of certain ports within CI", "homepage": "https://github.com/microsoft/vcpkg", "dependencies": [ @@ -64,7 +64,8 @@ "fribidi", "modplug", "opencl", - "openh264" + "openh264", + "srt" ], "platform": "!uwp" }, diff --git a/versions/baseline.json b/versions/baseline.json index d388dec67adbd4..f1c68d0f393529 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5434,7 +5434,7 @@ }, "openssl": { "baseline": "3.0.5", - "port-version": 4 + "port-version": 5 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0918832a22aeca..5a37dac4583891 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "81adf5d3e80f0e54a7e968950860fed901186e85", + "git-tree": "42edfcee5ee9a8884b7c1733c6b560092cad9576", "version": "4.4.1", "port-version": 19 }, diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index 5dea9713067108..92f696814912b9 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "00e56b5f80be0e6a959bf121d906edb2255c7764", + "git-tree": "08022cd3b0ae3348a7af42013e5245fb5929d037", "version": "1.5.0", "port-version": 2 }, diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index bbcf02ac3f3926..58def969a298af 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "067a790dfd1559e77d5a199ccbe982322882d667", + "version": "3.0.5", + "port-version": 5 + }, { "git-tree": "557ff31f9a64f01cd0d98dd44793ce3c7fd32893", "version": "3.0.5", From 09d33fe16fc2f279a8d2ff9bd965b03581c8b427 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 9 Oct 2022 13:01:28 +0800 Subject: [PATCH 747/791] [opensubdiv] Upgrade to 3.4.4 (#26628) * [opensubdiv] upgrade to 3.4.4 * [opensubdiv] update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/opensubdiv/portfile.cmake | 18 +++++++++--------- ports/opensubdiv/vcpkg.json | 14 +++++--------- versions/baseline.json | 4 ++-- versions/o-/opensubdiv.json | 5 +++++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index 88cc74428c7bf9..f4356682e8f923 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -5,9 +5,9 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PixarAnimationStudios/OpenSubdiv - REF 82ab1b9f54c87fdd7e989a3470d53e137b8ca270 # 3.4.3 - SHA512 607cb9aa05d83a24bc2102bfd28abfec58f5723b1c56f6f431111ebf98f105ff7ca2a77610953acd21f73cb74d8d8ec68db3aeb11be1f9ca56d87c36c58dd095 - HEAD_REF master + REF ff76e0f2dc9c9202b7d2f965f264bfd6f41866d5 # 3.4.4 + SHA512 8839f29259664279b372bba21fcb925b01910631ed265fc20201beef6584c1f064134bf107dfc66709a3cd19e083f108e842ffbfff3f435ec8c7af2cd17d43e5 + HEAD_REF release PATCHES fix_compile-option.patch fix-version-search.patch @@ -24,9 +24,9 @@ if(VCPKG_TARGET_IS_LINUX) These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev") endif() -vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) -vcpkg_add_to_path("${PYTHON2_DIR}") +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) +vcpkg_add_to_path("${PYTHON3_DIR}") if (VCPKG_CRT_LINKAGE STREQUAL static) set(STATIC_CRT_LNK ON) @@ -46,9 +46,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "true-deriv-eval" OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES INVERTED_FEATURES + "opengl" NO_OPENGL "cuda" NO_CUDA "dx" NO_DX - "examples" NO_EXAMPLES "glew" NO_GLEW "glfw" NO_GLFW "glfw" NO_GLFW_X11 @@ -56,8 +56,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "opencl" NO_OPENCL "ptex" NO_PTEX "tbb" NO_TBB - "tutorials" NO_TUTORIALS - "opengl" NO_OPENGL ) set(OSD_EXTRA_OPTS) @@ -85,6 +83,8 @@ vcpkg_cmake_configure( -DNO_GLTESTS=ON -DNO_CLEW=ON -DNO_METAL=ON + -DNO_EXAMPLES=ON + -DNO_TUTORIALS=ON ${FEATURE_OPTIONS} ${OSD_EXTRA_OPTS} MAYBE_UNUSED_VARIABLES diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index 72a8f44305cafa..a1c713ceab8ff5 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opensubdiv", - "version-semver": "3.4.3", - "port-version": 5, + "version-semver": "3.4.4", "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", "license": "Apache-2.0", @@ -30,9 +29,6 @@ } ] }, - "examples": { - "description": "Enable examples build" - }, "glew": { "description": "Path to glew", "dependencies": [ @@ -55,7 +51,10 @@ ] }, "opengl": { - "description": "Enable OpenGL support" + "description": "Enable OpenGL", + "dependencies": [ + "opengl" + ] }, "ptex": { "description": "Path to Ptex", @@ -71,9 +70,6 @@ }, "true-deriv-eval": { "description": "Enable true derivative evaluation for Gregory basis patches" - }, - "tutorials": { - "description": "Enable tutorials build" } } } diff --git a/versions/baseline.json b/versions/baseline.json index f1c68d0f393529..e60350cb21ac75 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5449,8 +5449,8 @@ "port-version": 2 }, "opensubdiv": { - "baseline": "3.4.3", - "port-version": 5 + "baseline": "3.4.4", + "port-version": 0 }, "opentelemetry-cpp": { "baseline": "1.5.0", diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json index 0b41a6063e3912..83d3b6fa1891a4 100644 --- a/versions/o-/opensubdiv.json +++ b/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d058f08906d8b31c377aabeeab730d3a486d122", + "version-semver" : "3.4.4", + "port-version": 0 + }, { "git-tree": "a2aebb443eae8d15fc85fbeb0ffdb3774b1b09c8", "version-semver": "3.4.3", From 472e9f1a8bc5349ec21926fcfc6b2eb917cba01f Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Sun, 9 Oct 2022 01:11:08 -0400 Subject: [PATCH 748/791] [osg] Fix plugin installation and target locations (#26214) * [osg] Install plugins directly to plugins folder This change removes the stage in portfile.cmake which relocates the osg plugins from bin/ to plugins/. Instead, the OsgMacroUtils.cmake file is patched to install directly to the plugins folder. This has two primary effects. The first is correcting the exported target locations, as they still pointed to bin/ after moving the plugins. The second is fixing the process on non-Windows platforms, as the plugins were not being moved in those cases. * update version * update version * update version * [osg] Update version * [osg] Update port version * [osg] Fix port version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/osg/portfile.cmake | 11 ----------- ports/osg/unofficial-export.patch | 19 ++++++++++++++----- ports/osg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/osg.json | 5 +++++ 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index 701b470b850512..99c09ebec6b79b 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -138,18 +138,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(APPEND "${CURRENT_PACKAGES_DIR}/include/osg/Config" "#ifndef OSG_LIBRARY_STATIC\n#define OSG_LIBRARY_STATIC 1\n#endif\n") endif() -# Move all osg plugins to [/debug]/plugins/osgPlugins-${OSG_VER}, -# as a staging area for later deployment. set(osg_plugins_subdir "osgPlugins-${OSG_VER}") -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}" "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}") - if(NOT VCPKG_BUILD_TYPE) - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/${osg_plugins_subdir}" "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}") - endif() -endif() - if("tools" IN_LIST FEATURES) set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") diff --git a/ports/osg/unofficial-export.patch b/ports/osg/unofficial-export.patch index 1061f704de30d1..2142b112761905 100644 --- a/ports/osg/unofficial-export.patch +++ b/ports/osg/unofficial-export.patch @@ -22,25 +22,34 @@ index f6714c5..d58f6fd 100644 LIBRARY DESTINATION ${INSTALL_LIBDIR} COMPONENT libopenscenegraph ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} COMPONENT libopenscenegraph-dev diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake -index dcc1fe3..a12fcf1 100644 +index dcc1fe37d..76429b85a 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake -@@ -345,6 +345,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) +@@ -345,18 +350,20 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${OSG_PLUGINS} IF(WIN32) INSTALL(TARGETS ${TARGET_TARGETNAME} + EXPORT osg-plugins RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT} ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev - LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) -@@ -354,6 +355,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) +- LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) ++ LIBRARY DESTINATION plugins/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) + IF(MSVC AND DYNAMIC_OPENSCENEGRAPH) +- INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS RelWithDebInfo) +- INSTALL(FILES $ DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug) ++ INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION plugins/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS RelWithDebInfo) ++ INSTALL(FILES $ DESTINATION plugins/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug) ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH) ELSE(WIN32) INSTALL(TARGETS ${TARGET_TARGETNAME} + EXPORT osg-plugins RUNTIME DESTINATION bin COMPONENT ${PACKAGE_COMPONENT} ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev - LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) +- LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) ++ LIBRARY DESTINATION plugins${LIB_POSTFIX}/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT}) + ENDIF(WIN32) + ENDMACRO(SETUP_PLUGIN) + diff --git a/src/OpenThreads/pthreads/CMakeLists.txt b/src/OpenThreads/pthreads/CMakeLists.txt index e18969c..5a8ad62 100644 --- a/src/OpenThreads/pthreads/CMakeLists.txt diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index a72f9314b7c6e0..34daa77fea1bf0 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version": "3.6.5", - "port-version": 17, + "port-version": 18, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://www.openscenegraph.com/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e60350cb21ac75..e5fd5fb5922912 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5506,7 +5506,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 17 + "port-version": 18 }, "osg-qt": { "baseline": "Qt5", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index a4264c3c4a912e..2db46a0915d37f 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb957f4950031c9c7fedfbcfe1ba698cc435dedd", + "version": "3.6.5", + "port-version": 18 + }, { "git-tree": "e29f8e57a49cb782817b890b77b3f0ec06afe3c0", "version": "3.6.5", From ef91cf7b8d0406942a149bb277e104857ca0df45 Mon Sep 17 00:00:00 2001 From: talregev Date: Sun, 9 Oct 2022 23:54:29 +0300 Subject: [PATCH 749/791] [ignition-tools] new port (#27078) * Add ignition-tools * Fix installation * add supports field * version * typo * version Co-authored-by: JackBoosY --- ports/ignition-tools/portfile.cmake | 43 +++++++++++++++++++++++++++++ ports/ignition-tools/vcpkg.json | 18 ++++++++++++ versions/baseline.json | 4 +++ versions/i-/ignition-tools.json | 9 ++++++ 4 files changed, 74 insertions(+) create mode 100644 ports/ignition-tools/portfile.cmake create mode 100644 ports/ignition-tools/vcpkg.json create mode 100644 versions/i-/ignition-tools.json diff --git a/ports/ignition-tools/portfile.cmake b/ports/ignition-tools/portfile.cmake new file mode 100644 index 00000000000000..58e821cb31028a --- /dev/null +++ b/ports/ignition-tools/portfile.cmake @@ -0,0 +1,43 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO gazebosim/gz-tools + REF ignition-tools_1.5.0 + SHA512 3e8267fc16295e269a1fb4867235bca858fea0f5f048831b0dc5f087907897042edb0f4757aef1bad824f3f109959286a441ca5315b6815c557e7deba9f8d151 + HEAD_REF ign-tools1 +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +# Fix cmake targets and pkg-config file location +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/ignition-tools") +vcpkg_fixup_pkgconfig() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(GLOB DEBUG_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*") + file(COPY ${DEBUG_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}") +endif() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(GLOB RELEASE_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*") + file(COPY ${RELEASE_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ignition-tools/vcpkg.json b/ports/ignition-tools/vcpkg.json new file mode 100644 index 00000000000000..3d0704e3ee1599 --- /dev/null +++ b/ports/ignition-tools/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-tools", + "version": "1.5.0", + "description": "Gazebo tools provide the ign command line tool that accepts multiple subcommands.", + "homepage": "https://gazebosim.org", + "license": "Apache-2.0", + "supports": "!(arm & windows) & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e5fd5fb5922912..3cc2ee3c8183f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3012,6 +3012,10 @@ "baseline": "1.1.0", "port-version": 2 }, + "ignition-tools": { + "baseline": "1.5.0", + "port-version": 0 + }, "ignition-transport4": { "baseline": "4.0.0", "port-version": 6 diff --git a/versions/i-/ignition-tools.json b/versions/i-/ignition-tools.json new file mode 100644 index 00000000000000..27201bf426c32b --- /dev/null +++ b/versions/i-/ignition-tools.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5567f256c2183bacba71d78d26362a1b76021bcf", + "version": "1.5.0", + "port-version": 0 + } + ] +} From 125df1bb8a9e1d9780ad051d181abb8e9546d7d8 Mon Sep 17 00:00:00 2001 From: "Ryan A. Pavlik" Date: Sun, 9 Oct 2022 15:57:27 -0500 Subject: [PATCH 750/791] [boringssl] Add pkg-config file so it still works with gRPC (#27082) * [boringssl] Add pkg-config file so it still works with gRPC * Update baseline --- ports/boringssl/install-pc-files.cmake | 39 ++++++++++++++++++++++++++ ports/boringssl/openssl.pc.in | 6 ++++ ports/boringssl/portfile.cmake | 2 ++ ports/boringssl/vcpkg.json | 4 +-- versions/b-/boringssl.json | 5 ++++ versions/baseline.json | 2 +- 6 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 ports/boringssl/install-pc-files.cmake create mode 100644 ports/boringssl/openssl.pc.in diff --git a/ports/boringssl/install-pc-files.cmake b/ports/boringssl/install-pc-files.cmake new file mode 100644 index 00000000000000..f86652f2720165 --- /dev/null +++ b/ports/boringssl/install-pc-files.cmake @@ -0,0 +1,39 @@ +function(install_pc_file name pc_data) + # fix platform-specific details + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + string(REPLACE "-llibssl" "-lssl" pc_data "${pc_data}") + string(REPLACE "-llibcrypt" "-lcrypto" pc_data "${pc_data}") + string(REPLACE "-lcrypt32" "" pc_data "${pc_data}") + string(REPLACE "-lws2_32" "" pc_data "${pc_data}") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY) + endif() +endfunction() + +install_pc_file(openssl [[ +Name: BoringSSL +Description: Secure Sockets Layer and cryptography libraries and tools +Requires: libssl libcrypto +]]) + +install_pc_file(libssl [[ +Name: BoringSSL-libssl +Description: Secure Sockets Layer and cryptography libraries +Libs: -L"${libdir}" -llibssl +Requires: libcrypto +Cflags: -I"${includedir}" +]]) + +install_pc_file(libcrypto [[ +Name: BoringSSL-libcrypto +Description: OpenSSL cryptography library +Libs: -L"${libdir}" -llibcrypto +Libs.private: -lcrypt32 -lws2_32 +Cflags: -I"${includedir}" +]]) + +vcpkg_fixup_pkgconfig() diff --git a/ports/boringssl/openssl.pc.in b/ports/boringssl/openssl.pc.in new file mode 100644 index 00000000000000..3033e1804da0f4 --- /dev/null +++ b/ports/boringssl/openssl.pc.in @@ -0,0 +1,6 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +Version: @OPENSSL_VERSION@ +@pc_data@ diff --git a/ports/boringssl/portfile.cmake b/ports/boringssl/portfile.cmake index be9ed1ee86478b..94c11088653eb8 100644 --- a/ports/boringssl/portfile.cmake +++ b/ports/boringssl/portfile.cmake @@ -41,6 +41,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") + if(IS_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/boringssl) vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/boringssl") endif() diff --git a/ports/boringssl/vcpkg.json b/ports/boringssl/vcpkg.json index 9d0affcbbaaa9c..40331383875fb9 100644 --- a/ports/boringssl/vcpkg.json +++ b/ports/boringssl/vcpkg.json @@ -1,8 +1,8 @@ { "name": "boringssl", "version-date": "2021-06-23", - "port-version": 2, - "description": "BoringSSl is a fork of OpenSSL developed by Google", + "port-version": 3, + "description": "BoringSSL is a fork of OpenSSL developed by Google", "homepage": "https://boringssl.googlesource.com/boringssl", "supports": "!uwp", "dependencies": [ diff --git a/versions/b-/boringssl.json b/versions/b-/boringssl.json index 4f560eae8d2719..893c242e80b68b 100644 --- a/versions/b-/boringssl.json +++ b/versions/b-/boringssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb83700b7bf53177773421dfb803fb8478e6a72d", + "version-date": "2021-06-23", + "port-version": 3 + }, { "git-tree": "8d28c72d322cf2245e69075deef73c5edefee0b5", "version-date": "2021-06-23", diff --git a/versions/baseline.json b/versions/baseline.json index 3cc2ee3c8183f5..f0de32e1eacc4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1162,7 +1162,7 @@ }, "boringssl": { "baseline": "2021-06-23", - "port-version": 2 + "port-version": 3 }, "botan": { "baseline": "2.19.1", From 404b948f2638c96446576a35c7014fde1f828da6 Mon Sep 17 00:00:00 2001 From: MonicaLiu <110024546+MonicaLiu0311@users.noreply.github.com> Date: Mon, 10 Oct 2022 04:58:09 +0800 Subject: [PATCH 751/791] [libical] update to 3.0.15 (#27151) * Update to 3.0.15 * update version Co-authored-by: Monica --- ports/libical/portfile.cmake | 4 ++-- ports/libical/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/l-/libical.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/libical/portfile.cmake b/ports/libical/portfile.cmake index 6c5c25dea1b448..de1c7da71ba689 100644 --- a/ports/libical/portfile.cmake +++ b/ports/libical/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libical/libical - REF v3.0.11 - SHA512 cdee86c50edc2373ab2024d7d4ae26dd4b9a728dbc13083472c4923c67f61ff3cef7d43edca762c6a11979d2040fc1576a033eaa23a19e58af8f14a7d67fc139 + REF 408c598eea3d40c728df4e7dfd78dcdcc132c377 #v3.0.15 + SHA512 7b25f3eab1b81621eb4704943bf9c69f5bb37a3d1489f84e95febb69073fa583877649a3d1109679962175f57f953547601e02349f034eb95b5eda8cfcec6f71 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/libical/vcpkg.json b/ports/libical/vcpkg.json index 15687e5e680617..830bc97a71ab7c 100644 --- a/ports/libical/vcpkg.json +++ b/ports/libical/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libical", - "version": "3.0.11", - "port-version": 1, + "version": "3.0.15", "description": "Reference implementation of the iCalendar data type and serialization format", "homepage": "https://github.com/libical/libical", + "license": "MPL-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index f0de32e1eacc4d..d5ed974e52b659 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3801,8 +3801,8 @@ "port-version": 0 }, "libical": { - "baseline": "3.0.11", - "port-version": 1 + "baseline": "3.0.15", + "port-version": 0 }, "libice": { "baseline": "1.0.10", diff --git a/versions/l-/libical.json b/versions/l-/libical.json index 11b501ee57a727..eb6617737a1854 100644 --- a/versions/l-/libical.json +++ b/versions/l-/libical.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebb6d5999a0382ec8845da8fc473fa794a4f5aee", + "version": "3.0.15", + "port-version": 0 + }, { "git-tree": "409bb4044895d73c1af9720e1d77f8ef46eafb73", "version": "3.0.11", From cb423b30a07fb7d992cd68d2337fbf3a63ec4cd6 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sun, 9 Oct 2022 22:59:27 +0200 Subject: [PATCH 752/791] draco: Update to 1.5.3 (#27145) --- ports/draco/disable-symlinks.patch | 14 ++++++-------- ports/draco/portfile.cmake | 12 +++++------- ports/draco/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/draco.json | 5 +++++ 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ports/draco/disable-symlinks.patch b/ports/draco/disable-symlinks.patch index 62221b9830dbde..feca85f15a03fc 100644 --- a/ports/draco/disable-symlinks.patch +++ b/ports/draco/disable-symlinks.patch @@ -1,19 +1,18 @@ diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake -index f2acc72..fb8ce4a 100644 +index f96dbb1..179b9f9 100644 --- a/cmake/draco_targets.cmake +++ b/cmake/draco_targets.cmake -@@ -102,10 +102,6 @@ macro(draco_add_executable) - +@@ -103,9 +103,6 @@ macro(draco_add_executable) add_executable(${exe_NAME} ${exe_SOURCES}) + target_compile_features(${exe_NAME} PRIVATE cxx_std_11) - if(NOT EMSCRIPTEN) - set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) - endif() -- + if(exe_OUTPUT_NAME) set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) - endif() -@@ -337,15 +333,6 @@ macro(draco_add_library) +@@ -340,14 +337,6 @@ macro(draco_add_library) set_target_properties(${lib_NAME} PROPERTIES PREFIX "") endif() @@ -25,7 +24,6 @@ index f2acc72..fb8ce4a 100644 - ${DRACO_SOVERSION_MAJOR}) - endif() - endif() -- + if(BUILD_SHARED_LIBS AND (MSVC OR WIN32)) if(lib_TYPE STREQUAL SHARED) - target_compile_definitions(${lib_NAME} PRIVATE "DRACO_BUILDING_DLL=1") diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index 1ae5d45e476cd8..d34619dde7ae55 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF bd1e8de7dd0596c2cbe5929cbe1f5d2257cd33db #v1.5.2 - SHA512 6ae7e72a9f6f55563f8f612084d38bff1d2e10934fa84aad59538d323e59d205764ed364c753a55d80e9ffc7c17f542f6475b3f922edcb9085cbd83a942759d0 + REF 1.5.3 + SHA512 8575ea78e0d8025facddbd42453b0251387f4e31eb0854135e050fc26aaf0d28ed30ccc3f93578fdc6cdb50369c2ef735291f1f5fb60238b289e0ee019446e1d HEAD_REF master PATCHES fix-compile-error-uwp.patch @@ -18,7 +18,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) vcpkg_fixup_pkgconfig() # Install tools and plugins @@ -29,10 +29,8 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index a2f5617e3036ba..3fedb46f23d339 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,6 +1,6 @@ { "name": "draco", - "version": "1.5.2", + "version": "1.5.3", "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.", "homepage": "https://github.com/google/draco", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index d5ed974e52b659..c7b30d318a1faa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2009,7 +2009,7 @@ "port-version": 0 }, "draco": { - "baseline": "1.5.2", + "baseline": "1.5.3", "port-version": 0 }, "drlibs": { diff --git a/versions/d-/draco.json b/versions/d-/draco.json index 3c06f24600d818..dace9381ae2f66 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4f39e03fdf47c2c1e9a945b362ed52ec098a354", + "version": "1.5.3", + "port-version": 0 + }, { "git-tree": "39effb9dbafcf8540c1e99bacc9a2701ab9f94a1", "version": "1.5.2", From 083f103cfb6ff4a05d6c49b6a2231965e08b6e2b Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 9 Oct 2022 23:00:18 +0200 Subject: [PATCH 753/791] [rapidfuzz] new port (#27133) --- ports/rapidfuzz/portfile.cmake | 18 ++++++++++++++++++ ports/rapidfuzz/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/r-/rapidfuzz.json | 9 +++++++++ 4 files changed, 48 insertions(+) create mode 100644 ports/rapidfuzz/portfile.cmake create mode 100644 ports/rapidfuzz/vcpkg.json create mode 100644 versions/r-/rapidfuzz.json diff --git a/ports/rapidfuzz/portfile.cmake b/ports/rapidfuzz/portfile.cmake new file mode 100644 index 00000000000000..45dced19f28dcb --- /dev/null +++ b/ports/rapidfuzz/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO maxbachmann/rapidfuzz-cpp + REF 87ee0dd61289fa6d7d0d2b5716f5363ee6b38fb7 # rapidfuzz-1.8.0 + SHA512 c1d7c69a291e381453ccad4053353c75fa94288e850183f0b133f617e2b77cae80c9989753fed236e196eb445d821af5dd7e329acbe4994d5a96ab1318af9cf9 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +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/ports/rapidfuzz/vcpkg.json b/ports/rapidfuzz/vcpkg.json new file mode 100644 index 00000000000000..2a095b98d02ebe --- /dev/null +++ b/ports/rapidfuzz/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "rapidfuzz", + "version": "1.8.0", + "description": "Rapid fuzzy string matching library for C++17 using the Levenshtein Distance.", + "homepage": "https://github.com/maxbachmann/rapidfuzz-cpp", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c7b30d318a1faa..92d30e6703489c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6368,6 +6368,10 @@ "baseline": "8.64", "port-version": 0 }, + "rapidfuzz": { + "baseline": "1.8.0", + "port-version": 0 + }, "rapidjson": { "baseline": "2022-06-28", "port-version": 3 diff --git a/versions/r-/rapidfuzz.json b/versions/r-/rapidfuzz.json new file mode 100644 index 00000000000000..5215e99a80568b --- /dev/null +++ b/versions/r-/rapidfuzz.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e4ccc785af13a54ced4b4333612323f98a85b68b", + "version": "1.8.0", + "port-version": 0 + } + ] +} From 7178ff95918325b9c1492aa2acc679370caab0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Mon, 10 Oct 2022 23:40:13 +0800 Subject: [PATCH 754/791] [fmt] Update to 9.1.0 (#27162) * [fmt] Update to 9.1.0 * version --- ports/fmt/portfile.cmake | 4 ++-- ports/fmt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index 33558c894dd2d8..f5f819a01a94f5 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 9.0.0 - SHA512 f9612a53c93654753572ac038e52c683f3485691493750d5c2fdb48f3a769e181bfeab8035041cae02bf14cd67df30ec3c5614d7db913f85699cd9da8072bdf8 + REF 9.1.0 + SHA512 a18442042722dd48e20714ec034a12fcc0576c9af7be5188586970e2edf47529825bdc99af366b1d5891630c8dbf6f63bfa9f012e77ab3d3ed80d1a118e3b2be HEAD_REF master PATCHES fix-write-batch.patch diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index a98bb9a53fae80..fe124bafa3143b 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fmt", - "version": "9.0.0", + "version": "9.1.0", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 92d30e6703489c..220ad724e01b15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2369,7 +2369,7 @@ "port-version": 4 }, "fmt": { - "baseline": "9.0.0", + "baseline": "9.1.0", "port-version": 0 }, "folly": { diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index c03fc52dde7395..20820c0b0b7737 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b098485b148fcd89fc3e872232dd4f2687a1bb1b", + "version": "9.1.0", + "port-version": 0 + }, { "git-tree": "9268e89cdadcbb0a54357f47b343004200970a02", "version": "9.0.0", From 42cc830d874f8e24eb4eb05bd5bb28496e3d498c Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Mon, 10 Oct 2022 23:40:53 +0800 Subject: [PATCH 755/791] [simdjson] update to 3.0.0 (#27148) * [simdjson] update to 3.0.0 * update version * update version * update version --- ports/simdjson/portfile.cmake | 6 ++++-- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 2de973ea890832..7d839c4e8f02b3 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 933c2ebeacf9a1df12acd9a6781e590cad2f81f7 # v2.2.2 + REF d520062f8ec066af53d6b52f202f88af7d5c0e1e # v3.0.0 HEAD_REF master - SHA512 6dda3fbbba7e788adc7b29710c2b08c428a180fadd298c4129a5856e65de1d947b38ecff0098fcd29ad98923e14910ba77eaedbd3d3a9fa3a0c49c686ecbb1b4 + SHA512 f6e4b674641b7e42ecac007b7f95f0dcaa9990d781271cea553bd905d9164d9da67896ad10fa9a41a6bd485af80c0828ede8900a333e4550b7aa8b143b9fb200 ) vcpkg_check_features( @@ -36,6 +36,8 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_fixup_pkgconfig() + 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 diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 81540da7ee756f..0fa8eb6ed25ae2 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-semver": "2.2.2", + "version": "3.0.0", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 220ad724e01b15..14f152dad13e6a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6821,7 +6821,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "2.2.2", + "baseline": "3.0.0", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 99a81134294dde..83a150f853f366 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c95c564acc1c64834298385fbb154740081f3fd", + "version": "3.0.0", + "port-version": 0 + }, { "git-tree": "5c24527f443a4881e16cb242e4b323904c0318d4", "version-semver": "2.2.2", From 3836f23e76d7d859ad9b002c7c1c18f97f472731 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 12 Oct 2022 04:14:36 -0400 Subject: [PATCH 756/791] [Azure SDK Key Vault] Update to Oct Release Keys, Certificates and Secrets (#27186) * [azure-security-keyvault-keys-cpp] Update to 4.3.0 ## 4.3.0 (2022-10-11) ### Features Added - Keyvault 7.3 support added for Keys. * [azure-security-keyvault-secrets-cpp] Update to 4.1.0 ## 4.1.0 (2022-10-11) ### Features Added - Keyvault 7.3 support added for Secrets. * not-specified --- .../azure-security-keyvault-certificates-cpp/portfile.cmake | 4 ++-- ports/azure-security-keyvault-certificates-cpp/vcpkg.json | 4 ++-- ports/azure-security-keyvault-keys-cpp/portfile.cmake | 4 ++-- ports/azure-security-keyvault-keys-cpp/vcpkg.json | 4 ++-- ports/azure-security-keyvault-secrets-cpp/portfile.cmake | 4 ++-- ports/azure-security-keyvault-secrets-cpp/vcpkg.json | 4 ++-- versions/a-/azure-security-keyvault-certificates-cpp.json | 5 +++++ versions/a-/azure-security-keyvault-keys-cpp.json | 5 +++++ versions/a-/azure-security-keyvault-secrets-cpp.json | 5 +++++ versions/baseline.json | 6 +++--- 10 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake index f44a8c9e81d6dd..cd0d8c43820f2a 100644 --- a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-certificates_4.0.0 - SHA512 c91d745ab009c5e66081785ba2f7279b7fad388c2f28c92e8d3c3c77a59157b8f7663e59474b325f669bc6e22aa820e7397d3a6813388133d2fa34b145b883e0 + REF azure-security-keyvault-certificates_4.1.0 + SHA512 fc07f48d82d0475b28a62ce9de386433908d94b00678cd89c8310cdb6f8dd3e0e973936191f10be08af7b0293b7b434223c3682de4a06f0b4b067baf37e8e0b3 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json index 79da613d8c11a4..dc1aec87a7e9ba 100644 --- a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-certificates-cpp", - "version-semver": "4.0.0", + "version-semver": "4.1.0", "description": [ "Microsoft Azure Key Vault Certificates SDK for C++", "This library provides Azure Key Vault Certificates SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.3.1" + "version>=": "1.5.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 890652a7c333d6..9c8413d7fdb01e 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-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-keys_4.2.0 - SHA512 b7556019a23344c109f62120c9fc0451f81bf476700ef08c6968a3e731fa783522b2f9b4de411e6727cb1cb977cc4344303e32d825515c192544bb78d9517c32 + REF azure-security-keyvault-keys_4.3.0 + SHA512 e2c6555d5c89c73c015356de1fbda3274186000710ba75d85b233a3b00bd50b7ee9ea0c527aa408503ba9781dffe7b849a5c3e6e239d41187e7752663e43b9ea ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index b214ba2dda913a..2d1ae6215534b5 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.2.0", + "version-semver": "4.3.0", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.2.0" + "version>=": "1.5.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake index bef3d9cececd00..d5e16e3435c410 100644 --- a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-secrets_4.0.0 - SHA512 b82652debc1ce6d230ebd60fb5fab545fe633760f6be32a59bcef80ae2458a78150d072b599b91287fe9ec0d7e3b7e3852a54ddec319a5fcceacd095579abcdc + REF azure-security-keyvault-secrets_4.1.0 + SHA512 82deeda461aaac3d38adcf1080ecd0b8883dfb6c5e9db6b86deaac2e6d683dac3e97998afeb9a1657da715f9e46f25f9b9a6c4938ade0a1979b1136291d66e7f ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json index 4f9f9b2c4bf274..95bfc889e0737c 100644 --- a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-secrets-cpp", - "version-semver": "4.0.0", + "version-semver": "4.1.0", "description": [ "Microsoft Azure Key Vault Secrets SDK for C++", "This library provides Azure Key Vault Secrets SDK." @@ -11,7 +11,7 @@ { "name": "azure-core-cpp", "default-features": false, - "version>=": "1.3.1" + "version>=": "1.5.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json index 6f5ae12e383368..b12d34b709e207 100644 --- a/versions/a-/azure-security-keyvault-certificates-cpp.json +++ b/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f575471af05af66923fe548074d30f1aa0fdc2c", + "version-semver": "4.1.0", + "port-version": 0 + }, { "git-tree": "c24da36700f623cd4c2242dcd6a7dae58673a97c", "version-semver": "4.0.0", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 2e20c672f2b636..f21e164fed2b2a 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4d8db5aff7d24803e3a2605d3bf3051343fb9a0", + "version-semver": "4.3.0", + "port-version": 0 + }, { "git-tree": "c2a617f9326c712866be1e5218a1ae18262ee178", "version-semver": "4.2.0", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json index 801b25dc98951b..d985aa4e378d1c 100644 --- a/versions/a-/azure-security-keyvault-secrets-cpp.json +++ b/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b5d805e78f564ff27138c6f005175979b6740c6", + "version-semver": "4.1.0", + "port-version": 0 + }, { "git-tree": "8129639c271f03d256499116ce6f6572ba11eb87", "version-semver": "4.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 14f152dad13e6a..711b91e16d3e34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -373,15 +373,15 @@ "port-version": 0 }, "azure-security-keyvault-certificates-cpp": { - "baseline": "4.0.0", + "baseline": "4.1.0", "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.2.0", + "baseline": "4.3.0", "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { - "baseline": "4.0.0", + "baseline": "4.1.0", "port-version": 0 }, "azure-storage-blobs-cpp": { From f0a322f2ca2ff0cb8a31868949f277d2d708b91b Mon Sep 17 00:00:00 2001 From: vividos Date: Wed, 12 Oct 2022 10:15:24 +0200 Subject: [PATCH 757/791] [sdl2-mixer] don't build samples (#27182) --- ports/sdl2-mixer/portfile.cmake | 1 + ports/sdl2-mixer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sdl2-mixer.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 589356a265e36b..678c599cf16a15 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_cmake_configure( OPTIONS ${FEATURE_OPTIONS} -DSDL2MIXER_VENDORED=OFF + -DSDL2MIXER_SAMPLES=OFF ) vcpkg_cmake_install() diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 94ff15c90a7a31..9ccc7dacd517ac 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-mixer", "version": "2.6.1", - "port-version": 1, + "port-version": 2, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://github.com/libsdl-org/SDL_mixer", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 711b91e16d3e34..690bc21b8d5222 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6698,7 +6698,7 @@ }, "sdl2-mixer": { "baseline": "2.6.1", - "port-version": 1 + "port-version": 2 }, "sdl2-net": { "baseline": "2.0.1", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index 9651f7b61d1b5f..35d2e86ad672fc 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6994c429d80fd95894a448a6bb55260563cc3946", + "version": "2.6.1", + "port-version": 2 + }, { "git-tree": "c06711b92dfd4c048f6a56c0236697012094a6e5", "version": "2.6.1", From 2111a4872b4124ee92c9e707f8a930fda4b57346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20P=C4=85czkowski?= Date: Wed, 12 Oct 2022 01:16:27 -0700 Subject: [PATCH 758/791] [mp3lame] allow universal macos builds (#27171) --- ports/mp3lame/add-macos-universal-config.patch | 12 ++++++++++++ ports/mp3lame/portfile.cmake | 1 + ports/mp3lame/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mp3lame.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/mp3lame/add-macos-universal-config.patch diff --git a/ports/mp3lame/add-macos-universal-config.patch b/ports/mp3lame/add-macos-universal-config.patch new file mode 100644 index 00000000000000..900f548deabeef --- /dev/null +++ b/ports/mp3lame/add-macos-universal-config.patch @@ -0,0 +1,12 @@ +diff --git a/config.sub b/config.sub +index 3580aaf..bf099fc 100755 +--- a/config.sub ++++ b/config.sub +@@ -439,6 +439,7 @@ case $basic_machine in + | tile*-* \ + | tron-* \ + | ubicom32-* \ ++ | universal-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ diff --git a/ports/mp3lame/portfile.cmake b/ports/mp3lame/portfile.cmake index 6d70733475daca..a7ad3f76f5eeff 100644 --- a/ports/mp3lame/portfile.cmake +++ b/ports/mp3lame/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_sourceforge( PATCHES 00001-msvc-upgrade-solution-up-to-vc11.patch remove_lame_init_old_from_symbol_list.patch # deprecated https://github.com/zlargon/lame/blob/master/include/lame.h#L169 + add-macos-universal-config.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/mp3lame/vcpkg.json b/ports/mp3lame/vcpkg.json index 13eda2965bc392..85da20da0ae015 100644 --- a/ports/mp3lame/vcpkg.json +++ b/ports/mp3lame/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mp3lame", "version": "3.100", - "port-version": 8, + "port-version": 9, "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.", "homepage": "https://sourceforge.net/projects/lame", "license": "LGPL-2.0-only" diff --git a/versions/baseline.json b/versions/baseline.json index 690bc21b8d5222..d1c1daf3d5901f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4870,7 +4870,7 @@ }, "mp3lame": { "baseline": "3.100", - "port-version": 8 + "port-version": 9 }, "mpark-variant": { "baseline": "1.4.0", diff --git a/versions/m-/mp3lame.json b/versions/m-/mp3lame.json index 4389fec3aeffcf..d18d98133d66e5 100644 --- a/versions/m-/mp3lame.json +++ b/versions/m-/mp3lame.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e24c300cc7a378ed1355ca4edba742a11d0d7a7a", + "version": "3.100", + "port-version": 9 + }, { "git-tree": "bd7f2793ec89d5ce9c00b4b9848a80905eb7ab67", "version": "3.100", From ede90f9507d1386d70a2ef175b01f1efb483784c Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 12 Oct 2022 10:17:16 +0200 Subject: [PATCH 759/791] [sdl2] update to 2.24.1 (#27168) --- ports/sdl2/portfile.cmake | 6 +++--- ports/sdl2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 9083b898280984..53c52c6b3458ac 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,9 +1,9 @@ -set(SDL2_VERSION 2.24.0) +set(SDL2_VERSION 2.24.1) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsdl-org/SDL - REF 8c9beb0c873f6ca5efbd88f1ad2648bfc793b2ac #vrelease-2.24.0 - SHA512 7936fc3de9920eafe399f5b2af7bf87d479d4ba8c4a7957da90f3a90316dc7a6b8619ffd7a2c198d298d390e1235e00f9bd36fe3f04102bdff351b96c2ade59e + REF a1d1946dcba6509f0679f507b57e7b228d32e6f8 #vrelease-2.24.1 + SHA512 78794c5142153d9d7516815f6e9b2c153ab3cab466cbc35635d27d9bb7cd9cbfa2bb66b63569454d2de89975eba8a662d79ccba87204a263ddbf0bfd339b6926 HEAD_REF master PATCHES 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 6440727e26e91b..2f8da085e12b8a 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sdl2", - "version": "2.24.0", + "version": "2.24.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", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index d1c1daf3d5901f..e888d86e51c08d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6685,7 +6685,7 @@ "port-version": 4 }, "sdl2": { - "baseline": "2.24.0", + "baseline": "2.24.1", "port-version": 0 }, "sdl2-gfx": { diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index f47842658c7fc1..90d0939a9a7f75 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "565601c4ca1fdc5656fa7c474f0a50af24073a0c", + "version": "2.24.1", + "port-version": 0 + }, { "git-tree": "dbd3f6b2c738602adc3b3aa7c314212bff79b620", "version": "2.24.0", From 28272621b8e3ba79f48fd45d7a580cc7216a624e Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 12 Oct 2022 04:18:05 -0400 Subject: [PATCH 760/791] [Azure Storage] Update to October Release (#27175) * [azure-storage-blobs-cpp] Update to 12.6.2 ## 12.6.2 (2022-10-11) ### Other Changes - No public changes in this release. * [azure-storage-files-shares-cpp] Update to 12.3.0 ## 12.3.0 (2022-10-11) ### Features Added - New features in `12.3.0-beta.1` are now generally available. --- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 2 +- ports/azure-storage-files-shares-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-shares-cpp/vcpkg.json | 4 ++-- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 0b374f79e5c924..8772788d56650a 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/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.6.1 - SHA512 160ec230c300f568f8abbaa08ac6f95cd29a8abbaf67474ea1de70c20db974efed3bd600284c3151457ccc762c58452839c4520d6c1c74c548300a414d405801 + REF azure-storage-blobs_12.6.2 + SHA512 3f92ec18500be9904e577f36549631903e40f43ea33a83fce4a4646d7d0fc426be9611f459a847452db3e31c887c2121b77054926aadcab00fbc614f26a724d9 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index ae37d635b5b60a..78b0f74cdf168f 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.6.1", + "version-semver": "12.6.2", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 21dacef3ab9eee..e82ae3f2ae6d72 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.2.1 - SHA512 c3fd61496833fd90984c20c3ec6f3be663dda922458a7984ce6010c82df28a546f2e24f7d3690f327b22dbdf2abc669f12ebc182f43ba171111ece0450dbe35c + REF azure-storage-files-shares_12.3.0 + SHA512 baecf1dde71108491d29aa85276c73723a2afc7bbde0e78f62460a8b2fa065a25296239e8082cf75f744a7237a93fd5cba20541b437e2d32cb40599ba8fe722a ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 0d0d853eb5a427..be57f18fcdd2f4 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.2.1", + "version-semver": "12.3.0", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -11,7 +11,7 @@ { "name": "azure-storage-common-cpp", "default-features": false, - "version>=": "12.2.2" + "version>=": "12.3.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index ba2990934f293f..3bdcf834108d8f 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e223f3564c58888a32c160c7f15b3bcb15bc5c71", + "version-semver": "12.6.2", + "port-version": 0 + }, { "git-tree": "06433ca908b304e85f642fc3b062db522567bd7c", "version-semver": "12.6.1", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 19d79ba64d3af3..f741add6035c62 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3791a056ef7f63ea5aa462db437ebc61b2966336", + "version-semver": "12.3.0", + "port-version": 0 + }, { "git-tree": "69a5e9af5d75d9e2f33dbd89576297373a332048", "version-semver": "12.2.1", diff --git a/versions/baseline.json b/versions/baseline.json index e888d86e51c08d..a40e67bdb4d988 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -385,7 +385,7 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.6.1", + "baseline": "12.6.2", "port-version": 0 }, "azure-storage-common-cpp": { @@ -401,7 +401,7 @@ "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.2.1", + "baseline": "12.3.0", "port-version": 0 }, "azure-storage-queues-cpp": { From e1a1ddd093795bfba0231e43d29e688f25b572f2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:21:25 +0200 Subject: [PATCH 761/791] [Qt3D] add missing qt port (#26928) * bump qtbase * add qt3d * format manifest * test features in CI * pass ci baseline stuff * vulkan is skip in ci so cannot force it. * remove extra , * fix deps * try to fix promotion * gstreamer adjustments. * fix gstreamer on linux * fix gstreamer stuff * fix x264 api import macro * fix gst-rsp-server * correctly replace * promote targets.... * enable arm64 qtwebengine * --trace-expand * install wrapper for egl. * add newline * remove opengl from skip list * add gl to link * another try * retry again * test dynamic angle linkage * retry * link XNVCtrl * retry * add libxnvctrl * retry * retry again... * move wrapper to angle * revert changes to egl-reg * more debugging * try again * fix stuff * add missing , * egl stuff * wrapper stuff * fix angle * remove double dep * remove libxnvctrl * format manifest * revert trace * bump version * bump v * v db * remove trace * v db * refine supports * v db * remove qtmultimedia from baseline --- ports/angle/CMakeLists.txt | 29 ++--- ports/angle/portfile.cmake | 19 ++-- ports/angle/vcpkg.json | 22 +++- ports/egl-registry/portfile.cmake | 2 + ports/egl-registry/vcpkg-cmake-wrapper.cmake | 8 ++ ports/egl-registry/vcpkg.json | 1 + ports/qt/vcpkg.json | 19 +++- ports/qt3d/portfile.cmake | 35 ++++++ ports/qt3d/vcpkg.json | 106 +++++++++++++++++++ ports/qtbase/cmake/qt_port_data.cmake | 1 + ports/qtbase/cmake/qt_port_details.cmake | 3 +- ports/qtbase/vcpkg.json | 1 + ports/qtinterfaceframework/portfile.cmake | 3 + ports/qtinterfaceframework/vcpkg.json | 1 + ports/qtmultimedia/portfile.cmake | 1 + ports/qtmultimedia/vcpkg.json | 6 +- ports/qtwebengine/portfile.cmake | 2 +- ports/qtwebengine/vcpkg.json | 7 +- scripts/ci.baseline.txt | 18 +++- versions/a-/angle.json | 5 + versions/baseline.json | 18 ++-- versions/e-/egl-registry.json | 5 + versions/q-/qt.json | 5 + versions/q-/qt3d.json | 9 ++ versions/q-/qtbase.json | 5 + versions/q-/qtinterfaceframework.json | 5 + versions/q-/qtmultimedia.json | 5 + versions/q-/qtwebengine.json | 5 + 28 files changed, 299 insertions(+), 47 deletions(-) create mode 100644 ports/egl-registry/vcpkg-cmake-wrapper.cmake create mode 100644 ports/qt3d/portfile.cmake create mode 100644 ports/qt3d/vcpkg.json create mode 100644 versions/q-/qt3d.json diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 184f5c951826ba..c1896d2db33572 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -98,7 +98,8 @@ file(GLOB ANGLE_COMMON_SOURCES "src/common/third_party/xxhash/*.h" "src/common/third_party/xxhash/*.c" "src/common/third_party/smhasher/src/*.h" - "src/common/third_party/smhasher/src/*.cpp") + "src/common/third_party/smhasher/src/*.cpp" + ) list(FILTER ANGLE_COMMON_SOURCES EXCLUDE REGEX "_unittest|event_tracer|${ANGLE_COMMON_PLATFORM_FILTER}") add_library(angle_common OBJECT ${ANGLE_COMMON_SOURCES}) target_include_directories(angle_common PUBLIC "$") @@ -442,6 +443,18 @@ file(GLOB ANGLE_GPU_INFO_UTIL_SOURCES "src/gpu_info_util/SystemInfo_internal.h" "src/gpu_info_util/SystemInfo.cpp" ) + +if(LINUX) + find_package(X11 COMPONENTS Xext Xi REQUIRED) + include_directories(${X11_INCLUDE_DIR}) + list(APPEND LIBANGLE_RENDERER_PLATFORM ${X11_LIBRARIES}) + set(LIBANGLE_RENDERER_COMPILEDEF + -DANGLE_USE_X11 + ) +else() + set(LIBANGLE_RENDERER_COMPILEDEF ) +endif() + add_library(angle_gpu_info_util OBJECT ${ANGLE_GPU_INFO_UTIL_SOURCES}) if(WIN32) target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_win.cpp") @@ -457,8 +470,9 @@ elseif(APPLE) target_link_libraries(angle_gpu_info_util PRIVATE ${IOKit} ${CoreFoundation} ${CoreGraphics}) elseif(LINUX) target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_linux.cpp" "src/gpu_info_util/SystemInfo_x11.cpp") + target_sources(angle_gpu_info_util PRIVATE "src/third_party/libXNVCtrl/NVCtrl.c") target_compile_definitions(angle_gpu_info_util PRIVATE GPU_INFO_USE_X11) - target_link_libraries(angle_gpu_info_util PRIVATE X11 Xi Xext) + target_link_libraries(angle_gpu_info_util PRIVATE X11::X11 X11::Xi X11::Xext) elseif(ANDROID) target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_android.cpp") endif() @@ -547,17 +561,6 @@ else() set(LIBANGLE_RENDERER_PLATFORM ) endif() -if(LINUX) - find_package(X11) - include_directories(${X11_INCLUDE_DIR}) - list(APPEND LIBANGLE_RENDERER_PLATFORM ${X11_LIBRARIES}) - set(LIBANGLE_RENDERER_COMPILEDEF - -DANGLE_USE_X11 - ) -else() - set(LIBANGLE_RENDERER_COMPILEDEF ) -endif() - add_library(libANGLE STATIC ${LIBANGLE_SOURCES}) target_link_libraries(libANGLE PRIVATE angle::common diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index 55e7ba16e73e28..26df21de7790ee 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -27,9 +27,9 @@ vcpkg_from_github( 003-fix-mingw.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}/src/common) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/angle_commit.h" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/angle_commit.h" DESTINATION "${SOURCE_PATH}/src/common") function(checkout_in_path_with_patches PATH URL REF PATCHES) if(EXISTS "${PATH}") @@ -53,21 +53,20 @@ checkout_in_path_with_patches( "third-party-zlib-far-undef.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 OPTIONS -D${ANGLE_CPU_BITNESS}=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-angle TARGET_PATH share/unofficial-angle) +vcpkg_cmake_config_fixup(CONFIG_PATH share/unofficial-angle PACKAGE_NAME unofficial-angle) 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) # File conflict with opengl-registry! Make sure headers are similar on Update! # angle defines some additional entrypoints. @@ -95,5 +94,3 @@ foreach(_file ${_double_files}) file(REMOVE "${CURRENT_PACKAGES_DIR}/${_file}") endif() endforeach() - - diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 230cce624a5465..47c062104397bf 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_4472", - "port-version": 4, + "port-version": 5, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." @@ -9,7 +9,27 @@ "homepage": "https://github.com/google/angle", "dependencies": [ "egl-registry", + { + "name": "libx11", + "platform": "linux" + }, + { + "name": "libxext", + "platform": "linux" + }, + { + "name": "libxi", + "platform": "linux" + }, "opengl-registry", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/egl-registry/portfile.cmake b/ports/egl-registry/portfile.cmake index f3b3ff65e65824..268f9830ba98c3 100644 --- a/ports/egl-registry/portfile.cmake +++ b/ports/egl-registry/portfile.cmake @@ -24,3 +24,5 @@ file( DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) + +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/egl/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/egl-registry/vcpkg-cmake-wrapper.cmake b/ports/egl-registry/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..43895a2b9d5175 --- /dev/null +++ b/ports/egl-registry/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,8 @@ +if(UNIX) + _find_package(OpenGL COMPONENTS EGL) + if(OPENGL_egl_LIBRARY) # Only defined for Linux with GLVND + set(EGL_LIBRARY "${OPENGL_egl_LIBRARY}" CACHE STRING "") + set(EGL_INCLUDE_DIR "${OPENGL_EGL_INCLUDE_DIRS}" CACHE STRING "") + endif() +endif() +_find_package(${ARGS}) diff --git a/ports/egl-registry/vcpkg.json b/ports/egl-registry/vcpkg.json index 95e58339ccfabe..d12710197cc57f 100644 --- a/ports/egl-registry/vcpkg.json +++ b/ports/egl-registry/vcpkg.json @@ -1,6 +1,7 @@ { "name": "egl-registry", "version-date": "2021-11-23", + "port-version": 1, "description": "the EGL API and Extension Registry", "homepage": "https://github.com/KhronosGroup/EGL-Registry" } diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 4cb2373d611dc4..92d6cc72d27b9b 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,10 +1,25 @@ { "name": "qt", "version": "6.3.2", + "port-version": 1, "description": "Qt", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ + { + "name": "qt3d", + "default-features": false, + "features": [ + "animation", + "assimp", + "extras", + "input", + "logic", + "qml", + "render", + "rhi" + ] + }, { "name": "qt5compat", "default-features": false, @@ -142,7 +157,7 @@ "spellchecker", "webchannel" ], - "platform": "!static" + "platform": "!static & !(windows & arm)" }, { "name": "qtwebsockets", @@ -164,7 +179,7 @@ "features": [ "webengine" ], - "platform": "!static" + "platform": "!static & !(windows & arm)" } ], "default-features": [ diff --git a/ports/qt3d/portfile.cmake b/ports/qt3d/portfile.cmake new file mode 100644 index 00000000000000..add309215273ec --- /dev/null +++ b/ports/qt3d/portfile.cmake @@ -0,0 +1,35 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +# General features: +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick + "vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan + "vulkan" FEATURE_qt3d_vulkan + "rhi" FEATURE_qt3d_rhi_renderer + "render" FEATURE_qt3d_render + "input" FEATURE_qt3d_input + "logic" FEATURE_qt3d_logic + "extras" FEATURE_qt3d_extras + "animation" FEATURE_qt3d_animation +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan + ) + +if("assimp" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS -DINPUT_assimp=system) +else() + list(APPEND FEATURE_OPTIONS -DINPUT_assimp=no) +endif() + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + ${FEATURE_OPTIONS} + #-DINPUT_fbxsdk=no + -DFEATURE_qt3d_fbxsdk=OFF # OpenFBX? Probably not! + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json new file mode 100644 index 00000000000000..c4b8b4249f8e4e --- /dev/null +++ b/ports/qt3d/vcpkg.json @@ -0,0 +1,106 @@ +{ + "name": "qt3d", + "version": "6.3.2", + "description": "Qt wrapper for existing OPC UA stacks", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + "assimp", + { + "name": "qtbase", + "default-features": false, + "features": [ + "concurrent", + "gui", + "network", + "widgets" + ] + } + ], + "default-features": [ + "animation", + "assimp", + "extras", + "input", + "logic", + "render" + ], + "features": { + "animation": { + "description": "Use the 3D Animation Aspect library", + "dependencies": [ + { + "name": "qt3d", + "default-features": false, + "features": [ + "render" + ] + } + ] + }, + "assimp": { + "description": "Build with assimp", + "dependencies": [ + "assimp" + ] + }, + "extras": { + "description": "Use the 3D Extra library", + "dependencies": [ + { + "name": "qt3d", + "default-features": false, + "features": [ + "input", + "logic", + "render" + ] + } + ] + }, + "input": { + "description": "Use the 3D Input Aspect library" + }, + "logic": { + "description": "Use the 3D Logic Aspect library" + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "render": { + "description": "Use the 3D Render Aspect library" + }, + "rhi": { + "description": "Enable RHI renderer", + "dependencies": [ + "qtshadertools" + ] + }, + "vulkan": { + "description": "Build with vulkan support", + "dependencies": [ + { + "name": "qt3d", + "default-features": false, + "features": [ + "rhi" + ] + }, + "vulkan" + ] + } + } +} diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index db45474837810f..027c84144aa56a 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -34,5 +34,6 @@ set(qtwebsockets_HASH "b57621b00d0919c57ced9eabd553a624585b16f9b061366af53abdd00 set(qtwebview_HASH "39cb4bf67818e4d462fbdd180a802052b3637578a8b99a943359749f15b721f2e0b0354d90ceaaff99a57eba1c57c1ee271e4fd0a553d42c8093c665b9192688") set(qtinterfaceframework_REF a83bc81486891170750a3048e6b58d15903e6f9c) set(qtapplicationmanager_HASH "79a8e7588ec168d6cbccd921bc46b48a25512591b65e1602dd7cf461a7692472498301eea299808a08b7ed7f5efaa69f9a0b9ab86f9ea8f18cb4421c562c3f20") +set(qt3d_HASH "1856aaf3ae7f91129b7eb0524497b0505f7ba9e1a7cbfee5eec26400d8ea36f88115f8d49ad93b3ef94c09f1ee11246482d6ab0416972a56431bd084cab44aa8") set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629") diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index c9036cab5817e8..860a645aa47103 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -37,7 +37,8 @@ set(QT_PORTS qt qtopcua qtimageformats qtmqtt - qtnetworkauth) + qtnetworkauth + qt3d) # qtquickcontrols2 -> moved into qtdeclarative if(QT_VERSION VERSION_GREATER_EQUAL 6.1) list(APPEND QT_PORTS diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 388b3fb949927e..787bdb96ad364e 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version": "6.3.2", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index 3d927c31140d40..bc1b74da8b9c90 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -45,4 +45,7 @@ qt_install_copyright("${SOURCE_PATH}") if(NOT VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen") + if(NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() endif() diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index c3c11ca8b6aeab..9792a3d3ec1ca9 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtinterfaceframework", "version": "6.3.2", + "port-version": 1, "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 913526f78e3d50..c7eda56cc50555 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -43,6 +43,7 @@ list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=OFF") qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 74584b33e413c8..5ecbe778883b0a 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtmultimedia", "version": "6.3.2", + "port-version": 1, "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, @@ -26,7 +27,10 @@ "gstreamer": { "description": "Build with gstreamer", "dependencies": [ - "angle", + { + "name": "angle", + "platform": "windows" + }, "gstreamer" ] }, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index 0fcb8ab97a8419..dfa7c5f598f448 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -79,7 +79,7 @@ endif() string(LENGTH "${CURRENT_BUILDTREES_DIR}" buildtree_length) # We know that C:/buildrees/${PORT} is to long to build Release. Debug works however. Means 24 length is too much but 23 might work. -if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS) +if(buildtree_length GREATER 22 AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_ARCHITECTURE MATCHES "arm64") message(WARNING "Buildtree path '${CURRENT_BUILDTREES_DIR}' is too long.\nConsider passing --x-buildtrees-root= to vcpkg!\nTrying to use '${CURRENT_BUILDTREES_DIR}/../tmp'") set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # activly avoid long path issues in CI. -> Means CI will not return logs cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 7b7a621e046319..a2fe4c0e5ada2d 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,10 +2,11 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.3.2", + "port-version": 1, "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, - "supports": "!static & !(x86 & windows)", + "supports": "!static & !((x86 | arm) & windows)", "dependencies": [ { "name": "ffmpeg", @@ -85,10 +86,6 @@ "name": "qtdeclarative", "default-features": false }, - { - "name": "qtdeclarative", - "default-features": false - }, { "name": "qttools", "default-features": false diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 79d8401365549e..01c9f3e6814646 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -785,7 +785,6 @@ opencv3:x64-windows-static-md = skip opencv3:x86-windows = skip opendnp3:x64-uwp=fail opendnp3:arm-uwp=fail -opengl:arm64-windows=skip # https://github.com/microsoft/vcpkg-tool/pull/599 openmama:x64-windows-static-md=fail openmesh:arm64-windows=fail openmesh:arm-uwp=fail @@ -863,12 +862,8 @@ qt5-canvas3d:x64-windows-static-md=skip qt5-canvas3d:x86-windows=skip # Missing system libraries qt5-wayland:x64-osx=fail -# qtmultimedia needs an EGL fix -qtmultimedia:x64-linux=fail qtwayland:x64-osx=fail qtwayland:arm64-osx=fail -# Post build checks fail -qtwebengine:arm64-windows=fail # Missing prerequisites for CI success qt5-webengine:x64-linux=fail qt5-webengine:x64-osx=fail @@ -1238,6 +1233,13 @@ zeroc-ice:arm64-windows=fail zeroc-ice:arm-uwp=fail zeroc-ice:x64-uwp=fail +# Ports which needs to pass in CI +cmake:x64-windows=pass +cmake:x64-windows-static=pass +cmake:x64-windows-static-md=pass +cmake:arm64-windows=pass +cmake:x64-linux=pass +cmake:x64-osx=pass cmake-user:arm-uwp=pass cmake-user:arm64-windows=pass cmake-user:x64-linux=pass @@ -1246,6 +1248,12 @@ cmake-user:x64-windows-static-md=pass cmake-user:x64-windows-static=pass cmake-user:x64-windows=pass cmake-user:x86-windows=pass +qt:x64-windows=pass +qt:x64-windows-static=pass +# qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass. +qt:arm64-windows=pass +qt:x64-linux=pass +# qt:x64-osx=pass # gstreamer issues preventing qtmultimedia vcpkg-ci-arrow:x64-windows=pass vcpkg-ci-arrow:x64-windows-static=pass vcpkg-ci-arrow:x64-windows-static-md=pass diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 3a3f7ddec67060..f37439e52990c4 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c154e795d3d3c736dbbfec2db72a50aa37fa8f2", + "version-string": "chromium_4472", + "port-version": 5 + }, { "git-tree": "d88baa0c355514a753460f90afb0451434460484", "version-string": "chromium_4472", diff --git a/versions/baseline.json b/versions/baseline.json index a40e67bdb4d988..d63e51c611ee79 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -102,7 +102,7 @@ }, "angle": { "baseline": "chromium_4472", - "port-version": 4 + "port-version": 5 }, "antlr4": { "baseline": "4.10.1", @@ -2126,7 +2126,7 @@ }, "egl-registry": { "baseline": "2021-11-23", - "port-version": 0 + "port-version": 1 }, "eigen3": { "baseline": "3.4.0", @@ -5950,12 +5950,16 @@ }, "qt": { "baseline": "6.3.2", - "port-version": 0 + "port-version": 1 }, "qt-advanced-docking-system": { "baseline": "3.8.2", "port-version": 0 }, + "qt3d": { + "baseline": "6.3.2", + "port-version": 0 + }, "qt5": { "baseline": "5.15.6", "port-version": 0 @@ -6146,7 +6150,7 @@ }, "qtbase": { "baseline": "6.3.2", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.3.2", @@ -6182,7 +6186,7 @@ }, "qtinterfaceframework": { "baseline": "6.3.2", - "port-version": 0 + "port-version": 1 }, "qtkeychain": { "baseline": "0.13.2", @@ -6206,7 +6210,7 @@ }, "qtmultimedia": { "baseline": "6.3.2", - "port-version": 0 + "port-version": 1 }, "qtnetworkauth": { "baseline": "6.3.2", @@ -6282,7 +6286,7 @@ }, "qtwebengine": { "baseline": "6.3.2", - "port-version": 0 + "port-version": 1 }, "qtwebsockets": { "baseline": "6.3.2", diff --git a/versions/e-/egl-registry.json b/versions/e-/egl-registry.json index 330405b7556779..743fd86c7f23f9 100644 --- a/versions/e-/egl-registry.json +++ b/versions/e-/egl-registry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43e62391cc7413e33585df55584769bcb69bf563", + "version-date": "2021-11-23", + "port-version": 1 + }, { "git-tree": "ec272777ea9d0ceccf5cc8b0336f038853e5c911", "version-date": "2021-11-23", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index ba8db8735c2d07..61b1037e7fd9ab 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc6a4c7e1ff449ba08297582c31a2add75d1d87b", + "version": "6.3.2", + "port-version": 1 + }, { "git-tree": "17bba488ae744a514ee214f30d0bdb1bd6da6831", "version": "6.3.2", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json new file mode 100644 index 00000000000000..902afd8ecc7d6b --- /dev/null +++ b/versions/q-/qt3d.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8d2cabd2615053a8dcf800f29065e0cf9769a241", + "version": "6.3.2", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index ee7226a28adae8..485b73889718e8 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02656542bbdef8469f5a461b1523c4111f0841b3", + "version": "6.3.2", + "port-version": 1 + }, { "git-tree": "0b34c02c8bbcd997c6f65d11a4d01012f0441de1", "version": "6.3.2", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 6899db930a1173..c544bea723a15c 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "887770433b2654dd335178a68b7f0910e28198cc", + "version": "6.3.2", + "port-version": 1 + }, { "git-tree": "06bd4310e48e978c281804ba2bce2fc37d1b4fa1", "version": "6.3.2", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index fe7866268e53a8..ff878d4bf471e5 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "953f717e1c02b90674da0910b204ce4f556a8673", + "version": "6.3.2", + "port-version": 1 + }, { "git-tree": "f538a967236f91129b70c8cf335746242e0cacbd", "version": "6.3.2", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 38cd9fde56d346..bbaf4329137109 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a9606ce3a5531467f484accb11a2fe6e69f09a3", + "version": "6.3.2", + "port-version": 1 + }, { "git-tree": "ec3282a08fee4cdadb156aa5389d33d39d507ebc", "version": "6.3.2", From 13d47a6d82c1ece6849c8ac1a21e8c371d5dac77 Mon Sep 17 00:00:00 2001 From: Connor Broyles Date: Wed, 12 Oct 2022 04:25:54 -0400 Subject: [PATCH 762/791] [osgearth] Plugin installation fixes (#27156) * [osgearth] Fix plugin exporting This change has the same effects and reasoning as the prior fix to the osg port. * Update version * Update port --- ports/osgearth/export-plugins.patch | 16 ++++++++++++++++ ports/osgearth/portfile.cmake | 18 +----------------- ports/osgearth/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/osgearth.json | 5 +++++ 5 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 ports/osgearth/export-plugins.patch diff --git a/ports/osgearth/export-plugins.patch b/ports/osgearth/export-plugins.patch new file mode 100644 index 00000000000000..e6dcdee3967fbd --- /dev/null +++ b/ports/osgearth/export-plugins.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeModules/OsgEarthMacroUtils.cmake b/CMakeModules/OsgEarthMacroUtils.cmake +index 8fab78376..838dcc581 100644 +--- a/CMakeModules/OsgEarthMacroUtils.cmake ++++ b/CMakeModules/OsgEarthMacroUtils.cmake +@@ -220,9 +220,9 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) + + #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/${VPB_PLUGINS} + IF(WIN32) +- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION bin/${OSG_PLUGINS} ) ++ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib/${OSG_PLUGINS} LIBRARY DESTINATION plugins/${OSG_PLUGINS} ) + ELSE(WIN32) +- INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} ) ++ INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/${OSG_PLUGINS} LIBRARY DESTINATION plugins${LIB_POSTFIX}/${OSG_PLUGINS} ) + ENDIF(WIN32) + + IF(OSG_BUILD_PLATFORM_IPHONE) diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 5bd04f4a5f18f6..385b257fcbeb2e 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( remove-tool-debug-suffix.patch remove-lerc-gltf.patch fix-osgearth-config.patch + export-plugins.patch ) if("tools" IN_LIST FEATURES) @@ -73,24 +74,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/osgEarth/Export" "defined( OSGEARTH_LIBRARY_STATIC )" "1") endif() -# Merge osgearth plugins into [/debug]/plugins/osgPlugins-${OSG_VER}, -# as a staging area for later deployment. set(osg_plugin_pattern "${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}osgdb*${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(GLOB osg_plugins_subdir RELATIVE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/bin/osgPlugins-*") - list(LENGTH osg_plugins_subdir osg_plugins_subdir_LENGTH) - if(NOT osg_plugins_subdir_LENGTH EQUAL 1) - message(FATAL_ERROR "Could not determine osg plugins directory.") - endif() - file(GLOB osgearth_plugins "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}/${osg_plugin_pattern}") - file(INSTALL ${osgearth_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}") - if(NOT VCPKG_BUILD_TYPE) - file(GLOB osgearth_plugins "${CURRENT_PACKAGES_DIR}/debug/bin/${osg_plugins_subdir}/${osg_plugin_pattern}") - file(INSTALL ${osgearth_plugins} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/plugins/${osg_plugins_subdir}") - endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/${osg_plugins_subdir}" "${CURRENT_PACKAGES_DIR}/debug/bin/${osg_plugins_subdir}") -endif() - if("tools" IN_LIST FEATURES) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(GLOB osg_plugins "${CURRENT_PACKAGES_DIR}/plugins/${osg_plugins_subdir}/${osg_plugin_pattern}") diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 364478fc0e46d9..25fb398dedf1b0 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osgearth", "version": "3.3", - "port-version": 2, + "port-version": 3, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "license": "LGPL-3.0-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index d63e51c611ee79..4d543cff7b3d57 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5518,7 +5518,7 @@ }, "osgearth": { "baseline": "3.3", - "port-version": 2 + "port-version": 3 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index b530496b7cd290..6cd0da84881f01 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c024ede3cf289475ceeeccc91045868db965c02", + "version": "3.3", + "port-version": 3 + }, { "git-tree": "5a9e3fa28dc78e768ff9ef2ca4ff09b51b774cbb", "version": "3.3", From dcc6c1d4bfac2196416560a87bbebe340be0247a Mon Sep 17 00:00:00 2001 From: sean <43609023+spnda@users.noreply.github.com> Date: Wed, 12 Oct 2022 10:28:37 +0200 Subject: [PATCH 763/791] [fastgltf] New port (#27138) * [fastgltf] New port * Versions --- ports/fastgltf/portfile.cmake | 18 ++++++++++++++++++ ports/fastgltf/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/f-/fastgltf.json | 9 +++++++++ 4 files changed, 49 insertions(+) create mode 100644 ports/fastgltf/portfile.cmake create mode 100644 ports/fastgltf/vcpkg.json create mode 100644 versions/f-/fastgltf.json diff --git a/ports/fastgltf/portfile.cmake b/ports/fastgltf/portfile.cmake new file mode 100644 index 00000000000000..bcb7c63c5f1ba7 --- /dev/null +++ b/ports/fastgltf/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO spnda/fastgltf + REF b19e66b6165bb034773034c90ec0b4d1f0969b11 + SHA512 25cb2410a09e70667579d0b82c2417283cff2029dddadad27c53f44190bcaffeb6b97e6d32c2be87a675f63da4cae0ebd7505af566f12dfb44917ca4a27c3ec5 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DFASTGLTF_DOWNLOAD_SIMDJSON=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.md") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fastgltf/vcpkg.json b/ports/fastgltf/vcpkg.json new file mode 100644 index 00000000000000..09f8e802df71d2 --- /dev/null +++ b/ports/fastgltf/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "fastgltf", + "version": "0.1.0", + "description": "Blazing fast C++17 glTF 2.0 loader powered by SIMD", + "homepage": "https://github.com/spnda/fastgltf", + "license": "MIT", + "dependencies": [ + "simdjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 4d543cff7b3d57..6d94842e94d94b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2252,6 +2252,10 @@ "baseline": "391d5e9", "port-version": 2 }, + "fastgltf": { + "baseline": "0.1.0", + "port-version": 0 + }, "fastlz": { "baseline": "2021-05-10", "port-version": 0 diff --git a/versions/f-/fastgltf.json b/versions/f-/fastgltf.json new file mode 100644 index 00000000000000..c4d4ee96baa81f --- /dev/null +++ b/versions/f-/fastgltf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6ecb2c76a348fd4ac4a650ee0ee8ad0a1d785fb5", + "version": "0.1.0", + "port-version": 0 + } + ] +} From 680071397677bb123b2f2b0ebe73905feae4a955 Mon Sep 17 00:00:00 2001 From: Take Vos Date: Wed, 12 Oct 2022 10:31:44 +0200 Subject: [PATCH 764/791] [hikogui] update to version 0.7.0 (#27134) * [hikogui] update to version 0.7.0 * [hikogui] empty ttauri and fix deprecated port files. Make ttauri an empty dependency only port which imports hikogui. Update the hikogui portfile to use non-deprecated functions. * [ttauri] version update * Update ports/hikogui/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * remove port-version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/hikogui/portfile.cmake | 25 +++++++++++++++++++++++++ ports/hikogui/vcpkg.json | 21 +++++++++++++++++++++ ports/ttauri/portfile.cmake | 27 +-------------------------- ports/ttauri/vcpkg.json | 7 +++---- versions/baseline.json | 6 +++++- versions/h-/hikogui.json | 9 +++++++++ versions/t-/ttauri.json | 5 +++++ 7 files changed, 69 insertions(+), 31 deletions(-) create mode 100644 ports/hikogui/portfile.cmake create mode 100644 ports/hikogui/vcpkg.json create mode 100644 versions/h-/hikogui.json diff --git a/ports/hikogui/portfile.cmake b/ports/hikogui/portfile.cmake new file mode 100644 index 00000000000000..7a37309f4e5a21 --- /dev/null +++ b/ports/hikogui/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO hikogui/hikogui + REF v0.7.0 + SHA512 64555c67e5a44f336a3528d3a894d43e2751a1f4e4e4d9f6618c085ef0be4a502610a36625d95f79298080cb483f7361a758f7c43b4784999b0b5d839baacb28 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DHI_BUILD_TESTS=OFF + -DHI_BUILD_EXAMPLES=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE_1_0.txt") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/hikogui/vcpkg.json b/ports/hikogui/vcpkg.json new file mode 100644 index 00000000000000..ab0dddefc7c53b --- /dev/null +++ b/ports/hikogui/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "hikogui", + "version": "0.7.0", + "maintainers": "@takev", + "description": "A portable, low latency, retained-mode GUI framework written in C++.", + "homepage": "https://github.com/hikogui/hikogui", + "license": "BSL-1.0", + "supports": "windows & x64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "vulkan", + "vulkan-memory-allocator" + ] +} diff --git a/ports/ttauri/portfile.cmake b/ports/ttauri/portfile.cmake index 52eeca7babc609..065116c276adcf 100644 --- a/ports/ttauri/portfile.cmake +++ b/ports/ttauri/portfile.cmake @@ -1,26 +1 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ttauri-project/ttauri - REF v0.5.0 - SHA512 946c8b7fbd030235d06fff3e100c6be15c2dd360306c674906eb395067642ea38551290ebf4d2c398798219b5c0711eeaecb57bc5021db9f91ec343baab64171 - HEAD_REF main -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DTT_BUILD_TESTS=OFF - -DTT_BUILD_EXAMPLES=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -) - -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() -vcpkg_copy_pdbs() - -file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/ttauri/vcpkg.json b/ports/ttauri/vcpkg.json index b59bd25f4c94a8..7c60c6939f55a4 100644 --- a/ports/ttauri/vcpkg.json +++ b/ports/ttauri/vcpkg.json @@ -1,14 +1,13 @@ { "name": "ttauri", "version": "0.5.0", - "port-version": 1, + "port-version": 2, "maintainers": "@takev", - "description": "A portable, low latency, retained-mode GUI framework written in C++.", + "description": "A portable, low latency, retained-mode GUI framework written in C++. (renamed to hikogui)", "homepage": "https://github.com/ttauri-project/ttauri", "license": "BSL-1.0", "supports": "windows & x64", "dependencies": [ - "vulkan", - "vulkan-memory-allocator" + "hikogui" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6d94842e94d94b..aadc7d9a5bf8b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2904,6 +2904,10 @@ "baseline": "0.14.2", "port-version": 0 }, + "hikogui": { + "baseline": "0.7.0", + "port-version": 0 + }, "hiredis": { "baseline": "1.0.2", "port-version": 4 @@ -7490,7 +7494,7 @@ }, "ttauri": { "baseline": "0.5.0", - "port-version": 1 + "port-version": 2 }, "turbobase64": { "baseline": "2020-01-12", diff --git a/versions/h-/hikogui.json b/versions/h-/hikogui.json new file mode 100644 index 00000000000000..2bc102777e9ce3 --- /dev/null +++ b/versions/h-/hikogui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3ed99f330c9de6be97e6e2e25c3ff55080fbbcd5", + "version": "0.7.0", + "port-version": 0 + } + ] +} diff --git a/versions/t-/ttauri.json b/versions/t-/ttauri.json index f1deb87b031664..fc89a2fe69fd28 100644 --- a/versions/t-/ttauri.json +++ b/versions/t-/ttauri.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "528e0c198c489d3212ba2b8e7048bbc0a379f4b2", + "version": "0.5.0", + "port-version": 2 + }, { "git-tree": "5990b7368bf89a8b6cd1fa2a7b33406c9ef3a24e", "version": "0.5.0", From d8e60ef4741584f2957788ed0786dd365c92c4d9 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 13 Oct 2022 18:40:52 +0200 Subject: [PATCH 765/791] [vcpkg scripts] Crosscompiling fixes (#26617) * test osx stuff * deactivate most of ci * get trace output * add required flags to the linker flags * also look for --sysroot * Link_args are always shared * fix ar flags * setup FOR_BUILD vars. * try tricking the build.... but man configure scripts are stupid sometimes... * try 2 * major meson rewrite * fix duplicates * revert --trace-expand * update port version * revert pipeline changes * v db * bump version * v db * set flags for rc compilers * a few more ios fixes. * v db * fix osx/ios logic * documentation and don't fatal_error in build/host machine entry calculation. * add android/compiler target stuff from #26570 * remove extra endif * v db * add target param to linker flags. * target in cpp flags * Make vcpkg-cmake-get-vars more ios compatible * Update scripts/get_cmake_vars/CMakeLists.txt Co-authored-by: Matthias Kuhn * More ios fixes * fix target adding * Fix broken loop * v db * v db * bump date * v db * v db * v db * remove port-version 1 * v db Co-authored-by: JackBoosY Co-authored-by: Matthias Kuhn --- docs/users/triplets.md | 5 + .../cmake_get_vars/CMakeLists.txt | 33 +- ports/vcpkg-cmake-get-vars/vcpkg.json | 3 +- ports/vcpkg-cmake/vcpkg.json | 2 +- scripts/buildsystems/meson/meson.template.in | 42 ++ scripts/cmake/vcpkg_configure_make.cmake | 21 +- scripts/cmake/vcpkg_configure_meson.cmake | 476 +++++++++--------- scripts/get_cmake_vars/CMakeLists.txt | 29 +- versions/baseline.json | 6 +- versions/v-/vcpkg-cmake-get-vars.json | 5 + versions/v-/vcpkg-cmake.json | 5 + 11 files changed, 342 insertions(+), 285 deletions(-) create mode 100644 scripts/buildsystems/meson/meson.template.in diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 1b42bd7505dad6..08a076517c2958 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -100,6 +100,11 @@ This field is optional. Also available as build-type specific `VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG` and `VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE` variables. +### VCPKG_MESON_(CROSS|NATIVE)_FILE(_RELEASE|_DEBUG) +Provide an additional (configuration dependent) file as a meson cross/native file. Can be used to override settings provided by vcpkg since it will be passed after vcpkg's generated cross/native files are passed. + +Especially usefull to provide your own build_machine and host_machine entries. + ### VCPKG_CMAKE_CONFIGURE_OPTIONS Set additional CMake configure options that are appended to the configure command (in [`vcpkg_cmake_configure`](../maintainers/vcpkg_cmake_configure.md)). diff --git a/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt index fb1da469651b97..7de32bbe632f44 100644 --- a/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt +++ b/ports/vcpkg-cmake-get-vars/cmake_get_vars/CMakeLists.txt @@ -12,7 +12,7 @@ list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING CMAKE_SIZEOF_VOID_P MSVC MSVC_VERSION) -if(CMAKE_SYSTEM_NAME MATCHES "Darwin") +if(APPLE) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT) endif() @@ -33,7 +33,8 @@ foreach(_lang IN LISTS VCPKG_LANGUAGES) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILE_FEATURES) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_EXTENSION) - # Probably never required since implicit. + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILER_TARGET) + # Probably never required since implicit. #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES) #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES) @@ -101,18 +102,18 @@ if(APPLE) 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() + list(GET VCPKG_LANGUAGES 0 lang) + string(APPEND EXTRA_FLAGS " ${CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") + unset(lang) endif() 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}\"") - elseif(CMAKE_CXX_COMPILE_OPTIONS_TARGET) - string(APPEND EXTRA_FLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} \"${CMAKE_CXX_COMPILER_TARGET}\"") +set(target_param "") +list(GET VCPKG_LANGUAGES 0 lang) +if(CMAKE_${lang}_COMPILER_TARGET) + if (CMAKE_${lang}_COMPILER_ID STREQUAL Clang) + set(target_param "${CMAKE_${lang}_COMPILE_OPTIONS_TARGET}${CMAKE_${lang}_COMPILER_TARGET}") + elseif(CMAKE_${lang}_COMPILE_OPTIONS_TARGET) + set(target_param "${CMAKE_${lang}_COMPILE_OPTIONS_TARGET} ${CMAKE_${lang}_COMPILER_TARGET}") endif() endif() if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) @@ -126,12 +127,14 @@ 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}") +foreach(flags ${VCPKG_LANGUAGES} SHARED_LINKER EXE_LINKER STATIC_LINKER MODULE_LINKER) + set(${flags}_FLAGS "${target_param} ${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}} ${EXTRA_FLAGS}") + string(STRIP ${flags}_FLAGS "${${flags}_FLAGS}") endforeach() foreach(flags STATIC_LINKER RC) set(${flags}_FLAGS "${CMAKE_${flags}_FLAGS} ${CMAKE_${flags}_FLAGS_${VCPKG_CONFIGS}}") + string(STRIP ${flags}_FLAGS "${${flags}_FLAGS}") endforeach() foreach(incdir IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) @@ -142,7 +145,7 @@ 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) +foreach(flag ${VCPKG_LANGUAGES} SHARED_LINKER EXE_LINKER STATIC_LINKER MODULE_LINKER RC) # When using MSVC, maybe transform /flags to -flags. # When cross compiling, "/flags" may be an absolute path starting with /, so don't transform. # Otherwise, transform to improve compatibility with scripts interpreting "/flags" as a path. diff --git a/ports/vcpkg-cmake-get-vars/vcpkg.json b/ports/vcpkg-cmake-get-vars/vcpkg.json index 33b54788223854..9638bae51b31dc 100644 --- a/ports/vcpkg-cmake-get-vars/vcpkg.json +++ b/ports/vcpkg-cmake-get-vars/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vcpkg-cmake-get-vars", - "version-date": "2022-05-10", - "port-version": 1, + "version-date": "2022-09-04", "documentation": "https://vcpkg.io/en/docs/README.html", "license": "MIT", "dependencies": [ diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 741394d5be7320..551259d22eea7c 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vcpkg-cmake", - "version-date": "2022-09-13", + "version-date": "2022-09-26", "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html", "license": "MIT" } diff --git a/scripts/buildsystems/meson/meson.template.in b/scripts/buildsystems/meson/meson.template.in new file mode 100644 index 00000000000000..995d39b30cc506 --- /dev/null +++ b/scripts/buildsystems/meson/meson.template.in @@ -0,0 +1,42 @@ +[binaries] +cmake = ['@CMAKE_COMMAND@'] +python = ['@PYTHON3@'] +ninja = ['@NINJA@'] +pkgconfig= ['@PKGCONFIG@'] +@MESON_MT@ +@MESON_AR@ +@MESON_RC@ +@MESON_C@ +@MESON_C_LD@ +@MESON_CXX@ +@MESON_CXX_LD@ +@MESON_OBJC@ +@MESON_OBJC_LD@ +@MESON_OBJCPP@ +@MESON_OBJCPP_LD@ +@MESON_FC@ +@MESON_FC_LD@ +@MESON_WINDRES@ +@MESON_ADDITIONAL_BINARIES@ +[properties] +cmake_toolchain_file = '@SCRIPTS@/buildsystems/vcpkg.cmake' +[cmake] +VCPKG_TARGET_TRIPLET = '@TARGET_TRIPLET@' +VCPKG_HOST_TRIPLET = '@_HOST_TRIPLET@' +VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '@VCPKG_CHAINLOAD_TOOLCHAIN_FILE@' +VCPKG_CRT_LINKAGE = '@VCPKG_CRT_LINKAGE@' +_VCPKG_INSTALLED_DIR = '@_VCPKG_INSTALLED_DIR@' +@MESON_HOST_MACHINE@ +@MESON_BUILD_MACHINE@ +[built-in options] +default_library = '@MESON_DEFAULT_LIBRARY@' +werror = false +@MESON_CFLAGS@ +@MESON_CXXFLAGS@ +@MESON_FCFLAGS@ +@MESON_OBJCFLAGS@ +@MESON_OBJCPPFLAGS@ +# b_vscrt +@MESON_VSCRT_LINKAGE@ +# c_winlibs/cpp_winlibs +@MESON_WINLIBS@ \ No newline at end of file diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index c5d64a082934ad..46c09ae7b412db 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -74,8 +74,8 @@ macro(z_vcpkg_determine_autotools_target_arch_mac out_var) endmacro() macro(z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags flag_suffix) - string(REGEX MATCHALL "( |^)-D[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") - string(REGEX MATCHALL "( |^)-D[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") + string(REGEX MATCHALL "( |^)(-D|-isysroot|--sysroot=|-isystem|-m?[Aa][Rr][Cc][Hh]|--target=|-target) ?[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") + string(REGEX MATCHALL "( |^)(-D|-isysroot|--sysroot=|-isystem|-m?[Aa][Rr][Cc][Hh]|--target=|-target) ?[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") list(JOIN CXXPPFLAGS_${flag_suffix} "|" CXXREGEX) if(CXXREGEX) list(FILTER CPPFLAGS_${flag_suffix} INCLUDE REGEX "(${CXXREGEX})") @@ -384,7 +384,7 @@ function(vcpkg_configure_make) # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive" list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) endif() - elseif(NOT VCPKG_TARGET_IS_OSX) + else() # Because OSX dosn't like CMAKE_C(XX)_COMPILER (cc) in CC/CXX and rather wants to have gcc/g++ function(z_vcpkg_make_set_env envvar cmakevar) set(prog "${VCPKG_DETECTED_CMAKE_${cmakevar}} ${ARGN}") @@ -432,7 +432,7 @@ function(vcpkg_configure_make) endif() # macOS - cross-compiling support - if(VCPKG_TARGET_IS_OSX) + if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET) z_vcpkg_determine_autotools_host_arch_mac(BUILD_ARCH) # machine you are building on => --build= z_vcpkg_determine_autotools_target_arch_mac(TARGET_ARCH) @@ -441,7 +441,7 @@ function(vcpkg_configure_make) # --target: the machine that CC will produce binaries for # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host - if(NOT "${TARGET_ARCH}" STREQUAL "${BUILD_ARCH}") # we don't need to specify the additional flags if we build natively. + if(NOT "${TARGET_ARCH}" STREQUAL "${BUILD_ARCH}" OR NOT VCPKG_TARGET_IS_OSX) # we don't need to specify the additional flags if we build natively. set(arg_BUILD_TRIPLET "--host=${TARGET_ARCH}-apple-darwin") # (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}") @@ -754,10 +754,14 @@ function(vcpkg_configure_make) # Setup environment set(ENV{CPPFLAGS} "${CPPFLAGS_${current_buildtype}}") + set(ENV{CPPFLAGS_FOR_BUILD} "${CPPFLAGS_${current_buildtype}}") set(ENV{CFLAGS} "${CFLAGS_${current_buildtype}}") + set(ENV{CFLAGS_FOR_BUILD} "${CFLAGS_${current_buildtype}}") set(ENV{CXXFLAGS} "${CXXFLAGS_${current_buildtype}}") + #set(ENV{CXXFLAGS_FOR_BUILD} "${CXXFLAGS_${current_buildtype}}") -> doesn't exist officially set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${current_buildtype}}") set(ENV{LDFLAGS} "${LDFLAGS_${current_buildtype}}") + set(ENV{LDFLAGS_FOR_BUILD} "${LDFLAGS_${current_buildtype}}") if(ARFLAGS_${current_buildtype} AND NOT (arg_USE_WRAPPERS AND VCPKG_TARGET_IS_WINDOWS)) # Target windows with wrappers enabled cannot forward ARFLAGS since it breaks the wrapper set(ENV{ARFLAGS} "${ARFLAGS_${current_buildtype}}") @@ -767,6 +771,13 @@ function(vcpkg_configure_make) # and libtool tries to avoid versioning for shared libraries and no symbolic links are created. if(VCPKG_TARGET_IS_ANDROID) set(ENV{LDFLAGS} "-avoid-version $ENV{LDFLAGS}") + set(ENV{LDFLAGS_FOR_BUILD} "-avoid-version $ENV{LDFLAGS_FOR_BUILD}") + endif() + + if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + # configure not using all flags to check if compiler works ... + set(ENV{CC} "$ENV{CC} $ENV{CPPFLAGS} $ENV{CFLAGS}") + set(ENV{CC_FOR_BUILD} "$ENV{CC_FOR_BUILD} $ENV{CPPFLAGS} $ENV{CFLAGS}") endif() if(LINK_ENV_${current_buildtype}) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 5b6d39f27617d0..918b6617ccdf98 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -1,5 +1,4 @@ -function(z_vcpkg_append_proglist var_to_append additional_binaries) - string(APPEND "${var_to_append}" "[binaries]\n") +function(z_vcpkg_meson_set_proglist_variables config_type) if(VCPKG_TARGET_IS_WINDOWS) set(proglist MT AR) else() @@ -8,85 +7,53 @@ function(z_vcpkg_append_proglist var_to_append additional_binaries) foreach(prog IN LISTS proglist) if(VCPKG_DETECTED_CMAKE_${prog}) if(meson_${prog}) - string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + string(TOUPPER "MESON_${meson_${prog}}" var_to_set) + set("${var_to_set}" "${meson_${prog}} = ['${VCPKG_DETECTED_CMAKE_${prog}}']" PARENT_SCOPE) + elseif(${prog} STREQUAL AR AND VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}) + # Probably need to move AR somewhere else + string(TOLOWER "${prog}" proglower) + z_vcpkg_meson_convert_compiler_flags_to_list(ar_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}}") + list(PREPEND ar_flags "${VCPKG_DETECTED_CMAKE_${prog}}") + z_vcpkg_meson_convert_list_to_python_array(ar_flags ${ar_flags}) + set("MESON_AR" "${proglower} = ${ar_flags}" PARENT_SCOPE) else() + string(TOUPPER "MESON_${prog}" var_to_set) string(TOLOWER "${prog}" proglower) - string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + set("${var_to_set}" "${proglower} = ['${VCPKG_DETECTED_CMAKE_${prog}}']" PARENT_SCOPE) endif() endif() endforeach() - set(programs C CXX RC) + set(compilers "${arg_LANGUAGES}") + if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND compilers RC) + endif() set(meson_RC windres) + set(meson_Fortran fc) set(meson_CXX cpp) - foreach(prog IN LISTS programs) + foreach(prog IN LISTS compilers) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) + string(TOUPPER "MESON_${prog}" var_to_set) if(meson_${prog}) - string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + set("${var_to_set}" "${meson_${prog}} = ['${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}']" PARENT_SCOPE) + if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(TOUPPER "MESON_${prog}_LD" var_to_set) + set(${var_to_set} "${meson_${prog}}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE) + endif() + elseif(${prog} MATCHES RC AND VCPKG_DETECTED_CMAKE_RC_FLAGS_${config_type}) + z_vcpkg_meson_convert_compiler_flags_to_list(rc_flags "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${config_type}}") + list(PREPEND rc_flags "${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}") + z_vcpkg_meson_convert_list_to_python_array(rc_flags ${rc_flags}) + set("${var_to_set}" "${meson_${prog}} = ${rc_flags}" PARENT_SCOPE) else() string(TOLOWER "${prog}" proglower) - string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + set("${var_to_set}" "${proglower} = ['${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}']" PARENT_SCOPE) + if (DEFINED VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID AND NOT VCPKG_DETECTED_CMAKE_${prog}_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(TOUPPER "MESON_${prog}_LD" var_to_set) + set(${var_to_set} "${proglower}_ld = ['${VCPKG_DETECTED_CMAKE_LINKER}']" PARENT_SCOPE) + endif() endif() endif() endforeach() - if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") - string(APPEND "${var_to_append}" "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") - endif() - endif() - if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") - string(APPEND "${var_to_append}" "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") - endif() - endif() - - get_filename_component(CMAKE_PATH "${CMAKE_COMMAND}" DIRECTORY) - vcpkg_add_to_path("${CMAKE_PATH}" PREPEND) # Make CMake invokeable for Meson - string(APPEND "${var_to_append}" "cmake = '${CMAKE_COMMAND}'\n") - - vcpkg_find_acquire_program(PYTHON3) - get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) - vcpkg_add_to_path("${PYTHON3_DIR}") - string(APPEND "${var_to_append}" "python = '${PYTHON3}'\n") - - vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) - vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Prepend to use the correct ninja. - # string(APPEND "${var_to_append}" "ninja = '${NINJA}'\n") # This does not work due to meson issues - - foreach(additional_binary IN LISTS additional_binaries) - string(APPEND "${var_to_append}" "${additional_binary}\n") - endforeach() - set("${var_to_append}" "${${var_to_append}}" PARENT_SCOPE) -endfunction() - -function(z_vcpkg_meson_generate_native_file additional_binaries) #https://mesonbuild.com/Native-environments.html - set(native_config "") - z_vcpkg_append_proglist(native_config "${additional_binaries}") - - string(APPEND native_config "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html - if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") - # This is currently wrongly documented in the meson docs or buggy. The docs say: 'none' = no flags - # In reality however 'none' tries to deactivate eh and meson passes the flags for it resulting in a lot of warnings - # about overriden flags. Until this is fixed in meson vcpkg should not pass this here. - # string(APPEND native_config "cpp_eh='none'\n") # To make sure meson is not adding eh flags by itself using msvc - endif() - if(VCPKG_TARGET_IS_WINDOWS) - set(c_winlibs "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") - set(cpp_winlibs "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") - foreach(libvar IN ITEMS c_winlibs cpp_winlibs) - string(REGEX REPLACE "( |^)(-|/)" [[;\2]] "${libvar}" "${${libvar}}") - string(REPLACE ".lib " ".lib;" "${libvar}" "${${libvar}}") - vcpkg_list(REMOVE_ITEM "${libvar}" "") - vcpkg_list(JOIN "${libvar}" "', '" "${libvar}") - string(APPEND native_config "${libvar} = ['${${libvar}}']\n") - endforeach() - endif() - - set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-native-${TARGET_TRIPLET}.log") - set(vcpkg_meson_native_file "${native_config_name}" PARENT_SCOPE) - file(WRITE "${native_config_name}" "${native_config}") endfunction() function(z_vcpkg_meson_convert_compiler_flags_to_list out_var compiler_flags) @@ -105,9 +72,7 @@ function(z_vcpkg_meson_convert_list_to_python_array out_var) endfunction() # Generates the required compiler properties for meson -function(z_vcpkg_meson_generate_flags_properties_string out_var config_type) - set(result "") - +function(z_vcpkg_meson_set_flags_variables config_type) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(libpath_flag /LIBPATH:) else() @@ -119,77 +84,35 @@ function(z_vcpkg_meson_generate_flags_properties_string out_var config_type) set(path_suffix "") endif() + set(includepath "-I${CURRENT_INSTALLED_DIR}/include") set(libpath "${libpath_flag}${CURRENT_INSTALLED_DIR}${path_suffix}/lib") - z_vcpkg_meson_convert_compiler_flags_to_list(cflags "${VCPKG_DETECTED_CMAKE_C_FLAGS_${config_type}}") - vcpkg_list(APPEND cflags "-I${CURRENT_INSTALLED_DIR}/include") - z_vcpkg_meson_convert_list_to_python_array(cflags ${cflags}) - string(APPEND result "c_args = ${cflags}\n") - - z_vcpkg_meson_convert_compiler_flags_to_list(cxxflags "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${config_type}}") - vcpkg_list(APPEND cxxflags "-I${CURRENT_INSTALLED_DIR}/include") - z_vcpkg_meson_convert_list_to_python_array(cxxflags ${cxxflags}) - string(APPEND result "cpp_args = ${cxxflags}\n") - - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${config_type}}") - else() - 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() + foreach(lang IN LISTS arg_LANGUAGES) + z_vcpkg_meson_convert_compiler_flags_to_list(${lang}flags "${VCPKG_DETECTED_CMAKE_${lang}_FLAGS_${config_type}}") + if(lang MATCHES "^(C|CXX)$") + vcpkg_list(APPEND ${lang}flags "${includepath}") 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") - string(APPEND result "cpp_link_args = ${linker_flags}\n") - set("${out_var}" "${result}" PARENT_SCOPE) -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 - #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) - z_vcpkg_select_default_vcpkg_chainload_toolchain() - endif() - - string(APPEND native_file "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") - string(APPEND native_file "VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'\n") - 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) - else() - set(crt_type md) + z_vcpkg_meson_convert_list_to_python_array(${lang}flags ${${lang}flags}) + set(lang_mapping "${lang}") + if(lang STREQUAL "Fortran") + set(lang_mapping "FC") endif() - if("${config_type}" STREQUAL "DEBUG") - string(APPEND crt_type "d") + string(TOLOWER "${lang_mapping}" langlower) + if(lang STREQUAL "CXX") + set(langlower cpp) endif() - string(APPEND native_file "b_vscrt = '${crt_type}'\n") - endif() - string(TOLOWER "${config_type}" lowerconfig) - set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-native-${TARGET_TRIPLET}-${lowerconfig}.log") - file(WRITE "${native_config_name}" "${native_file}") - set("vcpkg_meson_native_file_${config_type}" "${native_config_name}" PARENT_SCOPE) + set(MESON_${lang_mapping}FLAGS "${langlower}_args = ${${lang}flags}\n") + set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${config_type}}") + z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") + vcpkg_list(APPEND linker_flags "${libpath}") + z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) + string(APPEND MESON_${lang_mapping}FLAGS "${langlower}_link_args = ${linker_flags}") + set(MESON_${lang_mapping}FLAGS "${MESON_${lang_mapping}FLAGS}" PARENT_SCOPE) + endforeach() endfunction() -function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbuild.com/Cross-compilation.html +function(z_vcpkg_get_build_and_host_system build_system host_system is_cross) #https://mesonbuild.com/Cross-compilation.html + set(build_unknown FALSE) if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) @@ -209,7 +132,10 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu set(build_cpu_fam arm) set(build_cpu armv7hl) else() - message(FATAL_ERROR "Unsupported host architecture ${build_arch}!") + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Unsupported build architecture ${build_arch}! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the build_machine entry!") + endif() + set(build_unknown TRUE) endif() elseif(CMAKE_HOST_UNIX) # at this stage, CMAKE_HOST_SYSTEM_PROCESSOR is not defined @@ -217,7 +143,7 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu COMMAND uname -m OUTPUT_VARIABLE MACHINE COMMAND_ERROR_IS_FATAL ANY) - + # Show real machine architecture to visually understand whether we are in a native Apple Silicon terminal or running under Rosetta emulation debug_message("Machine: ${MACHINE}") @@ -241,12 +167,43 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu set(build_cpu loongarch64) else() # https://github.com/mesonbuild/meson/blob/master/docs/markdown/Reference-tables.md#cpu-families - message(FATAL_ERROR "Unhandled machine: ${MACHINE}") + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Unhandled machine: ${MACHINE}! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the build_machine entry!") + endif() + set(build_unknown TRUE) endif() else() - message(FATAL_ERROR "Failed to detect the host architecture!") + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Failed to detect the build architecture! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the build_machine entry!") + endif() + set(build_unknown TRUE) endif() + set(build "[build_machine]\n") # Machine the build is performed on + string(APPEND build "endian = 'little'\n") + if(WIN32) + string(APPEND build "system = 'windows'\n") + elseif(DARWIN) + string(APPEND build "system = 'darwin'\n") + elseif(CYGWIN) + string(APPEND build "system = 'cygwin'\n") + elseif(UNIX) + string(APPEND build "system = 'linux'\n") + else() + set(build_unknown TRUE) + endif() + + if(DEFINED build_cpu_fam) + string(APPEND build "cpu_family = '${build_cpu_fam}'\n") + endif() + if(DEFINED build_cpu) + string(APPEND build "cpu = '${build_cpu}'") + endif() + if(NOT build_unknown) + set(${build_system} "${build}" PARENT_SCOPE) + endif() + + set(host_unkown FALSE) if(VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64") set(host_cpu_fam x86_64) set(host_cpu x86_64) @@ -266,153 +223,172 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu set(host_cpu_fam wasm32) set(host_cpu wasm32) else() - message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) + if(NOT DEFINED VCPKG_MESON_CROSS_FILE OR NOT DEFINED VCPKG_MESON_NATIVE_FILE) + message(WARNING "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}! Please set VCPKG_MESON_(CROSS|NATIVE)_FILE to a meson file containing the host_machine entry!" ) + endif() + set(host_unkown TRUE) endif() - set(cross_file "") - z_vcpkg_append_proglist(cross_file "${additional_binaries}") - - string(APPEND cross_file "[properties]\n") - - string(APPEND cross_file "[host_machine]\n") - string(APPEND cross_file "endian = 'little'\n") + set(host "[host_machine]\n") # host=target in vcpkg. + string(APPEND host "endian = 'little'\n") if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW OR VCPKG_TARGET_IS_UWP) set(meson_system_name "windows") else() string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name) endif() - string(APPEND cross_file "system = '${meson_system_name}'\n") - string(APPEND cross_file "cpu_family = '${host_cpu_fam}'\n") - string(APPEND cross_file "cpu = '${host_cpu}'\n") - - string(APPEND cross_file "[build_machine]\n") - string(APPEND cross_file "endian = 'little'\n") - if(WIN32) - string(APPEND cross_file "system = 'windows'\n") - elseif(DARWIN) - string(APPEND cross_file "system = 'darwin'\n") - else() - string(APPEND cross_file "system = 'linux'\n") - endif() - - if(DEFINED build_cpu_fam) - string(APPEND cross_file "cpu_family = '${build_cpu_fam}'\n") - endif() - if(DEFINED build_cpu) - string(APPEND cross_file "cpu = '${build_cpu}'\n") + string(APPEND host "system = '${meson_system_name}'\n") + string(APPEND host "cpu_family = '${host_cpu_fam}'\n") + string(APPEND host "cpu = '${host_cpu}'") + if(NOT host_unkown) + set(${host_system} "${host}" PARENT_SCOPE) endif() if(NOT build_cpu_fam MATCHES "${host_cpu_fam}" OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_MINGW AND NOT WIN32)) - set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") - set(vcpkg_meson_cross_file "${native_config_name}" PARENT_SCOPE) - file(WRITE "${native_config_name}" "${cross_file}") + set(${is_cross} TRUE PARENT_SCOPE) endif() 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}") - if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(crt_type mt) - else() - set(crt_type md) - endif() - if(${config_type} STREQUAL "DEBUG") - set(crt_type ${crt_type}d) - endif() - set(c_winlibs "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") - set(cpp_winlibs "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") - foreach(libvar IN ITEMS c_winlibs cpp_winlibs) - string(REGEX REPLACE "( |^)(-|/)" [[;\2]] "${libvar}" "${${libvar}}") - string(REPLACE ".lib " ".lib;" "${libvar}" "${${libvar}}") - vcpkg_list(REMOVE_ITEM "${libvar}" "") - vcpkg_list(JOIN "${libvar}" "', '" "${libvar}") - string(APPEND cross_${config_type}_log "${libvar} = ['${${libvar}}']\n") - endforeach() - string(APPEND cross_${config_type}_log "b_vscrt = '${crt_type}'\n") - endif() - string(TOLOWER "${config_type}" lowerconfig) - set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}-${lowerconfig}.log") - set(VCPKG_MESON_CROSS_FILE_${config_type} "${native_config_name}" PARENT_SCOPE) - file(WRITE "${native_config_name}" "${cross_${config_type}_log}") +function(z_vcpkg_meson_setup_extra_windows_variables config_type) + ## b_vscrt + if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(crt_type "mt") + else() + set(crt_type "md") + endif() + if(config_type STREQUAL "DEBUG") + set(crt_type "${crt_type}d") + endif() + set(MESON_VSCRT_LINKAGE "b_vscrt = '${crt_type}'" PARENT_SCOPE) + ## winlibs + separate_arguments(c_winlibs NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + separate_arguments(cpp_winlibs NATIVE_COMMAND "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + list(TRANSFORM c_winlibs REPLACE "^(-|/)" "") + list(TRANSFORM cpp_winlibs REPLACE "^(-|/)" "") + z_vcpkg_meson_convert_list_to_python_array(c_winlibs ${c_winlibs}) + z_vcpkg_meson_convert_list_to_python_array(cpp_winlibs ${cpp_winlibs}) + set(MESON_WINLIBS "c_winlibs = ${c_winlibs}\n") + string(APPEND MESON_WINLIBS "cpp_winlibs = ${cpp_winlibs}") + set(MESON_WINLIBS "${MESON_WINLIBS}" PARENT_SCOPE) endfunction() +function(z_vcpkg_meson_setup_variables config_type) + set(meson_var_list VSCRT_LINKAGE WINLIBS MT AR RC C C_LD CXX CXX_LD OBJC OBJC_LD OBJCXX OBJCXX_LD FC FC_LD WINDRES CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS FCFLAGS SHARED_LINKER_FLAGS) + foreach(var IN LISTS meson_var_list) + set(MESON_${var} "") + endforeach() + + if(VCPKG_TARGET_IS_WINDOWS) + z_vcpkg_meson_setup_extra_windows_variables("${config_type}") + endif() + + z_vcpkg_meson_set_proglist_variables("${config_type}") + z_vcpkg_meson_set_flags_variables("${config_type}") + + foreach(var IN LISTS meson_var_list) + set(MESON_${var} "${MESON_${var}}" PARENT_SCOPE) + endforeach() +endfunction() function(vcpkg_configure_meson) # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 arg "NO_PKG_CONFIG" "SOURCE_PATH" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;LANGUAGES;ADDITIONAL_BINARIES;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES" ) + if(NOT arg_LANGUAGES) + set(arg_LANGUAGES C CXX) + endif() + + if(DEFINED arg_ADDITIONAL_NATIVE_BINARIES OR DEFINED arg_ADDITIONAL_CROSS_BINARIES) + message(WARNING "Options ADDITIONAL_(NATIVE|CROSS)_BINARIES have been deprecated. Only use ADDITIONAL_BINARIES!") + endif() + + vcpkg_list(APPEND arg_ADDITIONAL_BINARIES ${arg_ADDITIONAL_NATIVE_BINARIES} ${arg_ADDITIONAL_CROSS_BINARIES}) + vcpkg_list(REMOVE_DUPLICATES arg_ADDITIONAL_BINARIES) + vcpkg_list(JOIN arg_ADDITIONAL_BINARIES "\n" MESON_ADDITIONAL_BINARIES) + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") + if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) + z_vcpkg_select_default_vcpkg_chainload_toolchain() + endif() z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") vcpkg_find_acquire_program(MESON) - vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + get_filename_component(CMAKE_PATH "${CMAKE_COMMAND}" DIRECTORY) + vcpkg_add_to_path("${CMAKE_PATH}" PREPEND) # Make CMake invokeable for Meson - # Allow overrides / additional configuration variables from triplets - if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS) - vcpkg_list(APPEND arg_OPTIONS ${VCPKG_MESON_CONFIGURE_OPTIONS}) - endif() - if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE) - vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE}) + vcpkg_find_acquire_program(PYTHON3) + get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) + vcpkg_add_to_path("${PYTHON3_DIR}") + + vcpkg_find_acquire_program(NINJA) + get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Prepend to use the correct ninja. + + set(buildtypes "") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(buildname "DEBUG") + vcpkg_list(APPEND buildtypes "${buildname}") + set(path_suffix_${buildname} "debug/") + set(suffix_${buildname} "dbg") + set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") endif() - if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG) - vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG}) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(buildname "RELEASE") + vcpkg_list(APPEND buildtypes "${buildname}") + set(path_suffix_${buildname} "") + set(suffix_${buildname} "rel") + set(meson_input_file_${buildname} "${CURRENT_BUILDTREES_DIR}/meson-${TARGET_TRIPLET}-${suffix_${buildname}}.log") endif() - if(NOT vcpkg_meson_cross_file) - z_vcpkg_meson_generate_cross_file("${arg_ADDITIONAL_CROSS_BINARIES}") + vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + + z_vcpkg_get_build_and_host_system(MESON_HOST_MACHINE MESON_BUILD_MACHINE IS_CROSS) + + if(IS_CROSS) + # VCPKG_CROSSCOMPILING is not used since it regresses a lot of ports in x64-windows-x triplets + # For consistency this should proably be changed in the future? + vcpkg_list(APPEND arg_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${meson_input_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${meson_input_file_RELEASE}") + else() + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${meson_input_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${meson_input_file_RELEASE}") endif() - # We must use uppercase `DEBUG` and `RELEASE` here because they matches the configuration data - if(NOT VCPKG_MESON_CROSS_FILE_DEBUG AND vcpkg_meson_cross_file) - z_vcpkg_meson_generate_cross_file_config(DEBUG) + + # User provided cross/native files + if(VCPKG_MESON_NATIVE_FILE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE}") endif() - if(NOT VCPKG_MESON_CROSS_FILE_RELEASE AND vcpkg_meson_cross_file) - z_vcpkg_meson_generate_cross_file_config(RELEASE) + if(VCPKG_MESON_NATIVE_FILE_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") endif() - if(vcpkg_meson_cross_file) - vcpkg_list(APPEND arg_OPTIONS --cross "${vcpkg_meson_cross_file}") + if(VCPKG_MESON_NATIVE_FILE_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") endif() - if(VCPKG_MESON_CROSS_FILE_DEBUG) - vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") + if(VCPKG_MESON_CROSS_FILE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE}") endif() if(VCPKG_MESON_CROSS_FILE_RELEASE) vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") endif() - - if(NOT vcpkg_meson_native_file AND NOT vcpkg_meson_cross_file) - z_vcpkg_meson_generate_native_file("${arg_ADDITIONAL_NATIVE_BINARIES}") - endif() - if(NOT vcpkg_meson_native_file_DEBUG AND NOT vcpkg_meson_cross_file) - z_vcpkg_meson_generate_native_file_config(DEBUG) - endif() - if(NOT vcpkg_meson_native_file_RELEASE AND NOT vcpkg_meson_cross_file) - z_vcpkg_meson_generate_native_file_config(RELEASE) - endif() - if(vcpkg_meson_native_file AND NOT vcpkg_meson_cross_file) - vcpkg_list(APPEND arg_OPTIONS --native "${vcpkg_meson_native_file}") - vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${vcpkg_meson_native_file_DEBUG}") - vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${vcpkg_meson_native_file_RELEASE}") - else() - vcpkg_list(APPEND arg_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + if(VCPKG_MESON_CROSS_FILE_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_list(APPEND arg_OPTIONS --default-library shared) + set(MESON_DEFAULT_LIBRARY shared) else() - vcpkg_list(APPEND arg_OPTIONS --default-library static) + set(MESON_DEFAULT_LIBRARY static) endif() vcpkg_list(APPEND arg_OPTIONS --libdir lib) # else meson install into an architecture describing folder @@ -427,23 +403,18 @@ function(vcpkg_configure_meson) vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") endif() - - set(buildtypes) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(buildname "DEBUG") - vcpkg_list(APPEND buildtypes ${buildname}) - set(path_suffix_${buildname} "debug/") - set(suffix_${buildname} "dbg") + + # Allow overrides / additional configuration variables from triplets + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS) + vcpkg_list(APPEND arg_OPTIONS ${VCPKG_MESON_CONFIGURE_OPTIONS}) endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(buildname "RELEASE") - vcpkg_list(APPEND buildtypes ${buildname}) - set(path_suffix_${buildname} "") - set(suffix_${buildname} "rel") + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE) + vcpkg_list(APPEND arg_OPTIONS_RELEASE ${VCPKG_MESON_CONFIGURE_OPTIONS_RELEASE}) + endif() + if(DEFINED VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG) + vcpkg_list(APPEND arg_OPTIONS_DEBUG ${VCPKG_MESON_CONFIGURE_OPTIONS_DEBUG}) endif() - vcpkg_backup_env_variables(VARS INCLUDE) - vcpkg_host_path_list(APPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") # configure build foreach(buildtype IN LISTS buildtypes) message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}}") @@ -457,6 +428,9 @@ function(vcpkg_configure_meson) endif() endif() + z_vcpkg_meson_setup_variables(${buildtype}) + configure_file("${SCRIPTS}/buildsystems/meson/meson.template.in" "${meson_input_file_${buildtype}}" @ONLY) + vcpkg_execute_required_process( COMMAND ${MESON} ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}} ${arg_SOURCE_PATH} WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}" @@ -473,6 +447,4 @@ function(vcpkg_configure_meson) z_vcpkg_restore_pkgconfig_path() endif() endforeach() - - vcpkg_restore_env_variables(VARS INCLUDE) endfunction() diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index ec6ea55390739e..ee43ddb3d4e12b 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -9,7 +9,7 @@ list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING CMAKE_HOST_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR CMAKE_HOST_SYSTEM_PROCESSOR) -if(CMAKE_SYSTEM_NAME MATCHES "Darwin") +if(APPLE) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET CMAKE_OSX_SYSROOT) endif() @@ -30,7 +30,8 @@ foreach(_lang IN LISTS VCPKG_LANGUAGES) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILE_FEATURES) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_EXTENSION) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) - + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILER_TARGET) + # Probably never required since implicit. #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES) @@ -44,7 +45,7 @@ list(APPEND VCPKG_DEFAULT_ENV_VARS_TO_CHECK PATH INCLUDE C_INCLUDE_PATH CPLUS_IN list(REMOVE_DUPLICATES VCPKG_DEFAULT_ENV_VARS_TO_CHECK) #Flags to check. Flags are a bit special since they are configuration aware. -set(FLAGS ${VCPKG_LANGUAGES} RC SHARED_LINKER STATIC_LINKER EXE_LINKER) +set(FLAGS ${VCPKG_LANGUAGES} RC SHARED_LINKER STATIC_LINKER EXE_LINKER MODULE_LINKER) foreach(flag IN LISTS FLAGS) list(APPEND VCPKG_DEFAULT_FLAGS_TO_CHECK CMAKE_${flag}_FLAGS) endforeach() @@ -98,8 +99,9 @@ macro(_vcpkg_adjust_flags flag_var) endif() endif() endif() - if(CMAKE_SYSTEM_NAME MATCHES "Darwin") - if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS) + if(APPLE) + set(flags_to_add_osx_arch_sysroot "${VCPKG_LANG_FLAGS}" CMAKE_SHARED_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS) + if("${flag_var}" IN_LIST flags_to_add_osx_arch_sysroot) # 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) @@ -108,10 +110,24 @@ macro(_vcpkg_adjust_flags flag_var) 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}") + list(GET VCPKG_LANGUAGES 0 lang) + string(APPEND ${flag_var} " ${CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") + unset(lang) endif() endif() + unset(flags_to_add_osx_arch_sysroot) + endif() + set(flags_to_add_target "${VCPKG_LANG_FLAGS}" CMAKE_SHARED_LINKER_FLAGS CMAKE_MODULE_LINKER_FLAGS CMAKE_EXE_LINKER_FLAGS) + list(GET VCPKG_LANGUAGES 0 lang) + if(CMAKE_${lang}_COMPILER_TARGET AND "${flag_var}" IN_LIST flags_to_add_target) + if (CMAKE_${lang}_COMPILER_ID STREQUAL Clang) + string(PREPEND ${flag_var} "${CMAKE_${lang}_COMPILE_OPTIONS_TARGET}${CMAKE_${lang}_COMPILER_TARGET} ") + elseif(CMAKE_${lang}_COMPILE_OPTIONS_TARGET) + string(PREPEND ${flag_var} "${CMAKE_${lang}_COMPILE_OPTIONS_TARGET} ${CMAKE_${lang}_COMPILER_TARGET} ") + endif() endif() + unset(lang) + unset(flags_to_add_target) endmacro() foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) @@ -129,7 +145,6 @@ foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) endforeach() endforeach() - file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") # Programs: diff --git a/versions/baseline.json b/versions/baseline.json index aadc7d9a5bf8b1..7d73dca0cddbaa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7657,7 +7657,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2022-09-13", + "baseline": "2022-09-26", "port-version": 0 }, "vcpkg-cmake-config": { @@ -7665,8 +7665,8 @@ "port-version": 1 }, "vcpkg-cmake-get-vars": { - "baseline": "2022-05-10", - "port-version": 1 + "baseline": "2022-09-04", + "port-version": 0 }, "vcpkg-get-python-packages": { "baseline": "2022-06-30", diff --git a/versions/v-/vcpkg-cmake-get-vars.json b/versions/v-/vcpkg-cmake-get-vars.json index 362bbdce76ccf4..17841423d333ab 100644 --- a/versions/v-/vcpkg-cmake-get-vars.json +++ b/versions/v-/vcpkg-cmake-get-vars.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "898079c6021ced406d7c75f852e67a5e8861db9b", + "version-date": "2022-09-04", + "port-version": 0 + }, { "git-tree": "b50ca3d20736304215fbd82c102d4552457255bb", "version-date": "2022-05-10", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index f1bdb7e13448b6..f2423315ef399a 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8827e6f24005c4f60cb0a579a3a0115ef3d7b6c3", + "version-date": "2022-09-26", + "port-version": 0 + }, { "git-tree": "72b6903c393330b7c9042096d84cbd733619644e", "version-date": "2022-09-13", From e2aa9d12c4332d3e6077012e381725ba013aa305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MACHIZAUD=20Andr=C3=A9a?= Date: Thu, 13 Oct 2022 20:17:28 +0200 Subject: [PATCH 766/791] [mdl] Add port MDL-SDK 2021.1.2 (#24633) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [mdl] Add port MDL-SDK 2020.0.1 * [mdl] Expose `dds` and `freeimage` features * [mdl] Upgrade MDL-SDK 2020.1.2 * Update ports/mdl/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [mdl] simplify patch 001-freeimage-from-vcpkg.patch * [mdl] improve and simplify patch 003-install-rules.patch * [mdl] enable dependency log for better debugging in case of failure * [mdl] expose interface include directions for mdl core & mdl sdk * [mdl] build clang as part of vendored LLVM * [mdl] remove unnecessary export * [mdl] Use `unofficial::` namespace prefix * [mdl] remove unnecessary checks about clang CMake target * [mdl] `vcpkg_extract_source_archive` -> `vcpkg_extract_source_archive_ex` * [mdl] Use `vcpkg_find_acquire_program(CLANG7)` * [mdl] disable osx arm64 * [mdl] add license cf. https://developer.nvidia.com/nvidia-mdl-sdk-get-started * [mdl] Use `vcpkg-tool-clang7` * [mdl] restrict arm build * [vcpkg-tool-clang7] Fix broken symlink on UNIX platform * [mdl] Revert changes in `vckpg_find_acquire_program` * [mdl] Rely on `vcpkg-tool-clang7` `vcpkg-port-config.cmake` * [mdl] No support for x86 nor static CRT (because of dynamic linkage only) * Mark Windows static linkage ports as fail due to freeimage requirement * [mdl] Restrict static on Windows * [mdl] remove leftover patch * [vcpkg-tool-clang7] patch cleanup * Commit suggestion. * Versions * [mdl] include priority to vendored LLVM * [mdl] path in quotes * [mdl] update 001-freeimage-from-vcpkg.patch with comments * [mdl] Download clang 7 prior to build MDL-SDK * Fix incorrect clang path for UNIX * [mdl] portfile cleanup * Apply code review suggestions * Update ports/mdl/portfile.cmake Co-authored-by: Victor Romero * bump version * Address review comments * mdl -> mdl-sdk * minimize 006-guard-nonexisting-targets.patch * minimize 002-install-rules.patch * Notes in portfile about clang 7 usage * Add CMAKE_DISABLE_FIND_PACKAGE- to disable optional packages * Address comments Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Victor Romero --- ports/mdl-sdk/001-freeimage-from-vcpkg.patch | 68 +++++++ ports/mdl-sdk/002-install-rules.patch | 171 ++++++++++++++++++ .../mdl-sdk/003-freeimage-disable-faxg3.patch | 13 ++ ports/mdl-sdk/004-missing-std-includes.patch | 36 ++++ ...missing-link-windows-crypt-libraries.patch | 15 ++ .../006-guard-nonexisting-targets.patch | 38 ++++ ports/mdl-sdk/007-plugin-options.patch | 48 +++++ ports/mdl-sdk/008-build-static-llvm.patch | 17 ++ .../009-include-priority-vendored-llvm.patch | 13 ++ ports/mdl-sdk/portfile.cmake | 144 +++++++++++++++ ports/mdl-sdk/unofficial-mdl-config.cmake.in | 10 + ports/mdl-sdk/vcpkg.json | 41 +++++ versions/baseline.json | 4 + versions/m-/mdl-sdk.json | 9 + 14 files changed, 627 insertions(+) create mode 100644 ports/mdl-sdk/001-freeimage-from-vcpkg.patch create mode 100644 ports/mdl-sdk/002-install-rules.patch create mode 100644 ports/mdl-sdk/003-freeimage-disable-faxg3.patch create mode 100644 ports/mdl-sdk/004-missing-std-includes.patch create mode 100644 ports/mdl-sdk/005-missing-link-windows-crypt-libraries.patch create mode 100644 ports/mdl-sdk/006-guard-nonexisting-targets.patch create mode 100644 ports/mdl-sdk/007-plugin-options.patch create mode 100644 ports/mdl-sdk/008-build-static-llvm.patch create mode 100644 ports/mdl-sdk/009-include-priority-vendored-llvm.patch create mode 100644 ports/mdl-sdk/portfile.cmake create mode 100644 ports/mdl-sdk/unofficial-mdl-config.cmake.in create mode 100644 ports/mdl-sdk/vcpkg.json create mode 100644 versions/m-/mdl-sdk.json diff --git a/ports/mdl-sdk/001-freeimage-from-vcpkg.patch b/ports/mdl-sdk/001-freeimage-from-vcpkg.patch new file mode 100644 index 00000000000000..d02479f7a8d2bb --- /dev/null +++ b/ports/mdl-sdk/001-freeimage-from-vcpkg.patch @@ -0,0 +1,68 @@ +diff --git a/cmake/dependencies/add_freeimage.cmake b/cmake/dependencies/add_freeimage.cmake +index 944d452..3916352 100644 +--- a/cmake/dependencies/add_freeimage.cmake ++++ b/cmake/dependencies/add_freeimage.cmake +@@ -67,13 +67,4 @@ else() + ) + endif() + endif() +- +- # copy runtime dependencies +- # copy system libraries only on windows, we assume the libraries are installed in a unix environment +- if(NOT __TARGET_ADD_DEPENDENCY_NO_RUNTIME_COPY AND WINDOWS) +- target_copy_to_output_dir(TARGET ${__TARGET_ADD_DEPENDENCY_TARGET} +- FILES +- ${MDL_DEPENDENCY_FREEIMAGE_SHARED} +- ) +- endif() + endif() +diff --git a/cmake/find/find_freeimage_ext.cmake b/cmake/find/find_freeimage_ext.cmake +index b11573a..703458e 100644 +--- a/cmake/find/find_freeimage_ext.cmake ++++ b/cmake/find/find_freeimage_ext.cmake +@@ -28,6 +28,9 @@ + + function(FIND_FREEIMAGE_EXT) + ++ find_package(freeimage CONFIG REQUIRED) ++ if(0) ++ + set(FREEIMAGE_DIR "NOT-SPECIFIED" CACHE PATH "Directory that contains the freeimage library and the corresponding headers.") + #----------------------------------------------------------------------------------------------- + +@@ -90,6 +93,35 @@ function(FIND_FREEIMAGE_EXT) + endif() + endif() + ++ else() ++ get_target_property(_FREEIMAGE_INCLUDE freeimage::FreeImage INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(_FREEIMAGE_DEPENDENCIES freeimage::FreeImage INTERFACE_LINK_LIBRARIES ) ++ ++ get_target_property(_FREEIMAGE_SHARED freeimage::FreeImage IMPORTED_LOCATION) ++ if(NOT _FREEIMAGE_SHARED) ++ get_target_property(_FREEIMAGE_SHARED freeimage::FreeImage IMPORTED_LOCATION_RELEASE) ++ endif() ++ if(NOT _FREEIMAGE_SHARED) ++ get_target_property(_FREEIMAGE_SHARED freeimage::FreeImage IMPORTED_LOCATION_DEBUG) ++ endif() ++ ++ get_target_property(_FREEIMAGE_TYPE freeimage::FreeImage TYPE) ++ if(${_FREEIMAGE_TYPE} STREQUAL "SHARED_LIBRARY") ++ get_target_property(_FREEIMAGE_LIB freeimage::FreeImage IMPORTED_IMPLIB) ++ if(NOT _FREEIMAGE_LIB) ++ get_target_property(_FREEIMAGE_LIB freeimage::FreeImage IMPORTED_IMPLIB_RELEASE) ++ endif() ++ if(NOT _FREEIMAGE_LIB) ++ get_target_property(_FREEIMAGE_LIB freeimage::FreeImage IMPORTED_IMPLIB_DEBUG) ++ endif() ++ endif() ++ ++ find_file(_FREEIMAGE_HEADER_FILE "FreeImage.h" ++ HINTS ++ ${_FREEIMAGE_INCLUDE} ++ ) ++ endif() ++ + # error if dependencies can not be resolved + if(NOT EXISTS ${_FREEIMAGE_INCLUDE} OR (WINDOWS AND NOT EXISTS ${_FREEIMAGE_LIB}) OR NOT EXISTS ${_FREEIMAGE_SHARED}) + message(STATUS "FREEIMAGE_DIR: ${FREEIMAGE_DIR}") diff --git a/ports/mdl-sdk/002-install-rules.patch b/ports/mdl-sdk/002-install-rules.patch new file mode 100644 index 00000000000000..331575ea4e6597 --- /dev/null +++ b/ports/mdl-sdk/002-install-rules.patch @@ -0,0 +1,171 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1f1902c..623bec8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,6 +53,9 @@ option(MDL_LOG_FILE_DEPENDENCIES "Prints the list of files that is copied after + set(MDL_ADDITIONAL_COMPILER_DEFINES "MDL_SOURCE_RELEASE" CACHE STRING "Additional compile defines that are passed to each of the projects") + set(MDL_ADDITIONAL_COMPILER_OPTIONS "" CACHE STRING "Additional compile options that are passed to each of the projects") + ++include(GNUInstallDirs) ++include(CMakePackageConfigHelpers) ++ + # set the default installation path + if(NOT DEFINED CMAKE_INSTALL_PREFIX OR CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "..." FORCE) +@@ -235,3 +238,35 @@ foreach(_TEST_POST ${MDL_TEST_LIST_POST}) + add_subdirectory(${_TEST_POST}) + endforeach() + ++# Config ++#-------------------------------------------------------------------------------------------------- ++ ++set(PATH_EXPORT_TARGETS "${CMAKE_INSTALL_DATADIR}/unofficial-mdl/unofficial-mdl-targets.cmake") ++configure_package_config_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/unofficial-mdl-config.cmake.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/unofficial-mdl-config.cmake" ++ PATH_VARS ++ PATH_EXPORT_TARGETS ++ INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/unofficial-mdl ++) ++ ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-mdl-config-version.cmake" ++ VERSION 2021.0.1 ++ COMPATIBILITY SameMajorVersion ++) ++ ++# Install ++#-------------------------------------------------------------------------------------------------- ++ ++install( ++ EXPORT unofficial-mdl-targets ++ NAMESPACE "unofficial::mdl::" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-mdl" ++) ++ ++install( ++ FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/unofficial-mdl-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/unofficial-mdl-config-version.cmake ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/unofficial-mdl" ++) +diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake +index 5e9774f..51dc65c 100644 +--- a/cmake/utilities.cmake ++++ b/cmake/utilities.cmake +@@ -705,6 +705,7 @@ function(CREATE_FROM_BASE_PRESET) + # adjust output file name if requested + if(CREATE_FROM_BASE_PRESET_OUTPUT_NAME) + set_target_properties(${CREATE_FROM_BASE_PRESET_TARGET} PROPERTIES OUTPUT_NAME ${CREATE_FROM_BASE_PRESET_OUTPUT_NAME}) ++ set_target_properties(${CREATE_FROM_BASE_PRESET_TARGET} PROPERTIES EXPORT_NAME ${CREATE_FROM_BASE_PRESET_OUTPUT_NAME}) + endif() + + # log message +@@ -1143,6 +1144,15 @@ endfunction() + # ------------------------------------------------------------------------------------------------- + # basic install logic to copy the entire output folder + ++set(_MDL_PROD_TARGETS ++ prod-lib-mdl_core ++ prod-lib-mdl_sdk ++ prod-bin-i18n ++ prod-bin-mdlc ++ prod-bin-mdlm ++ shaders-plugin-dds ++ shaders-plugin-freeimage ++) + function(ADD_TARGET_INSTALL) + set(options) + set(oneValueArgs TARGET DESTINATION) +@@ -1152,6 +1162,14 @@ function(ADD_TARGET_INSTALL) + # - ADD_TARGET_INSTALL_TARGET + # - ADD_TARGET_INSTALL_DESTINATION + ++ if(${ADD_TARGET_INSTALL_TARGET} IN_LIST _MDL_PROD_TARGETS) ++ install( ++ TARGETS ${ADD_TARGET_INSTALL_TARGET} ++ EXPORT unofficial-mdl-targets ++ ) ++ return() ++ endif() ++ + install(DIRECTORY $/ + DESTINATION ${ADD_TARGET_INSTALL_DESTINATION} + USE_SOURCE_PERMISSIONS + +diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt +index 246303d..28934b4 100644 +--- a/include/CMakeLists.txt ++++ b/include/CMakeLists.txt +@@ -229,3 +229,8 @@ source_group("base" FILES ${PROJECT_HEADERS_BASE}) + source_group("math" FILES ${PROJECT_HEADERS_MATH}) + source_group("mdl" FILES ${PROJECT_HEADERS_MDL}) + source_group("neuraylib" FILES ${PROJECT_HEADERS_NEURAYLIB}) ++ ++install( ++ DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/mi" ++ TYPE INCLUDE ++) +diff --git a/src/prod/lib/mdl_core/CMakeLists.txt b/src/prod/lib/mdl_core/CMakeLists.txt +index b60a1fc..3c3d2f4 100644 +--- a/src/prod/lib/mdl_core/CMakeLists.txt ++++ b/src/prod/lib/mdl_core/CMakeLists.txt +@@ -42,9 +42,15 @@ create_from_base_preset( + EMBED_RC "mdl_core.rc" + ) + ++target_include_directories(${PROJECT_NAME} ++ PUBLIC ++ $ ++) ++ + # customize name + set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "lib") + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "mdl_core") ++set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME "mdl_core") + + if(MACOSX) + set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".so") # corresponding to the binary release +diff --git a/src/prod/lib/mdl_sdk/CMakeLists.txt b/src/prod/lib/mdl_sdk/CMakeLists.txt +index 6ddfc24..51c84e7 100644 +--- a/src/prod/lib/mdl_sdk/CMakeLists.txt ++++ b/src/prod/lib/mdl_sdk/CMakeLists.txt +@@ -44,9 +44,15 @@ create_from_base_preset( + EMBED_RC "mdl_sdk.rc" + ) + ++target_include_directories(${PROJECT_NAME} ++ PUBLIC ++ $ ++) ++ + # customize name + set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "lib") + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "mdl_sdk") ++set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME "mdl_sdk") + + if(MACOSX) + set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".so") # corresponding to the binary release +diff --git a/src/shaders/plugin/dds/CMakeLists.txt b/src/shaders/plugin/dds/CMakeLists.txt +index 81558b0..179e1df 100644 +--- a/src/shaders/plugin/dds/CMakeLists.txt ++++ b/src/shaders/plugin/dds/CMakeLists.txt +@@ -65,6 +65,7 @@ create_from_base_preset( + # customize name + set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "dds") ++set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME "dds") + + if(MACOSX) + set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".so") # corresponding to the binary release +diff --git a/src/shaders/plugin/freeimage/CMakeLists.txt b/src/shaders/plugin/freeimage/CMakeLists.txt +index b3ae039..a28b50e 100644 +--- a/src/shaders/plugin/freeimage/CMakeLists.txt ++++ b/src/shaders/plugin/freeimage/CMakeLists.txt +@@ -56,6 +56,7 @@ create_from_base_preset( + # customize name + set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") + set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "nv_freeimage") ++set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME "nv_freeimage") + + if(MACOSX) + set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".so") # corresponding to the binary release diff --git a/ports/mdl-sdk/003-freeimage-disable-faxg3.patch b/ports/mdl-sdk/003-freeimage-disable-faxg3.patch new file mode 100644 index 00000000000000..c2fed9cfda39b1 --- /dev/null +++ b/ports/mdl-sdk/003-freeimage-disable-faxg3.patch @@ -0,0 +1,13 @@ +diff --git a/src/shaders/plugin/freeimage/freeimage_image_plugin_impl.cpp b/src/shaders/plugin/freeimage/freeimage_image_plugin_impl.cpp +index ff79628..f22d05b 100644 +--- a/src/shaders/plugin/freeimage/freeimage_image_plugin_impl.cpp ++++ b/src/shaders/plugin/freeimage/freeimage_image_plugin_impl.cpp +@@ -270,7 +270,7 @@ Plugin_description g_plugin_list[] = { + Plugin_description( "fi_cut" , FIF_CUT ), + Plugin_description( "fi_dds" , FIF_DDS ), + Plugin_description( "fi_exr" , FIF_EXR ), +- Plugin_description( "fi_faxg3" , FIF_FAXG3 ), ++ // Plugin_description( "fi_faxg3" , FIF_FAXG3 ), # not shipped with vcpkg + Plugin_description( "fi_gif" , FIF_GIF ), + Plugin_description( "fi_hdr" , FIF_HDR ), + Plugin_description( "fi_ico" , FIF_ICO ), diff --git a/ports/mdl-sdk/004-missing-std-includes.patch b/ports/mdl-sdk/004-missing-std-includes.patch new file mode 100644 index 00000000000000..18fd7d902803db --- /dev/null +++ b/ports/mdl-sdk/004-missing-std-includes.patch @@ -0,0 +1,36 @@ +diff --git a/src/api/api/neuray/neuray_class_factory.h b/src/api/api/neuray/neuray_class_factory.h +index b8b5b55..c226458 100644 +--- a/src/api/api/neuray/neuray_class_factory.h ++++ b/src/api/api/neuray/neuray_class_factory.h +@@ -40,6 +40,7 @@ + + #include + #include ++#include + + #include + #include +diff --git a/src/api/api/neuray/neuray_mdl_resource_callback.h b/src/api/api/neuray/neuray_mdl_resource_callback.h +index 5439cfb..cd803fa 100644 +--- a/src/api/api/neuray/neuray_mdl_resource_callback.h ++++ b/src/api/api/neuray/neuray_mdl_resource_callback.h +@@ -35,6 +35,7 @@ + + #include + #include ++#include + + #include + #include +diff --git a/src/base/util/registry/config_registry_impl.cpp b/src/base/util/registry/config_registry_impl.cpp +index 01ad0c1..dd089ec 100644 +--- a/src/base/util/registry/config_registry_impl.cpp ++++ b/src/base/util/registry/config_registry_impl.cpp +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + namespace MI { + namespace CONFIG { diff --git a/ports/mdl-sdk/005-missing-link-windows-crypt-libraries.patch b/ports/mdl-sdk/005-missing-link-windows-crypt-libraries.patch new file mode 100644 index 00000000000000..9eb00efc08e027 --- /dev/null +++ b/ports/mdl-sdk/005-missing-link-windows-crypt-libraries.patch @@ -0,0 +1,15 @@ +diff --git a/src/io/scene/CMakeLists.txt b/src/io/scene/CMakeLists.txt +index 5a0a1c6..37a0a19 100644 +--- a/src/io/scene/CMakeLists.txt ++++ b/src/io/scene/CMakeLists.txt +@@ -104,5 +104,10 @@ target_add_dependencies(TARGET ${PROJECT_NAME} + boost + ) + ++target_compile_definitions(${PROJECT_NAME} ++ PRIVATE ++ BOOST_UUID_FORCE_AUTO_LINK # for some reason this is not working while using vcpkg boost-uuid ++) ++ + # add tests if available + add_tests(POST) diff --git a/ports/mdl-sdk/006-guard-nonexisting-targets.patch b/ports/mdl-sdk/006-guard-nonexisting-targets.patch new file mode 100644 index 00000000000000..723d544292d1a4 --- /dev/null +++ b/ports/mdl-sdk/006-guard-nonexisting-targets.patch @@ -0,0 +1,38 @@ +diff --git a/src/mdl/jit/llvm/CMakeLists.txt b/src/mdl/jit/llvm/CMakeLists.txt +index 70f7f50..13857be 100644 +--- a/src/mdl/jit/llvm/CMakeLists.txt ++++ b/src/mdl/jit/llvm/CMakeLists.txt +@@ -289,11 +289,16 @@ endforeach() + + # ------------------------------------------------------------------------------------------------- + # set options for all other projects that are build in addition to the libs we need +-set(ADDITIONAL_LLVM_TARGETS +- obj.llvm-tblgen +- llvm-tblgen ++set(ADDITIONAL_LLVM_TARGETS ++ llvm-tblgen + ) + ++ ++# LLVM_ENABLE_OBJLIB cf. dist\cmake\modules\TableGen.cmake:125 ++if(NOT (CMAKE_GENERATOR STREQUAL "Ninja" AND NOT CMAKE_VERSION VERSION_LESS 3.9) AND NOT XCODE) ++ list(APPEND ADDITIONAL_LLVM_TARGETS obj.llvm-tblgen) ++endif() ++ + foreach(_ADD_LLVM ${ADDITIONAL_LLVM_TARGETS}) + message(STATUS "setting flags for ${_ADD_LLVM}") + llvm_target_setup(TARGET ${_ADD_LLVM}) +@@ -360,9 +365,10 @@ if(WINDOWS) + ) + endif() + +- set(_LLVM_EXCLUDE ${_LLVM_EXCLUDE} +- LLVMVisualizers +- ) ++ # LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION cf. dist\CMakeLists.txt:559 ++ if (MSVC_IDE AND NOT (MSVC_VERSION LESS 1900)) ++ list(APPEND _LLVM_EXCLUDE LLVMVisualizers) ++ endif() + endif() + + diff --git a/ports/mdl-sdk/007-plugin-options.patch b/ports/mdl-sdk/007-plugin-options.patch new file mode 100644 index 00000000000000..4a877d036e6861 --- /dev/null +++ b/ports/mdl-sdk/007-plugin-options.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index def8fce..33dc3de 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,6 +47,8 @@ set(MDL_EXAMPLES_FOLDER ${CMAKE_SOURCE_DIR}/examples CACHE PATH "The folder that + option(MDL_BUILD_SDK_EXAMPLES "Adds MDL SDK examples to the build." ON) + option(MDL_BUILD_CORE_EXAMPLES "Adds MDL Core examples to the build." ON) + option(MDL_BUILD_ARNOLD_PLUGIN "Enable the build of the MDL Arnold plugin." OFF) ++option(MDL_BUILD_DDS_PLUGIN "Enable the build of the MDL DDS image plugin." ON) ++option(MDL_BUILD_FREEIMAGE_PLUGIN "Enable the build of the MDL Freeimage image plugin." ON) + option(MDL_LOG_PLATFORM_INFOS "Prints some infos about the current build system (relevant for error reports)." ON) + option(MDL_LOG_DEPENDENCIES "Prints the list of dependencies during the generation step." OFF) + option(MDL_LOG_FILE_DEPENDENCIES "Prints the list of files that is copied after a successful build." OFF) +@@ -148,8 +150,12 @@ add_subdirectory(${MDL_SRC_FOLDER}/prod/bin/mdlm) + + # PLUGINS + #-------------------------------------------------------------------------------------------------- +-add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/dds) +-add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/freeimage) ++if(MDL_BUILD_DDS_PLUGIN) ++ add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/dds) ++endif() ++if(MDL_BUILD_FREEIMAGE_PLUGIN) ++ add_subdirectory(${MDL_SRC_FOLDER}/shaders/plugin/freeimage) ++endif() + + # EXAMPLES + #-------------------------------------------------------------------------------------------------- +diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake +index ecdb672..74f54e0 100644 +--- a/cmake/utilities.cmake ++++ b/cmake/utilities.cmake +@@ -1148,9 +1148,13 @@ set(_MDL_PROD_TARGETS + prod-bin-i18n + prod-bin-mdlc + prod-bin-mdlm +- shaders-plugin-dds +- shaders-plugin-freeimage + ) ++if(MDL_BUILD_DDS_PLUGIN) ++ list(APPEND _MDL_PROD_TARGETS shaders-plugin-dds) ++endif() ++if(MDL_BUILD_FREEIMAGE_PLUGIN) ++ list(APPEND _MDL_PROD_TARGETS shaders-plugin-freeimage) ++endif() + function(ADD_TARGET_INSTALL) + set(options) + set(oneValueArgs TARGET DESTINATION) diff --git a/ports/mdl-sdk/008-build-static-llvm.patch b/ports/mdl-sdk/008-build-static-llvm.patch new file mode 100644 index 00000000000000..778fa7bdef0f5b --- /dev/null +++ b/ports/mdl-sdk/008-build-static-llvm.patch @@ -0,0 +1,17 @@ +diff --git a/src/mdl/jit/llvm/dist/cmake/modules/AddLLVM.cmake b/src/mdl/jit/llvm/dist/cmake/modules/AddLLVM.cmake +index ce2057f..7ad8dfe 100644 +--- a/src/mdl/jit/llvm/dist/cmake/modules/AddLLVM.cmake ++++ b/src/mdl/jit/llvm/dist/cmake/modules/AddLLVM.cmake +@@ -616,11 +616,7 @@ macro(add_llvm_library name) + "" + "" + ${ARGN}) +- if( BUILD_SHARED_LIBS OR ARG_SHARED ) +- llvm_add_library(${name} SHARED ${ARG_UNPARSED_ARGUMENTS}) +- else() +- llvm_add_library(${name} ${ARG_UNPARSED_ARGUMENTS}) +- endif() ++ llvm_add_library(${name} STATIC ${ARG_UNPARSED_ARGUMENTS}) + + # Libraries that are meant to only be exposed via the build tree only are + # never installed and are only exported as a target in the special build tree diff --git a/ports/mdl-sdk/009-include-priority-vendored-llvm.patch b/ports/mdl-sdk/009-include-priority-vendored-llvm.patch new file mode 100644 index 00000000000000..6f300482a9c2d0 --- /dev/null +++ b/ports/mdl-sdk/009-include-priority-vendored-llvm.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/dependencies/add_llvm.cmake b/cmake/dependencies/add_llvm.cmake +index e477c57..0e323d0 100644 +--- a/cmake/dependencies/add_llvm.cmake ++++ b/cmake/dependencies/add_llvm.cmake +@@ -100,7 +100,7 @@ set(_LLVM_LIB_NAMES + LLVMSupport + ) + +-target_include_directories(${__TARGET_ADD_DEPENDENCY_TARGET} ++target_include_directories(${__TARGET_ADD_DEPENDENCY_TARGET} BEFORE + PRIVATE + ${mdl-jit-llvm_SOURCE_DIR}/dist/include + ${mdl-jit-llvm_BINARY_DIR}/dist/include diff --git a/ports/mdl-sdk/portfile.cmake b/ports/mdl-sdk/portfile.cmake new file mode 100644 index 00000000000000..316a78a2735a6d --- /dev/null +++ b/ports/mdl-sdk/portfile.cmake @@ -0,0 +1,144 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +# Notes on Clang 7 binary download: +# MDL-SDK requires Clang version 7.0.0 previsely as a *build tool* not as a *source compiler* as it is usually used. +# This ports provides CMake instructions to fetch and use it to build this port - and only for this purpose: +# it will not be installed and as such not be usable by any other ports. +# +# More details on the why below: +# MDL-SDK supports its own source file format (NVIDIA MDL sources `.mdl`), and can codegen executable code at runtime using its own vendored and modified version of LLVM 7.0.0. +# Also, at buildtime MDL-SDK also "pre-compile" MDL core libraries as LLVM bitcode directly into its binaries (through generated c array in headers) using this very Clang 7.0.0. +# To have everything working together, we have to use a Clang as build tool which match the vendored LLVM version so that LLVM bitcode can be loaded/linked properly as it is not compatible across MLLVM versions. + +# Clang 7 build tool + +set(LLVM_VERSION 7.0.0) +set(LLVM_BASE_URL "https://releases.llvm.org/${LLVM_VERSION}") + +if(VCPKG_HOST_IS_WINDOWS) + set(LLVM_FILENAME "LLVM-${LLVM_VERSION}-win64.exe") + set(LLVM_HASH c2b1342469275279f833fdc1e17ba5a9f99021306d6ab3d7209822a01d690767739eebf92fd9f23a44de5c5d00260fed50d5262b23a8eccac55b8ae901e2815c) +elseif(VCPKG_HOST_IS_LINUX) + set(LLVM_FILENAME "clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-16.04.tar.xz") + set(LLVM_HASH fb3dc588137426dc28a20ef5e34e9341b18114f03bf7d83fafbb301efbfd801bba08615b804817c80252e366de9d2f8efbef034e53a1b885b34c86c2fbbf9c28) +elseif(VCPKG_HOST_IS_FREEBSD) + set(LLVM_FILENAME "clang+llvm-${LLVM_VERSION}-amd64-unknown-freebsd11.tar.xz") + set(LLVM_HASH d501484c38cfced196128866a19f7fef1e0b5d609ea050d085b7deab04ac8cc2bbf74b3cfe6cd90d8ea17a1d9cfca028a6c933f0736153ba48785ddc8646574f) +elseif(VCPKG_HOST_IS_OSX) + set(LLVM_FILENAME "clang+llvm-${LLVM_VERSION}-x86_64-apple-darwin.tar.xz") + set(LLVM_HASH c5ca6a7756e0cecdf78d4d0c522fe7e803d4b1b2049cb502a034fe8f5ca30fcbf0e738ebfbc89c87de8adcd90ea64f637eb82e9130bb846b43b91f67dfa4b916) +else() + message(FATAL_ERROR "Pre-built binaries for Clang 7 not available, aborting install (platform: ${VCPKG_CMAKE_SYSTEM_NAME}).") +endif() + +vcpkg_download_distfile(LLVM_ARCHIVE_PATH + URLS "${LLVM_BASE_URL}/${LLVM_FILENAME}" + SHA512 ${LLVM_HASH} + FILENAME "${LLVM_FILENAME}" +) + +if(VCPKG_TARGET_IS_WINDOWS) + get_filename_component(LLVM_BASENAME "${LLVM_FILENAME}" NAME_WE) + set(LLVM_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/${LLVM_BASENAME}") + file(REMOVE_RECURSE "${LLVM_DIRECTORY}") + file(MAKE_DIRECTORY "${LLVM_DIRECTORY}") + + vcpkg_find_acquire_program(7Z) + vcpkg_execute_in_download_mode( + COMMAND ${7Z} x + "${LLVM_ARCHIVE_PATH}" + "-o${LLVM_DIRECTORY}" + -y -bso0 -bsp0 + WORKING_DIRECTORY "${LLVM_DIRECTORY}" + ) +else() + vcpkg_extract_source_archive(LLVM_DIRECTORY + ARCHIVE "${LLVM_ARCHIVE_PATH}" + SOURCE_BASE "clang+llvm-${LLVM_VERSION}" + ) +endif() + +set(LLVM_CLANG7 "${LLVM_DIRECTORY}/bin/clang${VCPKG_HOST_EXECUTABLE_SUFFIX}") +if(NOT EXISTS "${LLVM_CLANG7}") + message(FATAL_ERROR "Missing required build tool clang 7, please check your setup.") +endif() + +# MDL-SDK + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO NVIDIA/MDL-SDK + REF d6c9a6560265025a30d16fcd9d664f830ab63109 + SHA512 d6161a317ca0fd3cf8c782f058fc43765d611b5f6a8e82da736f5164a0e1829a46f75e376715fcb7cb9521406365aa88880ed44235b2bf63899affcc5bd54091 + HEAD_REF master + PATCHES + 001-freeimage-from-vcpkg.patch + 002-install-rules.patch + 003-freeimage-disable-faxg3.patch + 004-missing-std-includes.patch + 005-missing-link-windows-crypt-libraries.patch + 006-guard-nonexisting-targets.patch + 007-plugin-options.patch + 008-build-static-llvm.patch + 009-include-priority-vendored-llvm.patch +) + +string(COMPARE NOTEQUAL "${VCPKG_CRT_LINKAGE}" "static" _MVSC_CRT_LINKAGE_OPTION) + +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dds MDL_BUILD_DDS_PLUGIN + freeimage MDL_BUILD_FREEIMAGE_PLUGIN +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-mdl-config.cmake.in" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMDL_LOG_DEPENDENCIES:BOOL=ON + + -DMDL_MSVC_DYNAMIC_RUNTIME_EXAMPLES:BOOL=${_MVSC_CRT_LINKAGE_OPTION} + + -DMDL_ENABLE_CUDA_EXAMPLES:BOOL=OFF + -DMDL_ENABLE_OPENGL_EXAMPLES:BOOL=OFF + -DMDL_ENABLE_QT_EXAMPLES:BOOL=OFF + -DMDL_ENABLE_D3D12_EXAMPLES:BOOL=OFF + -DMDL_ENABLE_OPTIX7_EXAMPLES:BOOL=OFF + -DMDL_ENABLE_MATERIALX:BOOL=OFF + + -DMDL_BUILD_SDK_EXAMPLES:BOOL=OFF + -DMDL_BUILD_CORE_EXAMPLES:BOOL=OFF + -DMDL_BUILD_ARNOLD_PLUGIN:BOOL=OFF + + -Dpython_PATH:PATH=${PYTHON3} + -Dclang_PATH:PATH=${LLVM_CLANG7} + + ${FEATURE_OPTIONS} + + MAYBE_UNUSED_VARIABLES + -DCMAKE_DISABLE_FIND_PACKAGE_GLEW=ON + -DCMAKE_DISABLE_FIND_PACKAGE_glfw3=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=ON + -DCMAKE_DISABLE_FIND_PACKAGE_OCaml=ON + -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Subversion=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-mdl) +vcpkg_copy_tools( + TOOL_NAMES i18n mdlc mdlm + AUTO_CLEAN +) + +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/ports/mdl-sdk/unofficial-mdl-config.cmake.in b/ports/mdl-sdk/unofficial-mdl-config.cmake.in new file mode 100644 index 00000000000000..be605b2932d6a5 --- /dev/null +++ b/ports/mdl-sdk/unofficial-mdl-config.cmake.in @@ -0,0 +1,10 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) + +find_dependency(Boost) +find_dependency(freeimage CONFIG) +find_dependency(OpenGL) + +include("@PACKAGE_PATH_EXPORT_TARGETS@") +check_required_components("@PROJECT_NAME@") diff --git a/ports/mdl-sdk/vcpkg.json b/ports/mdl-sdk/vcpkg.json new file mode 100644 index 00000000000000..1b2b4809397513 --- /dev/null +++ b/ports/mdl-sdk/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "mdl-sdk", + "version": "2021.1.2", + "description": "NVIDIA Material Definition Language SDK", + "homepage": "https://github.com/NVIDIA/MDL-SDK", + "license": "BSD-3-Clause", + "supports": "!arm & !x86 & !(windows & static)", + "dependencies": [ + "boost-algorithm", + "boost-any", + "boost-bind", + "boost-core", + "boost-function", + "boost-functional", + "boost-smart-ptr", + "boost-tokenizer", + "boost-unordered", + "boost-uuid", + "freeimage", + "opengl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "dds": { + "description": "Build image plugin for DDS" + }, + "freeimage": { + "description": "Build image plugin for various image formats using Freeimage", + "dependencies": [ + "freeimage" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 7d73dca0cddbaa..29c1c0c147ef47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4692,6 +4692,10 @@ "baseline": "2.7.2.14", "port-version": 3 }, + "mdl-sdk": { + "baseline": "2021.1.2", + "port-version": 0 + }, "mdns": { "baseline": "1.4.2", "port-version": 0 diff --git a/versions/m-/mdl-sdk.json b/versions/m-/mdl-sdk.json new file mode 100644 index 00000000000000..5befda98fa3794 --- /dev/null +++ b/versions/m-/mdl-sdk.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1ea6f971b1824f51c7beed4983f54733b24f1bed", + "version": "2021.1.2", + "port-version": 0 + } + ] +} From 51b5543484248782b6290ed65ab81d1fc7f899b8 Mon Sep 17 00:00:00 2001 From: hesham-essam <101147828+hesham-essam@users.noreply.github.com> Date: Thu, 13 Oct 2022 20:20:24 +0200 Subject: [PATCH 767/791] [glib]: bump version to 2.74.0 (#26949) * [glib]: bump version to 2.74.0 * Disable gtkdocize for libmount * restore git-tree * update version * Recommend installing libselinux1-dev to enable selinux support Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/glib/libintl.patch | 72 +++++++++++------------- ports/glib/portfile.cmake | 24 ++++---- ports/glib/use-libiconv-on-windows.patch | 18 +++--- ports/glib/vcpkg.json | 5 +- ports/lcm/glib.link.patch | 2 +- ports/lcm/vcpkg.json | 2 +- ports/libmount/portfile.cmake | 2 + ports/libmount/vcpkg.json | 1 + versions/baseline.json | 8 +-- versions/g-/glib.json | 5 ++ versions/l-/lcm.json | 5 ++ versions/l-/libmount.json | 5 ++ 12 files changed, 83 insertions(+), 66 deletions(-) diff --git a/ports/glib/libintl.patch b/ports/glib/libintl.patch index 8462893d52dbb8..c904955fddd232 100644 --- a/ports/glib/libintl.patch +++ b/ports/glib/libintl.patch @@ -1,51 +1,47 @@ diff --git a/meson.build b/meson.build -index 7773f56..171d193 100644 +index f44fa2d4e..d465253af 100644 --- a/meson.build +++ b/meson.build -@@ -2089,42 +2089,10 @@ endif +@@ -2090,37 +2090,10 @@ libz_dep = dependency('zlib') + # proxy-libintl subproject. # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. - libintl_deps = [] --if cc.has_function('ngettext') -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') --else -- # First just find the bare library. -- libintl = cc.find_library('intl', required : false) -- # The bare library probably won't link without help if it's static. -- if libintl.found() and not cc.has_function('ngettext', dependencies : libintl) -- libintl_iconv = cc.find_library('iconv', required : false) -- # libintl supports different threading APIs, which may not -- # require additional flags, but it defaults to using pthreads if -- # found. Meson's "threads" dependency does not allow you to -- # prefer pthreads. We may not be using pthreads for glib itself -- # either so just link the library to satisfy libintl rather than -- # also defining the macros with the -pthread flag. -- libintl_pthread = cc.find_library('pthread', required : false) -- # Try linking with just libiconv. -- if libintl_iconv.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv]) -- libintl_deps += [libintl_iconv] -- # Then also try linking with pthreads. -- elif libintl_iconv.found() and libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_iconv, libintl_pthread]) -- libintl_deps += [libintl_iconv, libintl_pthread] -- else -- libintl = disabler() -- endif -- endif -- if not libintl.found() -- libintl = subproject('proxy-libintl').get_variable('intl_dep') -- libintl_deps = [libintl] + libintl_deps -- have_bind_textdomain_codeset = true # proxy-libintl supports it +-libintl_deps = [] +-libintl = dependency('intl', required: false) +-if libintl.found() +- # libintl supports different threading APIs, which may not +- # require additional flags, but it defaults to using pthreads if +- # found. Meson's "threads" dependency does not allow you to +- # prefer pthreads. We may not be using pthreads for glib itself +- # either so just link the library to satisfy libintl rather than +- # also defining the macros with the -pthread flag. +- # +- # Meson's builtin dependency lookup as of 0.60.0 doesn't check for +- # pthread, so we do this manually here. +- if cc.has_function('ngettext', dependencies : libintl) +- libintl_deps += [libintl] - else -- libintl_deps = [libintl] + libintl_deps -- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', -- dependencies : libintl_deps) +- libintl_pthread = cc.find_library('pthread', required : false) +- if libintl_pthread.found() and cc.has_function('ngettext', dependencies : [libintl, libintl_pthread]) +- libintl_deps += [libintl, libintl_pthread] +- else +- libintl = disabler() +- endif - endif -endif - +-if libintl.found() +- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', dependencies: libintl_deps) +-else +- libintl = subproject('proxy-libintl').get_variable('intl_dep') +- libintl_deps = [libintl] +- have_bind_textdomain_codeset = true # proxy-libintl supports it +-endif +libintl = dependency('Intl', method:'cmake', required : true) -+libintl_deps += [libintl] ++libintl_deps = [libintl] +have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset', -+ dependencies : libintl_deps) ++ dependencies : libintl_deps) + glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) - # We require gettext to always be present + diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 5e4f6454e3d1a5..39e43e64b412d9 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -1,11 +1,15 @@ -set(GLIB_MAJOR_MINOR 2.72) -set(GLIB_PATCH 3) -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.gnome.org/ - OUT_SOURCE_PATH SOURCE_PATH - REPO GNOME/glib - REF "${GLIB_MAJOR_MINOR}.${GLIB_PATCH}" - SHA512 805100bdd240122e1a74b432d7be7458af5b3b0507d46ed9cb0ce2ed6facf6e7d927b1d869831c9ba21b4a40a6667989ff69fc4f661bd044cb08932184804e79 +set(GLIB_MAJOR_MINOR 2.74) +set(GLIB_PATCH 0) + +vcpkg_download_distfile(GLIB_ARCHIVE + URLS "https://download.gnome.org/sources/glib/${GLIB_MAJOR_MINOR}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" + FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.xz" + SHA512 5cdadd2f4568c0c3d45083b4d39699abf651e42e020f7bc880cce3ff33d28943118388d17a0632777e843f48009c1f97d5634fde3cb8c69c7c7f35b278ac8225 +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE ${GLIB_ARCHIVE} PATCHES use-libiconv-on-windows.patch libintl.patch @@ -13,7 +17,7 @@ vcpkg_from_gitlab( if (selinux IN_LIST FEATURES) if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") - message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") + message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux libselinux1-dev\".") endif() list(APPEND OPTIONS -Dselinux=enabled) else() @@ -101,7 +105,7 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc") endif() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSES/LGPL-2.1-or-later.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Fix python scripts set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen") diff --git a/ports/glib/use-libiconv-on-windows.patch b/ports/glib/use-libiconv-on-windows.patch index a8ccde0a5ff6c5..684148b59fd7d5 100644 --- a/ports/glib/use-libiconv-on-windows.patch +++ b/ports/glib/use-libiconv-on-windows.patch @@ -1,8 +1,8 @@ diff --git a/glib/gconvert.c b/glib/gconvert.c -index 3deac78..134ded9 100644 +index 829fe38de..e01ad8884 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c -@@ -30,7 +30,8 @@ +@@ -32,7 +32,8 @@ #include #ifdef G_OS_WIN32 @@ -13,16 +13,16 @@ index 3deac78..134ded9 100644 #ifdef G_PLATFORM_WIN32 diff --git a/meson.build b/meson.build -index d938ddf51..2ba256115 100644 +index d465253af..34ce69e4d 100644 --- a/meson.build +++ b/meson.build -@@ -1914,7 +1914,8 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack) - # the built-in implementation - iconv_opt = get_option('iconv') +@@ -2038,7 +2038,8 @@ glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack) if host_system == 'windows' + # We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need + # any external library for it - libiconv = [] + libiconv = [cc.find_library('iconv')] + found_iconv = true - # We have a #include "win_iconv.c" in gconvert.c on Windows, so we don't need - # any external library for it - if iconv_opt != 'auto' + else + libiconv = dependency('iconv') + endif diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 93148fd1209828..791ac5dd53962d 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glib", - "version": "2.72.3", - "port-version": 3, + "version": "2.74.0", "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "license": "LGPL-2.1-only", @@ -11,7 +10,7 @@ "gettext", "libffi", "libiconv", - "pcre", + "pcre2", { "name": "vcpkg-tool-meson", "host": true diff --git a/ports/lcm/glib.link.patch b/ports/lcm/glib.link.patch index 67f6dc0f5805c8..4808fe73178829 100644 --- a/ports/lcm/glib.link.patch +++ b/ports/lcm/glib.link.patch @@ -15,7 +15,7 @@ index 2f1a8be45..db823b953 100644 endforeach() -+find_library(PCRE_LIBRARY pcre) ++find_library(PCRE_LIBRARY pcre2-8) +set_property(TARGET GLib2::glib APPEND PROPERTY + INTERFACE_LINK_LIBRARIES ${PCRE_LIBRARY} +) diff --git a/ports/lcm/vcpkg.json b/ports/lcm/vcpkg.json index d450b1c6b98f6a..a76cae68ad14f8 100644 --- a/ports/lcm/vcpkg.json +++ b/ports/lcm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lcm", "version": "1.4.0", - "port-version": 4, + "port-version": 5, "description": [ "Lightweight Communications and Marshalling (LCM)", "LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages." diff --git a/ports/libmount/portfile.cmake b/ports/libmount/portfile.cmake index b5187033658e4a..d34ecb7ddad355 100644 --- a/ports/libmount/portfile.cmake +++ b/ports/libmount/portfile.cmake @@ -14,6 +14,8 @@ vcpkg_extract_source_archive_ex( REF ${VERSION} ) +set(ENV{GTKDOCIZE} true) + vcpkg_configure_make( AUTOCONFIG SOURCE_PATH "${SOURCE_PATH}" diff --git a/ports/libmount/vcpkg.json b/ports/libmount/vcpkg.json index ab45e1ceacc8d0..5f0bf183462fa3 100644 --- a/ports/libmount/vcpkg.json +++ b/ports/libmount/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmount", "version": "2.38", + "port-version": 1, "description": "Block device identification library from util-linux", "homepage": "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/about/", "license": "GPL-2.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index 29c1c0c147ef47..3d987830ea2f86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2645,8 +2645,8 @@ "port-version": 0 }, "glib": { - "baseline": "2.72.3", - "port-version": 3 + "baseline": "2.74.0", + "port-version": 0 }, "glibmm": { "baseline": "2.70.0", @@ -3490,7 +3490,7 @@ }, "lcm": { "baseline": "1.4.0", - "port-version": 4 + "port-version": 5 }, "lcms": { "baseline": "2.12", @@ -3954,7 +3954,7 @@ }, "libmount": { "baseline": "2.38", - "port-version": 0 + "port-version": 1 }, "libmpeg2": { "baseline": "0.5.1", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 307e9340ea02eb..e17e438b8f0456 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97fc41e084d04073610421cbdf4bfae0e89fb99c", + "version": "2.74.0", + "port-version": 0 + }, { "git-tree": "c9fbf2ec21948d70e4b8d5e633e600344982069f", "version": "2.72.3", diff --git a/versions/l-/lcm.json b/versions/l-/lcm.json index b96eabc770961e..6e435957c8313b 100644 --- a/versions/l-/lcm.json +++ b/versions/l-/lcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06163d8d06a5f6b22e76ed353743da7370d73602", + "version": "1.4.0", + "port-version": 5 + }, { "git-tree": "4277e71373ff869df31475afceb6b2e6881e4650", "version": "1.4.0", diff --git a/versions/l-/libmount.json b/versions/l-/libmount.json index 8f67a09419ba1f..59c6ecef63acf0 100644 --- a/versions/l-/libmount.json +++ b/versions/l-/libmount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a006357933a743ef48b94ce80a0565a1ce608769", + "version": "2.38", + "port-version": 1 + }, { "git-tree": "bf368ca79f716bd0b287bf1eeedd87c3529831cf", "version": "2.38", From ddd7eb81235744552e80cff6de20278f540e7600 Mon Sep 17 00:00:00 2001 From: RealTimeChris <40668522+RealTimeChris@users.noreply.github.com> Date: Thu, 13 Oct 2022 14:31:18 -0400 Subject: [PATCH 768/791] [DiscordCoreAPI] Updating to version 2022-10-12 (#27205) * Updating the necessary files. * Updating version database. * Updating the portfile. * Updating version files. * Updating version files. * Updating version files. * Updating version files. * Updating version files. * Updating version files. * Updates! * Updates! --- ports/discordcoreapi/portfile.cmake | 4 ++-- ports/discordcoreapi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/discordcoreapi.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/discordcoreapi/portfile.cmake b/ports/discordcoreapi/portfile.cmake index d8537e22818a5f..8a54ef1e891816 100644 --- a/ports/discordcoreapi/portfile.cmake +++ b/ports/discordcoreapi/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO RealTimeChris/DiscordCoreAPI - REF 057df9c13edce1939e48abb0ecbf737bd8349bd2 - SHA512 81ec37163c7667e3f87b91db95f71f52d3a9301200131626e67fae1d23a774edf6e0597d987a7a7cc4128419a147da0766186e9ee5a14efafc5751c8de31ca27 + REF 76579b6ed6e4417cea6bd3f1202a7c6d400c7b21 + SHA512 2d6b7722c8c0a5cb4dda7ad2ace06bdf7feeda70cb10ed34a8baf07c9f1c6a92cb33750b7a399a08012dc65e35f222505bd978232cafd645312b5944f0078eb5 HEAD_REF main ) diff --git a/ports/discordcoreapi/vcpkg.json b/ports/discordcoreapi/vcpkg.json index de1857c5573f0f..fcc2031cbc8f0c 100644 --- a/ports/discordcoreapi/vcpkg.json +++ b/ports/discordcoreapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "discordcoreapi", - "version-date": "2022-09-25", + "version-date": "2022-10-12", "description": "A Discord bot library written in C++ using custom asynchronous coroutines.", "homepage": "https://discordcoreapi.com", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 3d987830ea2f86..5b9f3c9fa29978 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1961,7 +1961,7 @@ "port-version": 1 }, "discordcoreapi": { - "baseline": "2022-09-25", + "baseline": "2022-10-12", "port-version": 0 }, "discount": { diff --git a/versions/d-/discordcoreapi.json b/versions/d-/discordcoreapi.json index 3e092b871c3891..ac14b28e5bc1b5 100644 --- a/versions/d-/discordcoreapi.json +++ b/versions/d-/discordcoreapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "176943241df65995c37a1a7b1f9033d2feb1bc45", + "version-date": "2022-10-12", + "port-version": 0 + }, { "git-tree": "0d2e0511274658095bc45584a95d7964017f0f9a", "version-date": "2022-09-25", From 72bb4a7148c4998862cf060b881f86007fec7c03 Mon Sep 17 00:00:00 2001 From: rinechran Date: Fri, 14 Oct 2022 03:48:13 +0900 Subject: [PATCH 769/791] [liblrc] create a new port (#27023) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [lrc-tool] create a new port * [lrc-tool] fix portfile.cmake * [lrc-tool] fix format-manifest portfile.cmake * [lrc-tool] fix git-tree version * [liblrc] remove include copy * Update version database * [liblrc] not support osx * Update version database * [liblrc] Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [liblrc] fix code review * Update version database * [liblrc] make CMakeLists.txt to patch * [liblrc] add unofficial * [liblrc] add unofficial namespace * [liblrc] Update version database Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: luncliff --- ports/liblrc/fix-cmake.patch | 40 +++++++++++++++++++++++++ ports/liblrc/portfile.cmake | 18 +++++++++++ ports/liblrc/set_up_compile_error.patch | 13 ++++++++ ports/liblrc/vcpkg.json | 18 +++++++++++ versions/baseline.json | 4 +++ versions/l-/liblrc.json | 9 ++++++ 6 files changed, 102 insertions(+) create mode 100644 ports/liblrc/fix-cmake.patch create mode 100644 ports/liblrc/portfile.cmake create mode 100644 ports/liblrc/set_up_compile_error.patch create mode 100644 ports/liblrc/vcpkg.json create mode 100644 versions/l-/liblrc.json diff --git a/ports/liblrc/fix-cmake.patch b/ports/liblrc/fix-cmake.patch new file mode 100644 index 00000000000000..7ef0a61561961c --- /dev/null +++ b/ports/liblrc/fix-cmake.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6b2175e..2aa699b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,8 +1,7 @@ + cmake_minimum_required(VERSION 3.2.0) + project(LRCTools VERSION 1.0.0) + +-set(CMAKE_CXX_FLAGS +- "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -Wno-missing-braces") ++set(CMAKE_CXX_STANDARD 11) + + include_directories(${CMAKE_CURRENT_LIST_DIR}) + +@@ -12,7 +11,22 @@ include(CPack) + + enable_testing() + +-add_subdirectory(third_party) + add_subdirectory(liblrc) +-add_subdirectory(cli) +-add_subdirectory(test) ++# headers ++install(FILES ${PROJECT_SOURCE_DIR}/liblrc/lrc_parser.h ++ ${PROJECT_SOURCE_DIR}/liblrc/lyrics.h ++ ${PROJECT_SOURCE_DIR}/liblrc/utils.h ++ DESTINATION include/liblrc ++) ++# library with unofficial config ++install(TARGETS lrc ++ EXPORT unofficial-liblrcConfig ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) ++# share/liblrc will be fixed in portfile.cmake ++install(EXPORT unofficial-liblrcConfig ++ NAMESPACE unofficial::liblrc:: ++ DESTINATION share/unofficial-liblrc ++) diff --git a/ports/liblrc/portfile.cmake b/ports/liblrc/portfile.cmake new file mode 100644 index 00000000000000..dcffda4e131bb2 --- /dev/null +++ b/ports/liblrc/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ywh233/LRC-Tools + REF 1fc3872320cd449933bffefc6527928262ee0629 + SHA512 5b0a52a557ffb28554b33e77efb3832944facfd4e039d8afe60c322d56872eb12cb93f3974d17f083c659dcddf9c63075d3b09ba6abd3adba7b40b2ffb615f1c + PATCHES + set_up_compile_error.patch + fix-cmake.patch +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-liblrc) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/liblrc/set_up_compile_error.patch b/ports/liblrc/set_up_compile_error.patch new file mode 100644 index 00000000000000..875fe0c8bfedef --- /dev/null +++ b/ports/liblrc/set_up_compile_error.patch @@ -0,0 +1,13 @@ +diff --git a/liblrc/lyrics.cc b/liblrc/lyrics.cc +index b1a8c87..4fa16fa 100644 +--- a/liblrc/lyrics.cc ++++ b/liblrc/lyrics.cc +@@ -5,7 +5,7 @@ + //****************************************** + + #include "lyrics.h" +- ++#include + #include + + #include diff --git a/ports/liblrc/vcpkg.json b/ports/liblrc/vcpkg.json new file mode 100644 index 00000000000000..9f07bb03cfe3d0 --- /dev/null +++ b/ports/liblrc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "liblrc", + "version": "1.0.0", + "description": "Tools for parsing and playing back LRC lyrics.", + "homepage": "https://github.com/ywh233/LRC-Tools", + "license": "MIT", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5b9f3c9fa29978..067347297bdc22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3888,6 +3888,10 @@ "baseline": "0.31", "port-version": 2 }, + "liblrc": { + "baseline": "1.0.0", + "port-version": 0 + }, "liblsl": { "baseline": "1.16.0", "port-version": 0 diff --git a/versions/l-/liblrc.json b/versions/l-/liblrc.json new file mode 100644 index 00000000000000..bca78ae4f702dd --- /dev/null +++ b/versions/l-/liblrc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e335abcee36904e503939a5636403e7f42affc25", + "version": "1.0.0", + "port-version": 0 + } + ] +} From 101931754acd5f0b66db199dfe53308c863361ab Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 13 Oct 2022 20:58:22 +0200 Subject: [PATCH 770/791] [ogre] Update to 13.4.4 (#27107) * Update to 13.4.4 * Update versions * Fix obsolete zziplib reference * Fix another resource path * Update versions * Patch pc file generation * Update versions * Force uniform cfg install path for osx * Update versions * Acquire swig if needed * Update versions --- ports/ogre/cfg-rel-paths.patch | 36 +++ ports/ogre/disable-dependency-qt.patch | 14 -- ports/ogre/fix-cmake-feature-summary.patch | 14 -- ports/ogre/fix-dependencies.patch | 215 +++++++++++++++++ ports/ogre/fix-dependency.patch | 123 ---------- ports/ogre/fix-pkgconfig.patch | 27 --- ports/ogre/pkgconfig.patch | 30 +++ ports/ogre/portfile.cmake | 109 +++++---- ports/ogre/swig-python-polyfill.patch | 19 ++ ports/ogre/toolchain_fixes.patch | 265 --------------------- ports/ogre/vcpkg.json | 62 +++-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 4 +- versions/o-/ogre.json | 5 + 14 files changed, 422 insertions(+), 502 deletions(-) create mode 100644 ports/ogre/cfg-rel-paths.patch delete mode 100644 ports/ogre/disable-dependency-qt.patch delete mode 100644 ports/ogre/fix-cmake-feature-summary.patch create mode 100644 ports/ogre/fix-dependencies.patch delete mode 100644 ports/ogre/fix-dependency.patch delete mode 100644 ports/ogre/fix-pkgconfig.patch create mode 100644 ports/ogre/pkgconfig.patch create mode 100644 ports/ogre/swig-python-polyfill.patch delete mode 100644 ports/ogre/toolchain_fixes.patch diff --git a/ports/ogre/cfg-rel-paths.patch b/ports/ogre/cfg-rel-paths.patch new file mode 100644 index 00000000000000..a558088ebe36e5 --- /dev/null +++ b/ports/ogre/cfg-rel-paths.patch @@ -0,0 +1,36 @@ +diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake +index cfe7db3..5d15212 100644 +--- a/CMake/InstallResources.cmake ++++ b/CMake/InstallResources.cmake +@@ -61,7 +61,6 @@ elseif (APPLE) + endif() + # these are resolved relative to the app bundle + set(OGRE_SAMPLES_DIR_REL "Contents/Plugins/") +- set(OGRE_CFG_INSTALL_PATH "bin") + elseif (UNIX) + set(OGRE_TEST_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/Tests/Media") + set(OGRE_SAMPLES_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_LIB_DIRECTORY}/OGRE/Samples") +@@ -162,6 +161,10 @@ if(NOT OGRE_BUILD_TESTS) + endif() + + ++set(OGRE_PLUGIN_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_PLUGINS_PATH}") ++cmake_path(RELATIVE_PATH OGRE_PLUGIN_DIR_REL BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${OGRE_CFG_INSTALL_PATH}") ++set(OGRE_MEDIA_DIR_REL "${CMAKE_INSTALL_PREFIX}/${OGRE_MEDIA_PATH}") ++cmake_path(RELATIVE_PATH OGRE_MEDIA_DIR_REL BASE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${OGRE_CFG_INSTALL_PATH}") + set(OGRE_CORE_MEDIA_DIR "${OGRE_MEDIA_DIR_REL}") + # CREATE CONFIG FILES - INSTALL VERSIONS + configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/resources.cfg) +diff --git a/Components/Bites/CMakeLists.txt b/Components/Bites/CMakeLists.txt +index 045e288..50c9956 100644 +--- a/Components/Bites/CMakeLists.txt ++++ b/Components/Bites/CMakeLists.txt +@@ -135,7 +135,7 @@ elseif(UNIX) + set_source_files_properties(src/OgreBitesConfigDialog.cpp PROPERTIES COMPILE_DEFINITIONS HAVE_XAW) + list(APPEND SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreGLXConfigDialog.cpp") + list(APPEND DEPENDENCIES ${X11_Xt_LIB} ${XAW_LIBRARY}) +- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/GLX_backdrop.png" DESTINATION "share/OGRE/") ++ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/misc/GLX_backdrop.png" DESTINATION "${OGRE_MEDIA_PATH}/..") + endif() + endif() + diff --git a/ports/ogre/disable-dependency-qt.patch b/ports/ogre/disable-dependency-qt.patch deleted file mode 100644 index f97bd256b7fba6..00000000000000 --- a/ports/ogre/disable-dependency-qt.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index 068dd27..721121b 100644 ---- a/CMake/Dependencies.cmake -+++ b/CMake/Dependencies.cmake -@@ -346,7 +346,9 @@ if(NOT ANDROID AND NOT EMSCRIPTEN) - ) - endif() - -+ if (0) - find_package(Qt5 COMPONENTS Core Gui QUIET) -+ endif() - macro_log_feature(Qt5_FOUND "Qt" "optional integration with the Qt Library for window creation and input" "http://www.qt.io/" FALSE "" "") - endif() - diff --git a/ports/ogre/fix-cmake-feature-summary.patch b/ports/ogre/fix-cmake-feature-summary.patch deleted file mode 100644 index 56b75faa7e1065..00000000000000 --- a/ports/ogre/fix-cmake-feature-summary.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMake/FeatureSummary.cmake b/CMake/OgreFeatureSummary.cmake -similarity index 100% -rename from CMake/FeatureSummary.cmake -rename to CMake/OgreFeatureSummary.cmake -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb86305..abbd5c4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -505,4 +505,4 @@ include(Packaging) - - - # Show feature summary --include(FeatureSummary) -+include(OgreFeatureSummary) diff --git a/ports/ogre/fix-dependencies.patch b/ports/ogre/fix-dependencies.patch new file mode 100644 index 00000000000000..267543e434eb27 --- /dev/null +++ b/ports/ogre/fix-dependencies.patch @@ -0,0 +1,215 @@ +diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake +index b0c5ba3..27d7bd2 100644 +--- a/CMake/Dependencies.cmake ++++ b/CMake/Dependencies.cmake +@@ -194,11 +194,14 @@ endif() + ####################################################################### + + # Find FreeImage +-find_package(FreeImage) ++find_package(FreeImage NAMES freeimage) ++set(FreeImage_LIBRARIES freeimage::FreeImage) ++set(FreeImage_LIBRARY_DBG "-lFreeImaged") ++set(FreeImage_LIBRARY_REL "-lFreeImage") + macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net") + + # Find FreeType +-find_package(Freetype) ++find_package(FREETYPE NAMES freetype) + macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org") + + # Find X11 +@@ -254,13 +257,17 @@ endif () + macro_log_feature(ENV{VULKAN_SDK} "Vulkan SDK" "Vulkan RenderSystem, glslang Plugin. Alternatively use system packages" "https://vulkan.lunarg.com/") + + # OpenEXR +-find_package(OpenEXR) ++find_package(IMath CONFIG) ++find_package(OPENEXR NAMES OpenEXR) ++set(OPENEXR_LIBRARIES OpenEXR::OpenEXR Imath::Imath) + macro_log_feature(OPENEXR_FOUND "OpenEXR" "Load High dynamic range images" "http://www.openexr.com/") + + # Python + set(Python_ADDITIONAL_VERSIONS 3.4) # allows using python3 on Ubuntu 14.04 +-find_package(PythonInterp) +-find_package(PythonLibs) ++find_package(Python3 COMPONENTS Development Interpreter) # Interpreter is needed for Python3_FOUND ++set(PYTHONLIBS_FOUND "${Python3_FOUND}") ++set(PYTHON_INCLUDE_PATH "${Python3_INCLUDE_DIRS}") ++set(PYTHON_LIBRARIES "${Python3_LIBRARIES}") + macro_log_feature(PYTHONLIBS_FOUND "Python" "Language bindings to use OGRE from Python" "http://www.python.org/") + + # SWIG +@@ -268,7 +275,7 @@ find_package(SWIG 3.0.8 QUIET) + macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/") + + # pugixml +-find_package(pugixml QUIET) ++find_package(pugixml CONFIG REQUIRED) + macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/") + + # Find zlib +@@ -276,7 +283,7 @@ find_package(ZLIB) + macro_log_feature(ZLIB_FOUND "zlib" "Simple data compression library" "http://www.zlib.net") + + # Assimp +-find_package(assimp QUIET) ++find_package(assimp CONFIG) + macro_log_feature(assimp_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/") + + # Bullet +@@ -284,6 +291,8 @@ find_package(Bullet QUIET) + macro_log_feature(BULLET_FOUND "Bullet" "Bullet physics" "https://pybullet.org") + + if(assimp_FOUND) ++ add_library(fix::assimp ALIAS assimp::assimp) ++elseif(0) + # workaround horribly broken assimp cmake, fixed with assimp 5.1 + add_library(fix::assimp INTERFACE IMPORTED) + set_target_properties(fix::assimp PROPERTIES +@@ -302,7 +311,7 @@ endif() + # Find sdl2 + if(NOT ANDROID AND NOT EMSCRIPTEN) + # find script does not work in cross compilation environment +- find_package(SDL2 QUIET) ++ find_package(SDL2 CONFIG REQUIRED) + macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/") + if(SDL2_FOUND AND NOT TARGET SDL2::SDL2) + add_library(SDL2::SDL2 INTERFACE IMPORTED) +@@ -315,6 +324,7 @@ if(NOT ANDROID AND NOT EMSCRIPTEN) + find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Gui QUIET CONFIG) + find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui QUIET CONFIG) + ++ set(QT_FOUND FALSE) + macro_log_feature(QT_FOUND "Qt" "optional integration with the Qt Library for window creation and input" "http://www.qt.io/") + endif() + +diff --git a/CMake/Templates/OGREConfig.cmake.in b/CMake/Templates/OGREConfig.cmake.in +index 2047f66..a5c7cd0 100644 +--- a/CMake/Templates/OGREConfig.cmake.in ++++ b/CMake/Templates/OGREConfig.cmake.in +@@ -35,6 +35,25 @@ set(OGRE_LIBRARIES) + cmake_policy(PUSH) + cmake_policy(SET CMP0012 NEW) + ++include(CMakeFindDependencyMacro) ++find_dependency(pugixml CONFIG) ++find_dependency(SDL2 CONFIG) ++find_dependency(ZLIB) ++find_dependency(freetype CONFIG) ++if (@OGRE_BUILD_COMPONENT_OVERLAY_IMGUI@) ++ find_dependency(imgui CONFIG) ++endif() ++if(@OGRE_BUILD_PLUGIN_ASSIMP@) ++ find_dependency(assimp CONFIG) ++endif() ++if(@OGRE_BUILD_PLUGIN_FREEIMAGE@) ++ find_dependency(freeimage CONFIG) ++endif() ++if(@OGRE_BUILD_PLUGIN_EXRCODEC@) ++ find_dependency(Imath CONFIG) ++ find_dependency(OpenEXR CONFIG) ++endif() ++ + if(@OGRE_THREAD_PROVIDER@ EQUAL 1) + list(APPEND OGRE_INCLUDE_DIRS @Boost_INCLUDE_DIRS@) + endif() +diff --git a/Components/Bites/CMakeLists.txt b/Components/Bites/CMakeLists.txt +index 8f96cef..045e288 100644 +--- a/Components/Bites/CMakeLists.txt ++++ b/Components/Bites/CMakeLists.txt +@@ -171,6 +171,12 @@ elseif(NOT EMSCRIPTEN) + message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites") + endif() + ++if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++ find_package(imgui CONFIG REQUIRED) ++ find_path(IMGUI_DIR NAMES imgui.h) ++ target_link_libraries(OgreBites PRIVATE imgui::imgui) ++endif() ++ + generate_export_header(OgreBites + EXPORT_MACRO_NAME _OgreBitesExport + EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h) +diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt +index 0c74ce2..a302b1c 100644 +--- a/Components/Overlay/CMakeLists.txt ++++ b/Components/Overlay/CMakeLists.txt +@@ -19,6 +19,8 @@ list(APPEND HEADER_FILES + file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") + + if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++ find_package(imgui CONFIG REQUIRED) ++elseif(0) + set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.87" CACHE PATH "") + if(NOT EXISTS ${IMGUI_DIR}) + message(STATUS "Downloading imgui") +@@ -63,6 +65,8 @@ elseif(UNIX) + endif() + + if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) ++ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE imgui::imgui) ++elseif(0) + target_include_directories(OgreOverlay PUBLIC + PUBLIC "$" + PRIVATE "$") +diff --git a/PlugIns/EXRCodec/src/OgreEXRCodec.cpp b/PlugIns/EXRCodec/src/OgreEXRCodec.cpp +index 0822081..a22841c 100644 +--- a/PlugIns/EXRCodec/src/OgreEXRCodec.cpp ++++ b/PlugIns/EXRCodec/src/OgreEXRCodec.cpp +@@ -36,6 +36,9 @@ THE SOFTWARE. + #include "O_IStream.h" + + #include ++#include ++#include ++#include + #include + #include + #include +diff --git a/PlugIns/STBICodec/CMakeLists.txt b/PlugIns/STBICodec/CMakeLists.txt +index 10283f5..e7edfd3 100644 +--- a/PlugIns/STBICodec/CMakeLists.txt ++++ b/PlugIns/STBICodec/CMakeLists.txt +@@ -19,8 +19,10 @@ endif() + add_library(Codec_STBI ${OGRE_LIB_TYPE} ${HEADER_FILES} ${SOURCES}) + target_link_libraries(Codec_STBI PUBLIC OgreMain) + ++find_path(STB_INCLUDE_DIRS "stb_image.h") + target_include_directories(Codec_STBI PUBLIC + "$" ++ "$" + $) + + if(CMAKE_COMPILER_IS_GNUCXX) +diff --git a/PlugIns/STBICodec/src/OgreSTBICodec.cpp b/PlugIns/STBICodec/src/OgreSTBICodec.cpp +index 663a1c3..e1452cb 100644 +--- a/PlugIns/STBICodec/src/OgreSTBICodec.cpp ++++ b/PlugIns/STBICodec/src/OgreSTBICodec.cpp +@@ -39,7 +39,7 @@ THE SOFTWARE. + #define STBI_NO_STDIO + #define STB_IMAGE_IMPLEMENTATION + #define STB_IMAGE_STATIC +-#include "stbi/stb_image.h" ++#include "stb_image.h" + + #ifdef HAVE_ZLIB + #include +@@ -62,7 +62,7 @@ static Ogre::uchar* custom_zlib_compress(Ogre::uchar* data, int data_len, int* o + + #define STB_IMAGE_WRITE_IMPLEMENTATION + #define STBI_WRITE_NO_STDIO +-#include "stbi/stb_image_write.h" ++#include "stb_image_write.h" + + namespace Ogre { + +@@ -73,7 +73,7 @@ namespace Ogre { + stbi_convert_iphone_png_to_rgb(1); + stbi_set_unpremultiply_on_load(1); + +- LogManager::getSingleton().logMessage("stb_image - v2.27 - public domain image loader"); ++ LogManager::getSingleton().logMessage("stb_image - public domain image loader"); + + // Register codecs + String exts = "jpeg,jpg,png,bmp,psd,tga,gif,pic,ppm,pgm,hdr"; diff --git a/ports/ogre/fix-dependency.patch b/ports/ogre/fix-dependency.patch deleted file mode 100644 index a249b7baa4fbdc..00000000000000 --- a/ports/ogre/fix-dependency.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake -index 14c9290..ee8dab3 100644 ---- a/CMake/Dependencies.cmake -+++ b/CMake/Dependencies.cmake -@@ -242,7 +242,7 @@ find_package(FreeImage) - macro_log_feature(FreeImage_FOUND "freeimage" "Support for commonly used graphics image formats" "http://freeimage.sourceforge.net" FALSE "" "") - - # Find FreeType --find_package(Freetype) -+find_package(freetype CONFIG REQUIRED) - macro_log_feature(FREETYPE_FOUND "freetype" "Portable font engine" "http://www.freetype.org" FALSE "" "") - - # Find X11 -@@ -310,11 +310,11 @@ find_package(SWIG 3.0.8 QUIET) - macro_log_feature(SWIG_FOUND "SWIG" "Language bindings (Python, Java, C#) for OGRE" "http://www.swig.org/" FALSE "" "") - - # pugixml --find_package(pugixml QUIET) -+find_package(pugixml CONFIG REQUIRED) - macro_log_feature(pugixml_FOUND "pugixml" "Needed for XMLConverter and DotScene Plugin" "https://pugixml.org/" FALSE "" "") - - # Assimp --find_package(ASSIMP QUIET) -+find_package(assimp CONFIG REQUIRED) - macro_log_feature(ASSIMP_FOUND "Assimp" "Needed for the AssimpLoader Plugin" "https://www.assimp.org/" FALSE "" "") - - if(ASSIMP_FOUND) -@@ -336,7 +336,7 @@ endif() - # Find sdl2 - if(NOT ANDROID AND NOT EMSCRIPTEN) - # find script does not work in cross compilation environment -- find_package(SDL2 QUIET) -+ find_package(SDL2 CONFIG REQUIRED) - macro_log_feature(SDL2_FOUND "SDL2" "Simple DirectMedia Library needed for input handling in samples" "https://www.libsdl.org/" FALSE "" "") - if(SDL2_FOUND AND NOT TARGET SDL2::SDL2) - add_library(SDL2::SDL2 INTERFACE IMPORTED) -diff --git a/CMake/Templates/OGREConfig.cmake.in b/CMake/Templates/OGREConfig.cmake.in -index 392c89c..a79ff8d 100644 ---- a/CMake/Templates/OGREConfig.cmake.in -+++ b/CMake/Templates/OGREConfig.cmake.in -@@ -32,6 +32,18 @@ get_filename_component(OGRE_LIBRARY_DIRS "${OGRE_PREFIX_DIR}/lib" ABSOLUTE) - get_filename_component(OGRE_INCLUDE_DIRS "${OGRE_PREFIX_DIR}/include/OGRE" ABSOLUTE) - set(OGRE_LIBRARIES) - -+include(CMakeFindDependencyMacro) -+ -+find_dependency(pugixml CONFIG) -+find_dependency(SDL2 CONFIG) -+find_dependency(ZLIB) -+find_dependency(assimp CONFIG) -+find_dependency(freetype CONFIG) -+ -+if (@OGRE_BUILD_COMPONENT_OVERLAY_IMGUI@) -+ find_dependency(imgui CONFIG) -+endif() -+ - cmake_policy(PUSH) - cmake_policy(SET CMP0012 NEW) - -diff --git a/Components/Bites/CMakeLists.txt b/Components/Bites/CMakeLists.txt -index 5d58a8d..fe41e4a 100644 ---- a/Components/Bites/CMakeLists.txt -+++ b/Components/Bites/CMakeLists.txt -@@ -152,6 +152,11 @@ elseif(NOT EMSCRIPTEN) - message(WARNING "SDL2 not found - no input handling and reduced window creation capabilites") - endif() - -+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -+ find_package(imgui CONFIG REQUIRED) -+ target_link_libraries(OgreBites PRIVATE imgui::imgui) -+endif() -+ - generate_export_header(OgreBites - EXPORT_MACRO_NAME _OgreBitesExport - EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/include/OgreBitesPrerequisites.h) -diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt -index df8f32a..42be1e8 100644 ---- a/Components/Overlay/CMakeLists.txt -+++ b/Components/Overlay/CMakeLists.txt -@@ -19,21 +19,8 @@ list(APPEND HEADER_FILES - file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp") - - if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -- set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.77" CACHE PATH "") -- if(NOT EXISTS ${IMGUI_DIR}) -- message(STATUS "Dowloading imgui") -- file(DOWNLOAD -- https://github.com/ocornut/imgui/archive/v1.77.tar.gz -- ${PROJECT_BINARY_DIR}/imgui.tar.gz) -- execute_process(COMMAND ${CMAKE_COMMAND} -- -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR}) -- endif() -- list(APPEND SOURCE_FILES -- ${IMGUI_DIR}/imgui.cpp -- ${IMGUI_DIR}/imgui_draw.cpp -- ${IMGUI_DIR}/imgui_widgets.cpp -- ${IMGUI_DIR}/imgui_demo.cpp -- ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp) -+ find_package(imgui CONFIG REQUIRED) -+ find_path(IMGUI_INCLUDE_DIR imgui.h) - else() - list(REMOVE_ITEM SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/OgreImGuiOverlay.cpp") - endif() -@@ -41,13 +28,17 @@ endif() - # setup target - add_library(OgreOverlay ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) - set_target_properties(OgreOverlay PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION}) --target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE ${FREETYPE_LIBRARIES} ZLIB::ZLIB) -+if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB imgui::imgui) -+else() -+ target_link_libraries(OgreOverlay PUBLIC OgreMain PRIVATE freetype ZLIB::ZLIB) -+endif() - target_include_directories(OgreOverlay PUBLIC - "$" - $ - PRIVATE ${FREETYPE_INCLUDE_DIRS}) - --if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) -+if(0) - target_include_directories(OgreOverlay PUBLIC - PUBLIC "$" - PRIVATE "$") diff --git a/ports/ogre/fix-pkgconfig.patch b/ports/ogre/fix-pkgconfig.patch deleted file mode 100644 index 365663fa6b1d15..00000000000000 --- a/ports/ogre/fix-pkgconfig.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake -index 73606c9..4377353 100644 ---- a/CMake/ConfigureBuild.cmake -+++ b/CMake/ConfigureBuild.cmake -@@ -175,11 +175,19 @@ if (UNIX) - set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lpthread") - endif () - if (OGRE_STATIC) -- if (OGRE_CONFIG_THREADS) -- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost-thread-mt") -+ if (OGRE_CONFIG_THREADS AND OGRE_CONFIG_THREAD_PROVIDER STREQUAL "boost") -+ if (CMAKE_BUILD_TYPE STREQUAL "Debug") -+ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${Boost_THREAD_LIBRARY_DEBUG}") -+ else() -+ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${Boost_THREAD_LIBRARY_RELEASE}") -+ endif() - endif () - # there is no pkgconfig file for freeimage, so we need to add that lib manually -- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage") -+ if (CMAKE_BUILD_TYPE STREQUAL "Debug") -+ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_DBG}") -+ else() -+ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_REL}") -+ endif() - configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) - else () - configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) diff --git a/ports/ogre/pkgconfig.patch b/ports/ogre/pkgconfig.patch new file mode 100644 index 00000000000000..3b23f4afd332be --- /dev/null +++ b/ports/ogre/pkgconfig.patch @@ -0,0 +1,30 @@ +diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake +index 614332c..f4bc402 100644 +--- a/CMake/ConfigureBuild.cmake ++++ b/CMake/ConfigureBuild.cmake +@@ -185,6 +185,13 @@ if (UNIX) + else() + set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} ${FreeImage_LIBRARY_REL}") + endif() ++ set(PC_REQUIRES_STATIC "") ++ if(OGRE_BUILD_COMPONENT_OVERLAY) ++ string(APPEND PC_REQUIRES_STATIC " freetype2") ++ endif() ++ if(X11_X11_LIB) ++ string(APPEND PC_REQUIRES_STATIC " x11 xt xaw7 gl") ++ endif() + configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) + else () + configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) +diff --git a/CMake/Templates/OGREStatic.pc.in b/CMake/Templates/OGREStatic.pc.in +index 4e4202b..f9b7f5a 100644 +--- a/CMake/Templates/OGREStatic.pc.in ++++ b/CMake/Templates/OGREStatic.pc.in +@@ -8,6 +8,6 @@ Name: OGRE (static lib) + Description: Object-Oriented Graphics Rendering Engine + Version: @OGRE_VERSION@ + URL: http://www.ogre3d.org +-Requires: freetype2, zziplib, x11, xt, xaw7, gl ++Requires: @PC_REQUIRES_STATIC@ + Libs: -L${libdir} -L${plugindir} -lOgreMain@OGRE_LIB_SUFFIX@ @OGRE_ADDITIONAL_LIBS@ + Cflags: -I${includedir} -I${includedir}/OGRE @OGRE_CFLAGS@ diff --git a/ports/ogre/portfile.cmake b/ports/ogre/portfile.cmake index 1c79e71c3c45d6..fa93c063d195e8 100644 --- a/ports/ogre/portfile.cmake +++ b/ports/ogre/portfile.cmake @@ -6,41 +6,57 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) message("${PORT} currently requires the following library from the system package manager:\n Xaw\n\nIt can be installed on Ubuntu systems via apt-get install libxaw7-dev") endif() +if(VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OGRECave/ogre - REF 7d0c8181ac43ad20bdba326abbd3deeddf310f0b #v1.12.9 - SHA512 f223075f49a2465cd5070f5efa796aa715f3ea2fefd578e4ec0a11be2fd3330922849ed804e1df004209abafaa7b24ff42432dd79f336a56063e3cf38ae0e8c9 + REF v13.4.4 + SHA512 59e0929f5022b2d289030d42c651ce4f44a215be7aae262b1b6919e1d00225d226cce6bfa2e78525ae902290615c87eabe7b8dfe27b7087dd56081460bd35e1f HEAD_REF master PATCHES - toolchain_fixes.patch - fix-dependency.patch - disable-dependency-qt.patch - fix-pkgconfig.patch - fix-cmake-feature-summary.patch + fix-dependencies.patch + cfg-rel-paths.patch + swig-python-polyfill.patch + pkgconfig.patch ) file(REMOVE "${SOURCE_PATH}/CMake/Packages/FindOpenEXR.cmake") -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(OGRE_STATIC ON) -else() - set(OGRE_STATIC OFF) -endif() - -# Configure features +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" OGRE_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" OGRE_CONFIG_STATIC_LINK_CRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + assimp OGRE_BUILD_PLUGIN_ASSIMP + assimp CMAKE_REQUIRE_FIND_PACKAGE_assimp d3d9 OGRE_BUILD_RENDERSYSTEM_D3D9 + freeimage OGRE_BUILD_PLUGIN_FREEIMAGE + freeimage CMAKE_REQUIRE_FIND_PACKAGE_FreeImage java OGRE_BUILD_COMPONENT_JAVA + java CMAKE_REQUIRE_FIND_PACKAGE_SWIG + openexr OGRE_BUILD_PLUGIN_EXRCODEC + openexr CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR python OGRE_BUILD_COMPONENT_PYTHON + python CMAKE_REQUIRE_FIND_PACKAGE_Python3 + python CMAKE_REQUIRE_FIND_PACKAGE_SWIG csharp OGRE_BUILD_COMPONENT_CSHARP + csharp CMAKE_REQUIRE_FIND_PACKAGE_SWIG overlay OGRE_BUILD_COMPONENT_OVERLAY - zziplib OGRE_CONFIG_ENABLE_ZIP + overlay CMAKE_REQUIRE_FIND_PACKAGE_FREETYPE + zip OGRE_CONFIG_ENABLE_ZIP strict OGRE_RESOURCEMANAGER_STRICT + tools OGRE_BUILD_TOOLS + tools OGRE_INSTALL_TOOLS ) +if(CMAKE_REQUIRE_FIND_PACKAGE_SWIG) + vcpkg_find_acquire_program(SWIG) + vcpkg_list(APPEND FEATURE_OPTIONS "-DSWIG_EXECUTABLE=${SWIG}") +endif() + # OGRE_RESOURCEMANAGER_STRICT need to be 0 for OFF and 1 for ON, because it is used 'as is' in sources 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}") @@ -49,61 +65,75 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DOGRE_CFG_INSTALL_PATH=etc/${PORT} + -DOGRE_CMAKE_DIR=share/${PORT} + -DOGRE_MEDIA_PATH=share/${PORT}/Media + -DOGRE_PLUGINS_PATH=plugins/${PORT} -DOGRE_BUILD_DEPENDENCIES=OFF + -DOGRE_BUILD_LIBS_AS_FRAMEWORKS=OFF -DOGRE_BUILD_SAMPLES=OFF -DOGRE_BUILD_TESTS=OFF - -DOGRE_BUILD_TOOLS=OFF -DOGRE_BUILD_MSVC_MP=ON -DOGRE_BUILD_MSVC_ZM=ON + -DOGRE_COPY_DEPENDENCIES=OFF + -DOGRE_ENABLE_PRECOMPILED_HEADERS=OFF -DOGRE_INSTALL_DEPENDENCIES=OFF -DOGRE_INSTALL_DOCS=OFF -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_STATIC_LINK_CRT=${OGRE_CONFIG_STATIC_LINK_CRT} -DOGRE_CONFIG_THREAD_PROVIDER=std -DOGRE_BUILD_RENDERSYSTEM_D3D11=ON -DOGRE_BUILD_RENDERSYSTEM_GL=ON -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS=ON -DOGRE_BUILD_RENDERSYSTEM_GLES=OFF -DOGRE_BUILD_RENDERSYSTEM_GLES2=OFF - -DFREETYPE_FOUND=ON - -DOGRE_CMAKE_DIR=share/ogre + -DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + OPTIONS_DEBUG + -DOGRE_BUILD_TOOLS=OFF + -DOGRE_INSTALL_TOOLS=OFF MAYBE_UNUSED_VARIABLES + CMAKE_REQUIRE_FIND_PACKAGE_OpenEXR + OGRE_COPY_DEPENDENCIES + OGRE_BUILD_MSVC_MP + OGRE_BUILD_MSVC_ZM OGRE_BUILD_RENDERSYSTEM_GLES + OGRE_INSTALL_DEPENDENCIES + OGRE_INSTALL_VSPROPS ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() - vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() -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") -if(REL_CFGS) - file(COPY ${REL_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(REMOVE ${REL_CFGS}) +if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/etc/${PORT}/resources.cfg" "=../../share" "=../../../share") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/OgreTargets-debug.cmake" "${_IMPORT_PREFIX}/plugins" "${_IMPORT_PREFIX}/debug/plugins") endif() -file(GLOB DBG_CFGS "${CURRENT_PACKAGES_DIR}/debug/bin/*.cfg") -if(DBG_CFGS) - file(COPY ${DBG_CFGS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - file(REMOVE ${DBG_CFGS}) -endif() +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/etc/ogre/samples.cfg" + "${CURRENT_PACKAGES_DIR}/debug/etc/ogre/samples.cfg" + "${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") +set(tools OgreMeshUpgrader OgreXMLConverter VRMLConverter) +if(OGRE_BUILD_PLUGIN_ASSIMP) + list(APPEND tools OgreAssimpConverter) +endif() +if(OGRE_BUILD_TOOLS) + vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) 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(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) 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") @@ -127,10 +157,5 @@ 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) diff --git a/ports/ogre/swig-python-polyfill.patch b/ports/ogre/swig-python-polyfill.patch new file mode 100644 index 00000000000000..31bb01b64603ba --- /dev/null +++ b/ports/ogre/swig-python-polyfill.patch @@ -0,0 +1,19 @@ +diff --git a/Components/Python/CMakeLists.txt b/Components/Python/CMakeLists.txt +index b6062c6..df955e3 100644 +--- a/Components/Python/CMakeLists.txt ++++ b/Components/Python/CMakeLists.txt +@@ -22,7 +22,14 @@ if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI) + list(APPEND CMAKE_SWIG_FLAGS -DHAVE_IMGUI -DIMGUI_DISABLE_OBSOLETE_FUNCTIONS) + endif() + ++# cf. https://github.com/swig/swig/pull/1587 ++file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pyobject_gc_polyfill.h" CONTENT [[ ++#define _PyObject_GC_UNTRACK(x) PyObject_GC_UnTrack(x) ++]]) + macro(ogre_python_module target) ++ if(SWIG_FOUND AND SWIG_VERSION VERSION_LESS "4.0.1" AND Python3_VERSION VERSION_GREATER_EQUAL "3.8") ++ target_precompile_headers(${SWIG_MODULE_${target}_REAL_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/pyobject_gc_polyfill.h") ++ endif() + set_target_properties(${SWIG_MODULE_${target}_REAL_NAME} PROPERTIES + DEBUG_POSTFIX "") + install(TARGETS ${SWIG_MODULE_${target}_REAL_NAME} LIBRARY DESTINATION ${PYTHON_SITE_PACKAGES}) diff --git a/ports/ogre/toolchain_fixes.patch b/ports/ogre/toolchain_fixes.patch deleted file mode 100644 index c363a34d7db565..00000000000000 --- a/ports/ogre/toolchain_fixes.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt -index a7a3796..2e21403 100644 ---- a/CMake/CMakeLists.txt -+++ b/CMake/CMakeLists.txt -@@ -13,10 +13,12 @@ - # directory, but can also be used for custom projects. - ############################################################# - --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() - - set(INST_FILES Utils/FindPkgMacros.cmake) -diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake -index 06a055b..09d10bd 100644 ---- a/CMake/InstallResources.cmake -+++ b/CMake/InstallResources.cmake -@@ -204,10 +204,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() - if(WIN32) - set(OGRE_PLUGIN_DIR_CMAKE "bin") -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) -diff --git a/CMake/Packages/FindFreeImage.cmake b/CMake/Packages/FindFreeImage.cmake -index 7c89ec5..d8314f0 100644 ---- a/CMake/Packages/FindFreeImage.cmake -+++ b/CMake/Packages/FindFreeImage.cmake -@@ -43,7 +43,7 @@ find_path(FreeImage_INCLUDE_DIR NAMES FreeImage.h HINTS ${FreeImage_INC_SEARCH_P - find_library(FreeImage_LIBRARY_REL NAMES ${FreeImage_LIBRARY_NAMES} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(FreeImage_LIBRARY_DBG NAMES ${FreeImage_LIBRARY_NAMES_DBG} HINTS ${FreeImage_LIB_SEARCH_PATH} ${FreeImage_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) - --make_library_set(FreeImage_LIBRARY) -+make_library_set(FreeImage) - - findpkg_finish(FreeImage) - -diff --git a/CMake/Packages/FindGLSLOptimizer.cmake b/CMake/Packages/FindGLSLOptimizer.cmake -index dd4b179..6f158fc 100644 ---- a/CMake/Packages/FindGLSLOptimizer.cmake -+++ b/CMake/Packages/FindGLSLOptimizer.cmake -@@ -38,7 +38,7 @@ findpkg_framework(GLSL_Optimizer) - find_path(GLSL_Optimizer_INCLUDE_DIR NAMES glsl_optimizer.h HINTS ${GLSL_Optimizer_INC_SEARCH_PATH} ${GLSL_Optimizer_PKGC_INCLUDE_DIRS} PATH_SUFFIXES GLSL_Optimizer) - find_library(GLSL_Optimizer_LIBRARY_REL NAMES ${GLSL_Optimizer_LIBRARY_NAMES} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(GLSL_Optimizer_LIBRARY_DBG NAMES ${GLSL_Optimizer_LIBRARY_NAMES_DBG} HINTS ${GLSL_Optimizer_LIB_SEARCH_PATH} ${GLSL_Optimizer_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) --make_library_set(GLSL_Optimizer_LIBRARY) -+make_library_set(GLSL_Optimizer) - - findpkg_finish(GLSL_Optimizer) - add_parent_dir(GLSL_Optimizer_INCLUDE_DIRS GLSL_Optimizer_INCLUDE_DIR) -diff --git a/CMake/Packages/FindHLSL2GLSL.cmake b/CMake/Packages/FindHLSL2GLSL.cmake -index 7125895..13a306f 100644 ---- a/CMake/Packages/FindHLSL2GLSL.cmake -+++ b/CMake/Packages/FindHLSL2GLSL.cmake -@@ -38,7 +38,7 @@ findpkg_framework(HLSL2GLSL) - find_path(HLSL2GLSL_INCLUDE_DIR NAMES hlsl2glsl.h HINTS ${HLSL2GLSL_INC_SEARCH_PATH} ${HLSL2GLSL_PKGC_INCLUDE_DIRS} PATH_SUFFIXES HLSL2GLSL) - find_library(HLSL2GLSL_LIBRARY_REL NAMES ${HLSL2GLSL_LIBRARY_NAMES} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(HLSL2GLSL_LIBRARY_DBG NAMES ${HLSL2GLSL_LIBRARY_NAMES_DBG} HINTS ${HLSL2GLSL_LIB_SEARCH_PATH} ${HLSL2GLSL_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) --make_library_set(HLSL2GLSL_LIBRARY) -+make_library_set(HLSL2GLSL) - - 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 95c70cd..893ce01 100644 ---- a/CMake/Packages/FindNVAPI.cmake -+++ b/CMake/Packages/FindNVAPI.cmake -@@ -44,7 +44,7 @@ findpkg_framework(NVAPI) - find_path(NVAPI_INCLUDE_DIR NAMES nvapi.h HINTS ${NVAPI_FRAMEWORK_INCLUDES} ${NVAPI_INC_SEARCH_PATH} ${NVAPI_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NVAPI) - find_library(NVAPI_LIBRARY_REL NAMES ${NVAPI_LIBRARY_NAMES} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" release relwithdebinfo minsizerel) - find_library(NVAPI_LIBRARY_DBG NAMES ${NVAPI_LIBRARY_NAMES_DBG} HINTS ${NVAPI_LIB_SEARCH_PATH} ${NVAPI_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" debug) --make_library_set(NVAPI_LIBRARY) -+make_library_set(NVAPI) - - findpkg_finish(NVAPI) - add_parent_dir(NVAPI_INCLUDE_DIRS NVAPI_INCLUDE_DIR) -\ No newline at end of file -diff --git a/CMake/Packages/FindPOCO.cmake b/CMake/Packages/FindPOCO.cmake -index 6b6d7fa..3667b8b 100644 ---- a/CMake/Packages/FindPOCO.cmake -+++ b/CMake/Packages/FindPOCO.cmake -@@ -50,7 +50,7 @@ findpkg_framework(POCO) - find_path(POCO_INCLUDE_DIR NAMES Poco/Foundation.h HINTS ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Foundation/include) - find_library(POCO_LIBRARY_REL NAMES ${POCO_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) - find_library(POCO_LIBRARY_DBG NAMES ${POCO_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) --make_library_set(POCO_LIBRARY) -+make_library_set(POCO) - - findpkg_finish(POCO) - -@@ -66,7 +66,7 @@ get_debug_names(POCO_Util_LIBRARY_NAMES) - find_path(POCO_Util_INCLUDE_DIR NAMES Poco/Util/Util.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Util/include) - find_library(POCO_Util_LIBRARY_REL NAMES ${POCO_Util_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) - find_library(POCO_Util_LIBRARY_DBG NAMES ${POCO_Util_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) --make_library_set(POCO_Util_LIBRARY) -+make_library_set(POCO_Util) - findpkg_finish(POCO_Util) - - # Look for Poco's Net package -@@ -76,7 +76,7 @@ get_debug_names(POCO_Net_LIBRARY_NAMES) - find_path(POCO_Net_INCLUDE_DIR NAMES Poco/Net/Net.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES Net/include) - find_library(POCO_Net_LIBRARY_REL NAMES ${POCO_Net_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) - find_library(POCO_Net_LIBRARY_DBG NAMES ${POCO_Net_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) --make_library_set(POCO_Net_LIBRARY) -+make_library_set(POCO_Net) - findpkg_finish(POCO_Net) - - # Look for Poco's NetSSL package -@@ -86,7 +86,7 @@ get_debug_names(POCO_NetSSL_LIBRARY_NAMES) - find_path(POCO_NetSSL_INCLUDE_DIR NAMES Poco/Net/NetSSL.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES NetSSL/include) - find_library(POCO_NetSSL_LIBRARY_REL NAMES ${POCO_NetSSL_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) - find_library(POCO_NetSSL_LIBRARY_DBG NAMES ${POCO_NetSSL_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) --make_library_set(POCO_NetSSL_LIBRARY) -+make_library_set(POCO_NetSSL) - findpkg_finish(POCO_NetSSL) - - # Look for Poco's XML package -@@ -96,6 +96,6 @@ get_debug_names(POCO_XML_LIBRARY_NAMES) - find_path(POCO_XML_INCLUDE_DIR NAMES Poco/XML/XML.h HINTS ${POCO_INCLUDE_DIR} ${POCO_INC_SEARCH_PATH} ${POCO_PKGC_INCLUDE_DIRS} PATH_SUFFIXES XML/include) - find_library(POCO_XML_LIBRARY_REL NAMES ${POCO_XML_LIBRARY_NAMES} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) - find_library(POCO_XML_LIBRARY_DBG NAMES ${POCO_XML_LIBRARY_NAMES_DBG} HINTS ${POCO_LIB_SEARCH_PATH} ${POCO_PKGC_LIBRARY_DIRS} PATH_SUFFIXES Linux/i686) --make_library_set(POCO_XML_LIBRARY) -+make_library_set(POCO_XML) - findpkg_finish(POCO_XML) - -diff --git a/CMake/Packages/FindTBB.cmake b/CMake/Packages/FindTBB.cmake -index 0c48510..c121966 100644 ---- a/CMake/Packages/FindTBB.cmake -+++ b/CMake/Packages/FindTBB.cmake -@@ -104,7 +104,7 @@ findpkg_framework(TBB) - find_path(TBB_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) - find_library(TBB_LIBRARY_REL NAMES ${TBB_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) - find_library(TBB_LIBRARY_DBG NAMES ${TBB_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) --make_library_set(TBB_LIBRARY) -+make_library_set(TBB) - - findpkg_finish(TBB) - -@@ -120,7 +120,7 @@ get_debug_names(TBB_MALLOC_LIBRARY_NAMES) - find_path(TBB_MALLOC_INCLUDE_DIR NAMES tbb/tbb.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS} ) - find_library(TBB_MALLOC_LIBRARY_REL NAMES ${TBB_MALLOC_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) - find_library(TBB_MALLOC_LIBRARY_DBG NAMES ${TBB_MALLOC_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS} ) --make_library_set(TBB_MALLOC_LIBRARY) -+make_library_set(TBB_MALLOC) - findpkg_finish(TBB_MALLOC) - - # Look for TBB's malloc proxy package -@@ -130,5 +130,5 @@ get_debug_names(TBB_MALLOC_PROXY_LIBRARY_NAMES) - find_path(TBB_MALLOC_PROXY_INCLUDE_DIR NAMES tbb/tbbmalloc_proxy.h HINTS ${TBB_INCLUDE_DIR} ${TBB_INC_SEARCH_PATH} ${TBB_PKGC_INCLUDE_DIRS}) - find_library(TBB_MALLOC_PROXY_LIBRARY_REL NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) - find_library(TBB_MALLOC_PROXY_LIBRARY_DBG NAMES ${TBB_MALLOC_PROXY_LIBRARY_NAMES_DBG} HINTS ${TBB_LIB_SEARCH_PATH} ${TBB_PKGC_LIBRARY_DIRS}) --make_library_set(TBB_MALLOC_PROXY_LIBRARY) -+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 ---- a/CMake/Packages/FindZZip.cmake -+++ b/CMake/Packages/FindZZip.cmake -@@ -39,12 +39,12 @@ use_pkgconfig(ZZip_PKGC zziplib) - - findpkg_framework(ZZip) - --find_path(ZZip_INCLUDE_DIR NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) -+find_path(ZZip_INCLUDE_DIRS NAMES zzip/zzip.h HINTS ${ZZip_INC_SEARCH_PATH} ${ZZip_PKGC_INCLUDE_DIRS}) - - find_library(ZZip_LIBRARY_REL NAMES ${ZZip_LIBRARY_NAMES} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) - find_library(ZZip_LIBRARY_DBG NAMES ${ZZip_LIBRARY_NAMES_DBG} HINTS ${ZZip_LIB_SEARCH_PATH} ${ZZip_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Debug) - --make_library_set(ZZip_LIBRARY) -+make_library_set(ZZip) - - findpkg_finish(ZZip) - -diff --git a/CMake/Utils/FindPkgMacros.cmake b/CMake/Utils/FindPkgMacros.cmake -index 374f84b..dc7066d 100644 ---- a/CMake/Utils/FindPkgMacros.cmake -+++ b/CMake/Utils/FindPkgMacros.cmake -@@ -79,15 +79,21 @@ endmacro (use_pkgconfig) - - # Couple a set of release AND debug libraries (or frameworks) - macro(make_library_set PREFIX) -- if (${PREFIX}_FWK) -- set(${PREFIX} ${${PREFIX}_FWK}) -- elseif (${PREFIX}_REL AND ${PREFIX}_DBG) -- set(${PREFIX} optimized ${${PREFIX}_REL} debug ${${PREFIX}_DBG}) -- elseif (${PREFIX}_REL) -- set(${PREFIX} ${${PREFIX}_REL}) -- elseif (${PREFIX}_DBG) -- set(${PREFIX} ${${PREFIX}_DBG}) -- endif () -+ include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) -+ set(PREFIX_LIB "${PREFIX}_LIBRARY") -+ if (${PREFIX_LIB}_FWK) -+ set(${PREFIX_LIB} ${${PREFIX_LIB}_FWK}) -+ elseif (${PREFIX_LIB}_REL AND ${PREFIX_LIB}_DBG) -+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL} CACHE STRING "") -+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG} CACHE STRING "") -+ select_library_configurations(${PREFIX}) -+ elseif (${PREFIX_LIB}_REL) -+ set(${PREFIX_LIB} ${${PREFIX_LIB}_REL}) -+ set(${PREFIX_LIB}_RELEASE ${${PREFIX_LIB}_REL}) -+ elseif (${PREFIX_LIB}_DBG) -+ set(${PREFIX_LIB} ${${PREFIX_LIB}_DBG}) -+ set(${PREFIX_LIB}_DEBUG ${${PREFIX_LIB}_DBG}) -+ endif() - endmacro(make_library_set) - - # Generate debug names from given release names -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1602572..9fddbe7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -271,7 +271,7 @@ elseif(EMSCRIPTEN) - elseif (APPLE AND NOT APPLE_IOS) - - set(XCODE_ATTRIBUTE_SDKROOT macosx) -- 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/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) diff --git a/ports/ogre/vcpkg.json b/ports/ogre/vcpkg.json index c1bbf065c49af6..b8969d91e9851a 100644 --- a/ports/ogre/vcpkg.json +++ b/ports/ogre/vcpkg.json @@ -1,14 +1,16 @@ { "name": "ogre", - "version": "1.12.9", - "port-version": 10, + "version": "13.4.4", "description": "3D Object-Oriented Graphics Rendering Engine", "homepage": "https://github.com/OGRECave/ogre", "license": "MIT", "dependencies": [ - "assimp", "pugixml", - "sdl2", + { + "name": "sdl2", + "platform": "!android" + }, + "stb", { "name": "vcpkg-cmake", "host": true @@ -23,31 +25,49 @@ "assimp", "freeimage", "overlay", - "zziplib" + "zip" ], "features": { "assimp": { - "description": "Deprecate feature, enable by default" + "description": "Build with assimp support", + "dependencies": [ + "assimp" + ] }, "csharp": { - "description": "Build csharp bindings" + "description": "Build csharp bindings", + "supports": "!static & !android & !ios & !emscripten" }, "d3d9": { - "description": "Build Direct3D9 RenderSystem" + "description": "Build Direct3D9 RenderSystem", + "supports": "windows" }, "freeimage": { - "description": "Build with FreeImage support", + "description": "Build with FreeImage support (no effect for Emscripten)", "dependencies": [ - "freeimage" + { + "name": "freeimage", + "platform": "!emscripten" + } ] }, "java": { - "description": "Build Java (JNI) bindings" + "description": "Build Java (JNI) bindings", + "supports": "!static & !android & !ios & !emscripten" + }, + "openexr": { + "description": "Build with OpenEXR support", + "dependencies": [ + "openexr" + ] }, "overlay": { "description": "Build overlay component", "dependencies": [ - "freetype", + { + "name": "freetype", + "default-features": false + }, { "name": "imgui", "features": [ @@ -58,6 +78,7 @@ }, "python": { "description": "Build Python bindings", + "supports": "!static & !android & !ios & !emscripten", "dependencies": [ "python3" ] @@ -65,10 +86,23 @@ "strict": { "description": "Force Ogre resource manager to be strict with group names and resource names" }, + "tools": { + "description": "Build tools", + "supports": "!android & !emscripten" + }, + "zip": { + "description": "Build ZIP archive support" + }, "zziplib": { - "description": "Build with zziplib support (GPL)", + "description": "Obsolete, use zip feature instead", "dependencies": [ - "zziplib" + { + "name": "ogre", + "default-features": false, + "features": [ + "zip" + ] + } ] } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 01c9f3e6814646..9fb6a9b8ae8f53 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -729,7 +729,6 @@ ogdf:x64-windows-static-md=skip ogdf:x86-windows = skip # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936 ogdf:x64-linux=fail -ogre:x64-osx=fail ogre:arm64-osx=fail # Conflicts with ogre ogre-next:arm64-windows = skip diff --git a/versions/baseline.json b/versions/baseline.json index 067347297bdc22..de0af4d131785a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5281,8 +5281,8 @@ "port-version": 2 }, "ogre": { - "baseline": "1.12.9", - "port-version": 10 + "baseline": "13.4.4", + "port-version": 0 }, "ogre-next": { "baseline": "2.3.1", diff --git a/versions/o-/ogre.json b/versions/o-/ogre.json index 4aca6405120494..7c3d2938ae85ea 100644 --- a/versions/o-/ogre.json +++ b/versions/o-/ogre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "558eff8cc61b6d9a5638bf10e6e4ade7ad178ee7", + "version": "13.4.4", + "port-version": 0 + }, { "git-tree": "ea03f2d3fd45123a688cd9fb177bcb9bab30a795", "version": "1.12.9", From 4a723f2d160e20d9be368482e5bcaa2b849be9b1 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Thu, 13 Oct 2022 21:59:21 +0300 Subject: [PATCH 771/791] [sail] Add features (#27169) * [sail] Added features * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Added dependency name * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Added priority-based features * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Fix enabling only the selected codecs * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Rename 'Build with' to 'Enable' * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Escape codecs list * [sail] Remove SVG from aggregated features as its dependency 'resvg' is still not in vcpkg * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Enable SVG if it was explicitly enabled * [sail] vcpkg x-add-version --all --overwrite-version --- ports/sail/portfile.cmake | 12 +++ ports/sail/vcpkg.json | 159 ++++++++++++++++++++++++++++++++++++-- versions/baseline.json | 2 +- versions/s-/sail.json | 5 ++ 4 files changed, 169 insertions(+), 9 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 57ae5197624723..a0b17f847db512 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -6,11 +6,23 @@ vcpkg_from_github( HEAD_REF master ) +# Enable selected codecs +set(ONLY_CODECS "") + +foreach(CODEC avif bmp gif ico jpeg jpeg2000 pcx png qoi svg tga tiff wal webp xbm) + if (${CODEC} IN_LIST FEATURES) + list(APPEND ONLY_CODECS ${CODEC}) + endif() +endforeach() + +list(JOIN ONLY_CODECS "\;" ONLY_CODECS_ESCAPED) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSAIL_COMBINE_CODECS=ON + -DSAIL_ONLY_CODECS=${ONLY_CODECS_ESCAPED} -DSAIL_BUILD_APPS=OFF -DSAIL_BUILD_EXAMPLES=OFF -DSAIL_BUILD_TESTS=OFF diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index ec9d7ba0c6fbe0..c902e6a9fa6606 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,18 +1,12 @@ { "name": "sail", "version-semver": "0.9.0-rc1", + "port-version": 1, "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", - "jasper", - "libavif", - "libjpeg-turbo", - "libpng", - "libwebp", - "tiff", { "name": "vcpkg-cmake", "host": true @@ -21,5 +15,154 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "high-priority" + ], + "features": { + "all": { + "description": "Enable all codecs", + "dependencies": [ + { + "name": "sail", + "features": [ + "avif", + "bmp", + "gif", + "ico", + "jpeg", + "jpeg2000", + "pcx", + "png", + "qoi", + "tga", + "tiff", + "wal", + "webp", + "xbm" + ] + } + ] + }, + "avif": { + "description": "Enable AVIF codec", + "dependencies": [ + "libavif" + ] + }, + "bmp": { + "description": "Enable BMP codec" + }, + "gif": { + "description": "Enable GIF codec", + "dependencies": [ + "giflib" + ] + }, + "high-priority": { + "description": "Enable high priority codecs such as JPEG or PNG", + "dependencies": [ + { + "name": "sail", + "features": [ + "bmp", + "gif", + "jpeg", + "png", + "tiff" + ] + } + ] + }, + "ico": { + "description": "Enable ICO codec" + }, + "jpeg": { + "description": "Enable JPEG codec", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "jpeg2000": { + "description": "Enable JPEG2000 codec", + "dependencies": [ + "jasper" + ] + }, + "low-priority": { + "description": "Enable low priority codecs such as TGA", + "dependencies": [ + { + "name": "sail", + "features": [ + "ico", + "pcx", + "qoi", + "tga" + ] + } + ] + }, + "lowest-priority": { + "description": "Enable lowest priority codecs such as XBM", + "dependencies": [ + { + "name": "sail", + "features": [ + "wal", + "xbm" + ] + } + ] + }, + "medium-priority": { + "description": "Enable medium priority codecs such as AVIF", + "dependencies": [ + { + "name": "sail", + "features": [ + "avif", + "jpeg2000", + "webp" + ] + } + ] + }, + "pcx": { + "description": "Enable PCX codec" + }, + "png": { + "description": "Enable PNG codec", + "dependencies": [ + "libpng" + ] + }, + "qoi": { + "description": "Enable QOI codec" + }, + "svg": { + "description": "Enable SVG codec" + }, + "tga": { + "description": "Enable TGA codec" + }, + "tiff": { + "description": "Enable TIFF codec", + "dependencies": [ + "tiff" + ] + }, + "wal": { + "description": "Enable WAL codec" + }, + "webp": { + "description": "Enable WEBP codec", + "dependencies": [ + "libwebp" + ] + }, + "xbm": { + "description": "Enable XBM codec" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index de0af4d131785a..9299a7ef6cfa29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6634,7 +6634,7 @@ }, "sail": { "baseline": "0.9.0-rc1", - "port-version": 0 + "port-version": 1 }, "sais": { "baseline": "2.4.1", diff --git a/versions/s-/sail.json b/versions/s-/sail.json index 1ed673596d7843..440575b8ba7e92 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "796491a7ff11bd4426bac390a26d740ad85e88dd", + "version-semver": "0.9.0-rc1", + "port-version": 1 + }, { "git-tree": "5a3beda67ffe57e68f882d59f7f5c33bf726f2c8", "version-semver": "0.9.0-rc1", From ee388aaa69637d2c7b2bd5832198e834ed826fd8 Mon Sep 17 00:00:00 2001 From: Carlo Bramini <30959007+carlo-bramini@users.noreply.github.com> Date: Thu, 13 Oct 2022 23:54:59 +0200 Subject: [PATCH 772/791] [FFmpeg] Fix build on ARM64 (#27184) I tried to build FFmpeg for ARM64 but I got an error. The problem happens because portfile.cmake uses gcc-9.3.0 but it has been removed from repository. See: https://repo.msys2.org/msys/x86_64/ So, it is just needed to update that file to the newer updated version and you will be able to build FFmpeg for ARM64 again. --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 2c049c72a0b092..fd796f4cb91305 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -70,8 +70,8 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_acquire_msys(MSYS_ROOT DIRECT_PACKAGES # Required for "cpp.exe" preprocessor - "https://repo.msys2.org/msys/x86_64/gcc-9.3.0-1-x86_64.pkg.tar.xz" - 76af0192a092278e6b26814b2d92815a2c519902a3fec056b057faec19623b1770ac928a59a39402db23cfc23b0d7601b7f88b367b27269361748c69d08654b2 + "https://repo.msys2.org/msys/x86_64/gcc-11.3.0-2-x86_64.pkg.tar.zst" + 1efc34aa8312eb5a8fef02c7c903d9ed98c4d50b13b8cf9679df1d545847eb9e0e9a42a810b2e085c6f938796a2a9846cb8b515e9380fdd6bec8ae4a1a131d9e "https://repo.msys2.org/msys/x86_64/isl-0.22.1-1-x86_64.pkg.tar.xz" f4db50d00bad0fa0abc6b9ad965b0262d936d437a9faa35308fa79a7ee500a474178120e487b2db2259caf51524320f619e18d92acf4f0b970b5cbe5cc0f63a2 "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz" diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index cb7d574e00bd43..d1992f42cf5a55 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4.1", - "port-version": 19, + "port-version": 20, "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." diff --git a/versions/baseline.json b/versions/baseline.json index 9299a7ef6cfa29..e0f71bffa86fd4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2294,7 +2294,7 @@ }, "ffmpeg": { "baseline": "4.4.1", - "port-version": 19 + "port-version": 20 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 5a37dac4583891..7b07ea70b43e0c 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4a2ee724ee276834d3f5715bac6bf6ec179c31b", + "version": "4.4.1", + "port-version": 20 + }, { "git-tree": "42edfcee5ee9a8884b7c1733c6b560092cad9576", "version": "4.4.1", From 51dd79db8c823a2aa977533fd0befe54e276aab9 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 13 Oct 2022 16:15:20 -0700 Subject: [PATCH 773/791] Update vcpkg-tool to 2022-10-12. (#27209) * Update vcpkg-tool to 2022-10-12. https://github.com/microsoft/vcpkg-tool/releases/tag/2022-10-12 * Unset VCPKG_ROOT. --- .github/workflows/untrustedPR.yml | 2 +- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 4784bc48598d8f..1b9a7e515dac2d 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -32,7 +32,7 @@ jobs: git --version - export VCPKG_ROOT=. + unset VCPKG_ROOT git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*vcpkg.json' | sed 's/[MAR]\t*//' > .github-pr.changed-manifest-files diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 03f4ec2a9cda17..be9f23a7b2d295 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2022-09-20' +$versionDate = '2022-10-12' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") { & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index c8bc5927f49724..b5d22e62652768 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -126,23 +126,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2022-09-20" +vcpkgToolReleaseTag="2022-10-12" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="d09cf1fb57d3a5a8965723e0de4fc29d05d3d48c06a2b21a027750c955d7f54a881265ae53805d0b0e674db6d4c0b303a915a070daacd72d87a111132daea5df" + vcpkgToolReleaseSha="9849326c5926b6ba35245686b9a38cce79b6bdf93491b922732583c9676abbbd617576987673ebfeb58809ecf93238b8f69c0f75c4432e52ee11aa24fc3a18d8" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="f454db52986d6ac57117c61696d3d8f581db154d38a2aac1e7d2c234e3ed8486e017f2db4638e6d26fc5d6e545e76edc20d2a7e3a0fe12ca507bae86a250cca5" + vcpkgToolReleaseSha="c5611167093568fe512b6a421638aa53d944f4750153192c56a145c7a7775b52ff1121d666ffee38fd4311c7886282c507028443aa268dc927b94cd65ebf3f25" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="9f360cfd7189cc5c09f7445782075e524ba9e0e2f9205d5e7bfb0c531ade180678ee729e764955ca06056acb5d2b5892c92681e9fb8b7f77b8437924a2c9909d" + vcpkgToolReleaseSha="42c86ac721a5f115087d33de037a1107fdf4275bfcb237b47a30c5c547c56a338ef7af7fb18e3275b327579436b4841e46b846436bcface67edc7ceafcbf7211" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="0c7e90821889b3a5a1bec8542445c92226fa0201232dbde042ef1ba3bf6cb6f9eb0f0d99d509b064eb6023f97ab9491a11ab38cd39a4db6caa3183b7bcc4fe36" + vcpkgToolReleaseSha="02034b38a9bdd491ccd0832539fb4aa1bdd4812531d861ba336ea61c70d6926bfb08a3a40de958b0e66d24a3ff1e44f383c0d15258df04a18d683ac29d5dd28e" fi # Do the download or build. From 0948fa8a1ebcfa7c484043b8ea8dc0f6cd2ef9cb Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 13 Oct 2022 17:12:26 -0700 Subject: [PATCH 774/791] Add documentation of https://github.com/microsoft/vcpkg-tool/pull/725 (#27188) * Add documentation of https://github.com/microsoft/vcpkg-tool/pull/725 * Fix @Neumann-A's feedback --- docs/users/config-environment.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index cb0d40b9a17bbb..9963680f5926fe 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -23,8 +23,8 @@ This environment variable can be set to the full path of an executable to be use #### VCPKG_ROOT -This environment variable can be set to a directory to use as the root of the vcpkg instance. Note that mixing vcpkg -repo versions and executable versions can cause issues. +This environment variable can be set to a directory to use as the root of the vcpkg instance. This will only be used if +the vcpkg executable is not located within a valid root and the command line switch `--vcpkg-root` is unused. #### VCPKG_VISUAL_STUDIO_PATH From 929fc61671bb5e5e7322981dce1153abf24f54cf Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 13 Oct 2022 17:12:51 -0700 Subject: [PATCH 775/791] Document environment variable (#27000) --- docs/users/config-environment.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 9963680f5926fe..de229aea513f01 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -99,3 +99,7 @@ This environment variable allows using NuGet's cache for every nuget-based binar > Note: This is an experimental feature and may change or be removed at any time This environment variable allows using a private mirror for all SHA512-tagged assets. See [Asset Caching](assetcaching.md) for more details. + +#### VCPKG_NO_CI + +Setting `VCPKG_NO_CI` disables vcpkg's CI environment detection heuristics. From 962dc0cb629da7a3da6ee4494e3f9bca7d59df75 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 14 Oct 2022 05:19:01 +0200 Subject: [PATCH 776/791] [docs] Document `VERSION` (#27178) * [docs] Document * Update docs/maintainers/vcpkg_common_definitions.md Co-authored-by: Victor Romero Co-authored-by: Billy O'Neal Co-authored-by: Victor Romero --- docs/maintainers/vcpkg_common_definitions.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index a8111b122736eb..6818ae14bfe914 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -5,6 +5,8 @@ The latest version of this document lives in the [vcpkg repo](https://github.com This file defines the following variables which are commonly needed or used in portfiles: ```cmake +PORT The name of the port that is currently being built +VERSION The version of the port that is currently being built VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD, EMSCRIPTEN. only defined if VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") From 6d2d1dc843a95b5d651a673236fc7ec50e5cfc03 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 13 Oct 2022 20:23:14 -0700 Subject: [PATCH 777/791] VM Update October 2022 (#27212) * Add libtool-bin as requested in https://github.com/microsoft/vcpkg/pull/26923 * Update pools. --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/linux/provision-image.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 87b5f3b61b6253..0277b12a79f353 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2022-09-20' - linux-pool: 'PrLin-2022-09-25' + windows-pool: 'PrWin-2022-10-12' + linux-pool: 'PrLin-2022-10-12' osx-pool: 'PrOsx-2022-02-04' parameters: diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index e3c6732e93c4e7..a5d9eec8842521 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -32,7 +32,7 @@ APT_PACKAGES="git curl zip unzip tar" APT_PACKAGES="$APT_PACKAGES at libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran libx11-dev libxkbcommon-x11-dev libxi-dev \ libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ - libxcursor-dev yasm libnuma1 libnuma-dev \ + libxcursor-dev yasm libnuma1 libnuma-dev libtool-bin \ flex bison libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ pkg-config meson nasm cmake ninja-build" From b653de7c30955b3b575d11b60dd046c3cfbc4b80 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Sat, 15 Oct 2022 04:10:30 +0800 Subject: [PATCH 778/791] [baseline] Remove mfl from ci.baseline.txt (#27216) * [baseline] Remove mfl from ci.baseline.txt * update --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9fb6a9b8ae8f53..c8abe36c0554b1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -595,9 +595,6 @@ mesa:x64-windows-static=fail # Missing dependent libraries. mesa:x64-linux=fail mesa:x64-osx=fail -# Triggers an ICE -mfl:x64-windows-static=fail -mfl:x64-windows-static-md=fail mfl:x64-linux=skip mfl:x64-osx=skip mfl:arm64-osx=skip From 4fa284dc008dc65f31f8f75536f49b379ac2643d Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sat, 15 Oct 2022 01:01:28 +0200 Subject: [PATCH 779/791] [luv] add new port (#26438) * [luv] add new port libuv bindings for lua * [lua-compat53] add new port * fixup!: bad indentation * refactor: remove superfluous feature desc --- ports/lua-compat53/portfile.cmake | 14 +++++++++++ ports/lua-compat53/usage | 4 +++ ports/lua-compat53/vcpkg.json | 17 +++++++++++++ ports/luv/fix-find-libuv.patch | 15 ++++++++++++ ports/luv/fix-find-lua-compat53.patch | 28 +++++++++++++++++++++ ports/luv/fix-find-luajit.patch | 33 +++++++++++++++++++++++++ ports/luv/fix-msvc-build.patch | 26 ++++++++++++++++++++ ports/luv/portfile.cmake | 35 +++++++++++++++++++++++++++ ports/luv/vcpkg.json | 24 ++++++++++++++++++ versions/baseline.json | 8 ++++++ versions/l-/lua-compat53.json | 9 +++++++ versions/l-/luv.json | 9 +++++++ 12 files changed, 222 insertions(+) create mode 100644 ports/lua-compat53/portfile.cmake create mode 100644 ports/lua-compat53/usage create mode 100644 ports/lua-compat53/vcpkg.json create mode 100644 ports/luv/fix-find-libuv.patch create mode 100644 ports/luv/fix-find-lua-compat53.patch create mode 100644 ports/luv/fix-find-luajit.patch create mode 100644 ports/luv/fix-msvc-build.patch create mode 100644 ports/luv/portfile.cmake create mode 100644 ports/luv/vcpkg.json create mode 100644 versions/l-/lua-compat53.json create mode 100644 versions/l-/luv.json diff --git a/ports/lua-compat53/portfile.cmake b/ports/lua-compat53/portfile.cmake new file mode 100644 index 00000000000000..1c1fcd5323a82d --- /dev/null +++ b/ports/lua-compat53/portfile.cmake @@ -0,0 +1,14 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO lunarmodules/lua-compat-5.3 + REF e245d3a18957e43ef902a59a72c8902e2e4435b9 # v0.10 + SHA512 541309275f464f611f7c402ec74c84192cbc8209f5624ee96961caaf9a0bc44f8486a2f4be3a25fb0123ce600b6d830489c91bbfddeda09e9cdf2df01beea950 + HEAD_REF master +) + +file(INSTALL ${SOURCE_PATH}/c-api/compat-5.3.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/c-api/compat-5.3.c DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/lua-compat53/usage b/ports/lua-compat53/usage new file mode 100644 index 00000000000000..667c4c904c7bac --- /dev/null +++ b/ports/lua-compat53/usage @@ -0,0 +1,4 @@ +The package lua-compat53 provides a header only C-API and can be used from CMake via: + + find_path(LUA_COMPAT53_INCLUDE_DIRS "compat-5.3.h") + target_include_directories(main PRIVATE ${LUA_COMPAT53_INCLUDE_DIRS}) diff --git a/ports/lua-compat53/vcpkg.json b/ports/lua-compat53/vcpkg.json new file mode 100644 index 00000000000000..ada4e8cf044cde --- /dev/null +++ b/ports/lua-compat53/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "lua-compat53", + "version": "0.10", + "description": "provide Lua-5.3-style C APIs for Lua 5.2 and 5.1", + "homepage": "https://github.com/lunarmodules/lua-compat-5.3", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/luv/fix-find-libuv.patch b/ports/luv/fix-find-libuv.patch new file mode 100644 index 00000000000000..9816fe3bdc6eee --- /dev/null +++ b/ports/luv/fix-find-libuv.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e63a431..163bada 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,8 +65,8 @@ endif () + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + + if (WITH_SHARED_LIBUV) +- find_package(Libuv REQUIRED) +- include_directories(${LIBUV_INCLUDE_DIR}) ++ find_package(libuv CONFIG REQUIRED) ++ set(LIBUV_LIBRARIES $,uv_a,uv>) + else (WITH_SHARED_LIBUV) + include_directories(deps/libuv/include) + add_subdirectory(deps/libuv EXCLUDE_FROM_ALL) diff --git a/ports/luv/fix-find-lua-compat53.patch b/ports/luv/fix-find-lua-compat53.patch new file mode 100644 index 00000000000000..c5c4d6061be6df --- /dev/null +++ b/ports/luv/fix-find-lua-compat53.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e63a431..1f144c8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -231,13 +231,7 @@ if(APPLE) + # ) + endif() + +-if(NOT LUA_COMPAT53_DIR) +- set(LUA_COMPAT53_DIR deps/lua-compat-5.3) +-endif() +-if(DEFINED ENV{LUA_COMPAT53_DIR}) +- set(LUA_COMPAT53_DIR $ENV{LUA_COMPAT53_DIR}) +-endif() +-include_directories(${LUA_COMPAT53_DIR}/c-api) ++find_path(LUA_COMPAT53_INCLUDE_DIRS "compat-5.3.h") + + if(WIN32) + add_definitions(-DLUA_BUILD_AS_DLL -DLUA_LIB) +@@ -263,6 +257,7 @@ foreach(TARGET_NAME ${ACTIVE_TARGETS}) + else() + target_link_libraries(${TARGET_NAME} ${LIBUV_LIBRARIES}) + endif() ++ target_include_directories(${TARGET_NAME} PRIVATE ${LUA_COMPAT53_INCLUDE_DIRS}) + endforeach() + + if (NOT LUA) + diff --git a/ports/luv/fix-find-luajit.patch b/ports/luv/fix-find-luajit.patch new file mode 100644 index 00000000000000..32eb75f04d3e91 --- /dev/null +++ b/ports/luv/fix-find-luajit.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e63a431..841db78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,7 +125,7 @@ else (LUA) + # We only link the libs on Windows, so find_package fully succeeding + # is only required on Windows + if (WIN32 OR CYGWIN) +- find_package(LuaJIT REQUIRED) ++ find_package(LUAJIT REQUIRED) + link_directories(${LUAJIT_LIBRARIES}) + else() + find_package(LuaJIT) +diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake +index 0d0786e..7121e06 100644 +--- a/cmake/Modules/FindLuaJIT.cmake ++++ b/cmake/Modules/FindLuaJIT.cmake +@@ -23,8 +23,12 @@ + # LUA_VERSION_MINOR - the minor version of Lua + # LUA_VERSION_PATCH - the patch version of Lua + +-FIND_PATH(LUAJIT_INCLUDE_DIR NAMES lua.h PATH_SUFFIXES luajit-2.0 luajit-2.1) +-FIND_LIBRARY(LUAJIT_LIBRARIES NAMES luajit-5.1 luajit) ++FIND_PATH(LUAJIT_INCLUDE_DIR NAMES luajit.h PATH_SUFFIXES luajit-2.0 luajit-2.1 luajit) ++set(LUAJIT_LIB_NAMES luajit-5.1 luajit) ++if(MSVC) ++ list(APPEND LUAJIT_LIB_NAMES lua51) ++endif() ++FIND_LIBRARY(LUAJIT_LIBRARIES NAMES ${LUAJIT_LIB_NAMES}) + + if (LUAJIT_INCLUDE_DIR AND EXISTS "${LUAJIT_INCLUDE_DIR}/lua.h") + # At least 5.[012] have different ways to express the version + diff --git a/ports/luv/fix-msvc-build.patch b/ports/luv/fix-msvc-build.patch new file mode 100644 index 00000000000000..cdf37b44e21812 --- /dev/null +++ b/ports/luv/fix-msvc-build.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e63a431..aa46c07 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,20 +25,6 @@ if (MINGW) + add_definitions(-D_WIN32_WINNT=0x0600) + endif (MINGW) + +-if (WIN32) +- # replace /MD to /MT to avoid link msvcr*.dll +- # this needs to be before add_subdirectory calls so that they inherit the modified flags +- set(CompilerFlags +- CMAKE_C_FLAGS +- CMAKE_C_FLAGS_DEBUG +- CMAKE_C_FLAGS_MINSIZEREL +- CMAKE_C_FLAGS_RELWITHDEBINFO +- CMAKE_C_FLAGS_RELEASE) +- foreach(CompilerFlag ${CompilerFlags}) +- string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") +- endforeach() +-endif () +- + if (NOT WITH_LUA_ENGINE) + set(WITH_LUA_ENGINE "LuaJIT" + CACHE STRING "Link to LuaJIT or PUC Lua" FORCE) + diff --git a/ports/luv/portfile.cmake b/ports/luv/portfile.cmake new file mode 100644 index 00000000000000..10870e55dcbee5 --- /dev/null +++ b/ports/luv/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO luvit/luv + REF 1f255a7d87cef4a7eb10bd13bbd1e213980e8da2 #v1.44.2 + SHA512 e9ee9ee6ca8f810c375f3310a119b518da8d15f6e3093aaa6069217f4e3d29a45426cc5e2233b6a8d90876867d9097c938a5b961fb6e46479c62145297f5bb82 + HEAD_REF master + PATCHES fix-find-libuv.patch + fix-find-luajit.patch + fix-find-lua-compat53.patch + fix-msvc-build.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWITH_SHARED_LIBUV=ON + -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} + -DLUA_BUILD_TYPE=System + -DWITH_LUA_ENGINE=LuaJIT + -DUSE_LUAJIT=ON + -DBUILD_MODULE=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/luv/vcpkg.json b/ports/luv/vcpkg.json new file mode 100644 index 00000000000000..292eb6dd375b3f --- /dev/null +++ b/ports/luv/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "luv", + "version-semver": "1.44.2", + "description": "Bare libuv bindings for lua", + "homepage": "https://github.com/luvit/luv", + "license": "Apache-2.0", + "supports": "!uwp", + "dependencies": [ + { + "name": "libuv", + "version>=": "1.44.2" + }, + "lua-compat53", + "luajit", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e0f71bffa86fd4..ccf89800cc177b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4540,6 +4540,10 @@ "baseline": "5.4.4", "port-version": 2 }, + "lua-compat53": { + "baseline": "0.10", + "port-version": 0 + }, "luabridge": { "baseline": "2.6", "port-version": 1 @@ -4568,6 +4572,10 @@ "baseline": "2.3.1", "port-version": 0 }, + "luv": { + "baseline": "1.44.2", + "port-version": 0 + }, "lv2": { "baseline": "1.18.2", "port-version": 1 diff --git a/versions/l-/lua-compat53.json b/versions/l-/lua-compat53.json new file mode 100644 index 00000000000000..abf9b471a26707 --- /dev/null +++ b/versions/l-/lua-compat53.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3f65429d091c8db2d5dadacce8e6c04ca8939394", + "version": "0.10", + "port-version": 0 + } + ] +} diff --git a/versions/l-/luv.json b/versions/l-/luv.json new file mode 100644 index 00000000000000..18de69d6e66412 --- /dev/null +++ b/versions/l-/luv.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dfb9cba0c0da80351b575c758df8f2b03048315f", + "version-semver": "1.44.2", + "port-version": 0 + } + ] +} From 0967abd1759c8ba262d7a16d3293cf49464bb5c0 Mon Sep 17 00:00:00 2001 From: r4ve1 <1697722575@qq.com> Date: Sat, 15 Oct 2022 07:02:39 +0800 Subject: [PATCH 780/791] [zycore] Add new port (#27195) * [zycore] new port * [zycore] add version files * [zycore] add license field to vcpkg.json * [zycore] fix version * [zycore] fix port files' format Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [zycore]: update git-tree version * [zycore]: fix description Co-authored-by: Florian Bernd * [zycore]: update git-tree version * [zycore]: optimize portfile.cmake * [zycore]: optimize port files Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Florian Bernd --- ports/zycore/fix-install.patch | 12 ++++++++++++ ports/zycore/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/zycore/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/z-/zycore.json | 9 +++++++++ 5 files changed, 70 insertions(+) create mode 100644 ports/zycore/fix-install.patch create mode 100644 ports/zycore/portfile.cmake create mode 100644 ports/zycore/vcpkg.json create mode 100644 versions/z-/zycore.json diff --git a/ports/zycore/fix-install.patch b/ports/zycore/fix-install.patch new file mode 100644 index 00000000000000..691660a04b534e --- /dev/null +++ b/ports/zycore/fix-install.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d17f7d7..e34f508 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -208,6 +208,7 @@ install(FILES + + install(TARGETS "Zycore" EXPORT "zycore-targets" + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(EXPORT "zycore-targets" diff --git a/ports/zycore/portfile.cmake b/ports/zycore/portfile.cmake new file mode 100644 index 00000000000000..db29b364d3b257 --- /dev/null +++ b/ports/zycore/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO zyantific/zycore-c + REF 4a8b5e2ab4d6ee73aa92d04bc318fed607394e67 + SHA512 c707f5e07411d9f00fa59e3c382345009f225ed9406063b9863604f15a9c45c9a32bc9c3100f08d9c5800cc2254f71bfae817979b85bc604739ca1ee854c94e5 + HEAD_REF master + PATCHES + fix-install.patch +) + +string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic ZYCORE_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DZYCORE_BUILD_SHARED_LIB=${ZYCORE_BUILD_SHARED} +) + +vcpkg_cmake_install() + + +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/cmake/zycore +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/zycore/vcpkg.json b/ports/zycore/vcpkg.json new file mode 100644 index 00000000000000..b3de1167cfbe43 --- /dev/null +++ b/ports/zycore/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "zycore", + "version": "1.3.0", + "description": "Provides platform independent types, macros and a fallback for environments without LibC.", + "homepage": "https://github.com/zyantific/zycore-c", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ccf89800cc177b..1b51884b81c0b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8164,6 +8164,10 @@ "baseline": "2021-04-23", "port-version": 1 }, + "zycore": { + "baseline": "1.3.0", + "port-version": 0 + }, "zydis": { "baseline": "3.2.1", "port-version": 0 diff --git a/versions/z-/zycore.json b/versions/z-/zycore.json new file mode 100644 index 00000000000000..a1b929602ed7ca --- /dev/null +++ b/versions/z-/zycore.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fde401adae59d8a172f55fda3899f258668e1c1b", + "version": "1.3.0", + "port-version": 0 + } + ] +} From 203d09b5209024cabf907b3a1160094398475149 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Sat, 15 Oct 2022 01:11:44 +0200 Subject: [PATCH 781/791] [cgal] update to 5.5.1 (#27202) * [cgal] update to 5.5.1 * vcpkg x-add-version --all * Remove port-version * vcpkg x-add-version --all --- ports/cgal/portfile.cmake | 4 ++-- ports/cgal/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/cgal.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index b210c6f6692a7d..657342378e1331 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.5 - SHA512 d689b0d4e04ff0a4297939dc0d4c001de88e811583b73fe6173f46b38d51f31f336a09a66c47cf79a1511942a4f5cf4df5d57871deec926bec71183c63b3d2f1 + REF v5.5.1 + SHA512 5d247608ca19b46cddf9971a45829848904d1645dec9edf5059b15ae3be34c5b063e4e8be2e7018f7d754e7d1b16116d51ca8bc5c609a0a813df07a16118b5ce HEAD_REF master ) diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index c1bf8fca9ac6f0..ac675c8c2d0508 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cgal", - "version": "5.5", - "port-version": 1, + "version": "5.5.1", "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", "license": "GPL-3.0-or-later AND LGPL-3.0-or-later AND BSL-1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 1b51884b81c0b9..412f193d8b996c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1357,8 +1357,8 @@ "port-version": 2 }, "cgal": { - "baseline": "5.5", - "port-version": 1 + "baseline": "5.5.1", + "port-version": 0 }, "cgicc": { "baseline": "3.2.19", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index 1a3e4c311b158d..4b9aa43738639c 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c86a34d296e485658d16306521425545f3e625ab", + "version": "5.5.1", + "port-version": 0 + }, { "git-tree": "2ef909832bf3d0f379a471e143e8eb5c9aa938cd", "version": "5.5", From cd4fcc1a22ff50ef9b1d013760d1e0de03fc4ebd Mon Sep 17 00:00:00 2001 From: Christoph Neuhauser Date: Sat, 15 Oct 2022 01:14:12 +0200 Subject: [PATCH 782/791] [python3] Fix compilation of built-in modules on older versions of GCC (#27201) --- ports/python3/0012-gcc-ldflags-fix.patch | 42 ++++++++++++++++++++++++ ports/python3/portfile.cmake | 4 +++ ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++ 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 ports/python3/0012-gcc-ldflags-fix.patch diff --git a/ports/python3/0012-gcc-ldflags-fix.patch b/ports/python3/0012-gcc-ldflags-fix.patch new file mode 100644 index 00000000000000..a0063f8db9814c --- /dev/null +++ b/ports/python3/0012-gcc-ldflags-fix.patch @@ -0,0 +1,42 @@ +diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py +index d00c48981e..b14ce8454e 100644 +--- a/Lib/distutils/unixccompiler.py ++++ b/Lib/distutils/unixccompiler.py +@@ -13,7 +13,7 @@ + * link shared library handled by 'cc -shared' + """ + +-import os, sys, re ++import os, sys, re, shutil + + from distutils import sysconfig + from distutils.dep_util import newer +@@ -216,7 +216,27 @@ def library_dir_option(self, dir): + + def _is_gcc(self, compiler_name): + # clang uses same syntax for rpath as gcc +- return any(name in compiler_name for name in ("gcc", "g++", "clang")) ++ valid_compiler_names = ("gcc", "g++", "clang") ++ is_gcc = any(name in compiler_name for name in valid_compiler_names) ++ # On Linux systems, the compiler name may be, e.g., "cc -pthread". ++ # The executable "cc" is in this case a symlink to the true compiler. ++ if not is_gcc and "cc" in compiler_name: ++ # We need to make sure that this is not another compiler with "cc" ++ # at the end of its name, like "icc". For this, it is checked ++ # whether "cc" is the first word, or separated by a space or path ++ # delimiter before the "cc" substring. ++ cc_string_location = compiler_name.find("cc") ++ if cc_string_location == 0 \ ++ or compiler_name[cc_string_location - 1] == ' ' \ ++ or compiler_name[cc_string_location - 1] == '/' \ ++ or compiler_name[cc_string_location - 1] == '\\': ++ cc_path = shutil.which("cc") ++ if cc_path is not None: ++ real_compiler_path = os.path.realpath(cc_path) ++ is_gcc = any( ++ name in real_compiler_path \ ++ for name in valid_compiler_names) ++ return is_gcc + + def runtime_library_dir_option(self, dir): + # XXX Hackish, at the very least. See Python bug #445902: diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 9cd25a3d3b82d0..01e7cb2d359501 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -20,6 +20,10 @@ set(PATCHES if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) endif() +# Fix build failures with GCC for built-in modules (https://github.com/microsoft/vcpkg/issues/26573) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + list(APPEND PATCHES 0012-gcc-ldflags-fix.patch) +endif() # Python 3.9 removed support for Windows 7. This patch re-adds support for Windows 7 and is therefore # required to build this port on Windows 7 itself due to Python using itself in its own build system. diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index ebf49078d14dfa..f7eb0dd186eee7 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version": "3.10.5", - "port-version": 3, + "port-version": 4, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "license": "Python-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 412f193d8b996c..a6c68b0382a8ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5942,7 +5942,7 @@ }, "python3": { "baseline": "3.10.5", - "port-version": 3 + "port-version": 4 }, "qca": { "baseline": "2.3.4", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 9801d6d676428e..15be433f1c37b9 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6bf44809eee3bfbce1b176e55d41beb54cac6f2", + "version": "3.10.5", + "port-version": 4 + }, { "git-tree": "03352a9860cce420c7bc069e1f62f5b1a19226ef", "version": "3.10.5", From 5aabf6dd696821212b2f3c2c717a1f8130193e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Sat, 15 Oct 2022 01:14:38 +0200 Subject: [PATCH 783/791] [im3d] New port (#27198) * [im3d] New port * [im3d] Update version files * [im3d] Add license field * [im3d] Add missing version file * [im3d] CMakeLists.txt fixes * [im3d] Update version files --- ports/im3d/CMakeLists.txt | 44 +++++++++++++++++++++++++++++++++++++++ ports/im3d/portfile.cmake | 24 +++++++++++++++++++++ ports/im3d/vcpkg.json | 17 +++++++++++++++ versions/baseline.json | 4 ++++ versions/i-/im3d.json | 9 ++++++++ 5 files changed, 98 insertions(+) create mode 100644 ports/im3d/CMakeLists.txt create mode 100644 ports/im3d/portfile.cmake create mode 100644 ports/im3d/vcpkg.json create mode 100644 versions/i-/im3d.json diff --git a/ports/im3d/CMakeLists.txt b/ports/im3d/CMakeLists.txt new file mode 100644 index 00000000000000..5b96e6f4c1d397 --- /dev/null +++ b/ports/im3d/CMakeLists.txt @@ -0,0 +1,44 @@ +cmake_minimum_required(VERSION 3.8) +project(im3d) + +set(CMAKE_CXX_STANDARD 11) + +add_library(${PROJECT_NAME} "") + +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + im3d.cpp +) + +install( + TARGETS ${PROJECT_NAME} + EXPORT unofficial-${PROJECT_NAME}-target + ARCHIVE DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) + +if (NOT IM3D_SKIP_HEADERS) + install( + FILES + im3d.h + im3d_config.h + im3d_math.h + DESTINATION include + ) +endif() + +install( + EXPORT unofficial-${PROJECT_NAME}-target + NAMESPACE unofficial::${PROJECT_NAME}:: + FILE unofficial-${PROJECT_NAME}-config.cmake + DESTINATION share/unofficial-${PROJECT_NAME} +) diff --git a/ports/im3d/portfile.cmake b/ports/im3d/portfile.cmake new file mode 100644 index 00000000000000..0b75a867a1d5d7 --- /dev/null +++ b/ports/im3d/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO john-chapman/im3d + REF 651220df4d595ff3d7ac5c1a64b3355774e86bc8 + SHA512 0a117bddcf2de51870367a0d6d2753d9b691466427c5942be448d9930fac41fd8502788d76162831686f50f880a6b0a7fad541a380598c830ff8f44670f29381 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DIM3D_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/im3d/vcpkg.json b/ports/im3d/vcpkg.json new file mode 100644 index 00000000000000..9571462971122d --- /dev/null +++ b/ports/im3d/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "im3d", + "version-date": "2022-10-11", + "description": "Immediate mode rendering and 3d gizmos", + "homepage": "https://github.com/john-chapman/im3d", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a6c68b0382a8ee..df081e79f58f63 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3056,6 +3056,10 @@ "baseline": "3", "port-version": 0 }, + "im3d": { + "baseline": "2022-10-11", + "port-version": 0 + }, "imath": { "baseline": "3.1.5", "port-version": 0 diff --git a/versions/i-/im3d.json b/versions/i-/im3d.json new file mode 100644 index 00000000000000..414aa9e1e09e1e --- /dev/null +++ b/versions/i-/im3d.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "98557d4600a307373f8424d7d770bf4d64b04d10", + "version-date": "2022-10-11", + "port-version": 0 + } + ] +} From ebcbbcf86292cf1fa8eac86058a98e82035b29b2 Mon Sep 17 00:00:00 2001 From: Henrik Date: Sat, 15 Oct 2022 01:15:32 +0200 Subject: [PATCH 784/791] [vulkan-memory-allocator-hpp] New port (#27189) * Added port for VulkanMemoryAllocator-Hpp * Fixed maifest format and ran x-add-version * Changed SHA --- ports/vulkan-memory-allocator-hpp/portfile.cmake | 12 ++++++++++++ ...official-vulkan-memory-allocator-hpp-config.cmake | 7 +++++++ ports/vulkan-memory-allocator-hpp/vcpkg.json | 10 ++++++++++ versions/baseline.json | 4 ++++ versions/v-/vulkan-memory-allocator-hpp.json | 9 +++++++++ 5 files changed, 42 insertions(+) create mode 100644 ports/vulkan-memory-allocator-hpp/portfile.cmake create mode 100644 ports/vulkan-memory-allocator-hpp/unofficial-vulkan-memory-allocator-hpp-config.cmake create mode 100644 ports/vulkan-memory-allocator-hpp/vcpkg.json create mode 100644 versions/v-/vulkan-memory-allocator-hpp.json diff --git a/ports/vulkan-memory-allocator-hpp/portfile.cmake b/ports/vulkan-memory-allocator-hpp/portfile.cmake new file mode 100644 index 00000000000000..388e9af5652837 --- /dev/null +++ b/ports/vulkan-memory-allocator-hpp/portfile.cmake @@ -0,0 +1,12 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO YaaZ/VulkanMemoryAllocator-Hpp + REF v3.0.1 + SHA512 0631319ec892161acb85903ddeecf0b18ff6772fdb44b46c756f6c148d150ea0850f7a35f105a04e9b23baf6ea5aa9bb373e04c7be598f1caa23c22cacf4ee00 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-hpp-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}") + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/vulkan-memory-allocator-hpp/unofficial-vulkan-memory-allocator-hpp-config.cmake b/ports/vulkan-memory-allocator-hpp/unofficial-vulkan-memory-allocator-hpp-config.cmake new file mode 100644 index 00000000000000..d4c0207f5ff4e8 --- /dev/null +++ b/ports/vulkan-memory-allocator-hpp/unofficial-vulkan-memory-allocator-hpp-config.cmake @@ -0,0 +1,7 @@ +add_library(unofficial::VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp INTERFACE IMPORTED) + +set_target_properties( + unofficial::VulkanMemoryAllocator-Hpp::VulkanMemoryAllocator-Hpp + PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_LIST_DIR}/../../include" +) diff --git a/ports/vulkan-memory-allocator-hpp/vcpkg.json b/ports/vulkan-memory-allocator-hpp/vcpkg.json new file mode 100644 index 00000000000000..00b8ac1067566d --- /dev/null +++ b/ports/vulkan-memory-allocator-hpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "vulkan-memory-allocator-hpp", + "version": "3.0.1", + "description": "C++ bindings for VulkanMemoryAllocator", + "homepage": "https://github.com/YaaZ/VulkanMemoryAllocator-Hpp", + "license": "CC0-1.0", + "dependencies": [ + "vulkan" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index df081e79f58f63..d46d7fd933c623 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7800,6 +7800,10 @@ "baseline": "3.0.0", "port-version": 0 }, + "vulkan-memory-allocator-hpp": { + "baseline": "3.0.1", + "port-version": 0 + }, "vxl": { "baseline": "2.0.2", "port-version": 4 diff --git a/versions/v-/vulkan-memory-allocator-hpp.json b/versions/v-/vulkan-memory-allocator-hpp.json new file mode 100644 index 00000000000000..76a330bc905dfb --- /dev/null +++ b/versions/v-/vulkan-memory-allocator-hpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2f76c60d16fb75bdbf3bfa08039557bfbe0ff84a", + "version": "3.0.1", + "port-version": 0 + } + ] +} From 694ca7cbe59ed0808d20160fbe2b1696e50623eb Mon Sep 17 00:00:00 2001 From: xiaoyifang <105986+xiaoyifang@users.noreply.github.com> Date: Sat, 15 Oct 2022 07:15:59 +0800 Subject: [PATCH 785/791] [xapian] add new port (#27038) * port:add xapian port * add xapian version * update version * change cmake file * update version * add vcpkg-cmake-config * update version * modify cmake * update version * vcpkg_cmake_config_fixup path * update version * cmake fix * update version * add not supports platform * update version * Update ports/xapian/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/xapian/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/xapian/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/xapian/portfile.cmake Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * update version * Update xapian.json * windows platform should only build release , the debug library is not work * Update ports/xapian/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * Update ports/xapian/vcpkg.json Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> * build release version only * update version * Add quotes to paths * Update versions/x-/xapian.json Co-authored-by: xiaoyifang Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: xiaoyifang Co-authored-by: Victor Romero --- ports/xapian/portfile.cmake | 38 +++++++++++++++++++++++++++++++++++++ ports/xapian/vcpkg.json | 15 +++++++++++++++ versions/baseline.json | 4 ++++ versions/x-/xapian.json | 9 +++++++++ 4 files changed, 66 insertions(+) create mode 100644 ports/xapian/portfile.cmake create mode 100644 ports/xapian/vcpkg.json create mode 100644 versions/x-/xapian.json diff --git a/ports/xapian/portfile.cmake b/ports/xapian/portfile.cmake new file mode 100644 index 00000000000000..2566256fb1876d --- /dev/null +++ b/ports/xapian/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_download_distfile(ARCHIVE + URLS https://oligarchy.co.uk/xapian/1.4.21/xapian-core-1.4.21.tar.xz + FILENAME xapian-core-1.4.21.tar.xz + SHA512 4071791daf47f5ae77f32f358c6020fcfa9aa81c15c8da25489b055eef30383695e449ab1cb73670f2f5db2b2a5f78056da0e8eea89d83aaad91dfe340a6b13a +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + +) + +if(WIN32) + vcpkg_replace_string("${SOURCE_PATH}/configure.ac" "z zlib zdll" "z zlib zdll zlibd") + + # xapian does not support debug lib on Windows + # if use `set(VCPKG_BUILD_TYPE release)` ，the vcpkg post check can not passed， + # it will throw exception "Mismatching number of debug and release binaries. Found 0 for debug but 1 for release." + # that means the `set(VCPKG_BUILD_TYPE release)` can not be used in the WIN32 environment. + if(VCPKG_BUILD_TYPE STREQUAL "release") + set(OPTIONS "CXXFLAGS=-EHsc") + endif() +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + USE_WRAPPERS + OPTIONS ${OPTIONS} +) + +vcpkg_install_make() + +vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/xapian) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/xapian/vcpkg.json b/ports/xapian/vcpkg.json new file mode 100644 index 00000000000000..31b7704076f0bc --- /dev/null +++ b/ports/xapian/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "xapian", + "version": "1.4.21", + "description": "Xapian is an Open Source Search Engine Library, released under the GPL v2+. It's written in C++, with bindings to allow use from Perl, Python 2, Python 3, PHP 5, PHP 7, Java, Tcl, C#, Ruby, Lua, Erlang, Node.js and R (so far!)", + "homepage": "https://github.com/xapian/xapian", + "license": "GPL-2.0-or-later", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d46d7fd933c623..7cb0382d6525b6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7956,6 +7956,10 @@ "baseline": "1.12", "port-version": 1 }, + "xapian": { + "baseline": "1.4.21", + "port-version": 0 + }, "xaudio2redist": { "baseline": "1.2.9", "port-version": 0 diff --git a/versions/x-/xapian.json b/versions/x-/xapian.json new file mode 100644 index 00000000000000..fd46a42f1158cd --- /dev/null +++ b/versions/x-/xapian.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e5f0103eea3c5622af1b593bfca64e9045c55cb5", + "version": "1.4.21", + "port-version": 0 + } + ] +} From aed63d2200620f811e3baa54f6b835db48f493f5 Mon Sep 17 00:00:00 2001 From: jpr42 <109434725+jpr42@users.noreply.github.com> Date: Fri, 14 Oct 2022 17:28:05 -0600 Subject: [PATCH 786/791] Vcpkg via FetchContent (#27158) Show how to easily incorporate vcpkg into a CMake project without git submodules --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index b29fe52d2f06a6..fcc255e6586cca 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. - [Vcpkg with Visual Studio CMake Projects](#vcpkg-with-visual-studio-cmake-projects) - [Vcpkg with CLion](#vcpkg-with-clion) - [Vcpkg as a Submodule](#vcpkg-as-a-submodule) + - [Vcpkg via FetchContent](#vcpkg-via-FetchContent) - [Tab-Completion/Auto-Completion](#tab-completionauto-completion) - [Examples](#examples) - [Contributing](#contributing) @@ -262,6 +263,28 @@ This will still allow people to not use vcpkg, by passing the `CMAKE_TOOLCHAIN_FILE` directly, but it will make the configure-build step slightly easier. +### Vcpkg via FetchContent + +You can also grab vcpkg with CMake's built-in [FetchContent](https://cmake.org/cmake/help/v3.24/module/FetchContent.html) module. + +Don't worry about the bootstrap scripts, since `vcpkg.cmake` will run them for you! + +``` +cmake_minimum_required(VERSION 3.14) + +include(FetchContent) +FetchContent_Declare(vcpkg + GIT_REPOSITORY https://github.com/microsoft/vcpkg/ + GIT_TAG 2022.09.27 +) +FetchContent_MakeAvailable(vcpkg) + +# NOTE: This must be defined before the first project call +set(CMAKE_TOOLCHAIN_FILE "${vcpkg_SOURCE_DIR}/scripts/buildsystems/vcpkg.cmake" CACHE FILEPATH "") + +project(FOOBAR LANGUAGES "CXX") +``` + [getting-started:using-a-package]: docs/examples/installing-and-using-packages.md [getting-started:integration]: docs/users/buildsystems/integration.md [getting-started:git]: https://git-scm.com/downloads From a1109c9e554c10ce967a4ff950c5166861334ef7 Mon Sep 17 00:00:00 2001 From: Akash Date: Fri, 14 Oct 2022 16:28:29 -0700 Subject: [PATCH 787/791] [ITK] Fix ITK linker error on usage (#27187) * Don't build gtest * Update versions --- ports/itk/dont-build-gtest.patch | 12 ++++++++++++ ports/itk/portfile.cmake | 1 + ports/itk/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/i-/itk.json | 5 +++++ 5 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 ports/itk/dont-build-gtest.patch diff --git a/ports/itk/dont-build-gtest.patch b/ports/itk/dont-build-gtest.patch new file mode 100644 index 00000000000000..ecea7674d26a01 --- /dev/null +++ b/ports/itk/dont-build-gtest.patch @@ -0,0 +1,12 @@ +diff --git a/Modules/ThirdParty/GoogleTest/itk-module.cmake b/Modules/ThirdParty/GoogleTest/itk-module.cmake +index 5571748129..19ebb60885 100644 +--- a/Modules/ThirdParty/GoogleTest/itk-module.cmake ++++ b/Modules/ThirdParty/GoogleTest/itk-module.cmake +@@ -3,6 +3,7 @@ Google's C++ test framework.") + + itk_module(ITKGoogleTest + DEPENDS ++ EXCLUDE_FROM_DEFAULT + DESCRIPTION + "${DOCUMENTATION}" + ) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index b36ce928a2b4e2..65057293f1c2a6 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( wrapping.patch opencl.patch use-the-lrintf-intrinsic.patch + dont-build-gtest.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index a86e3e10fdf5ee..569432d614a92a 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", "version": "5.2.1", - "port-version": 1, + "port-version": 2, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "license": "Apache-2.0", @@ -14,7 +14,6 @@ "default-features": false }, "gdcm", - "gtest", { "name": "hdf5", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index 7cb0382d6525b6..6a13c47102523f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3142,7 +3142,7 @@ }, "itk": { "baseline": "5.2.1", - "port-version": 1 + "port-version": 2 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index 7b63c922b0c430..76bb7db49082f4 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e22b353e8f00bcdc12b78d414a712a3498a2d0d6", + "version": "5.2.1", + "port-version": 2 + }, { "git-tree": "21beac1c375ce633f869566345d7418849633c3e", "version": "5.2.1", From 8f229feaf1279b37e6499b78718431280c52e4e1 Mon Sep 17 00:00:00 2001 From: Silent Date: Sat, 15 Oct 2022 01:31:24 +0200 Subject: [PATCH 788/791] [wil] Update to v1.0.220914.1 (#27185) * [wil] Update to v1.0.220914.1 * Add version --- ports/wil/portfile.cmake | 10 +++++++--- ports/wil/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/w-/wil.json | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index d03741ced3b537..7254dc858d2540 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/wil - REF f9284c19c9873664978b873b8858d7dfacc6af1e - SHA512 df81e7f12f15f8e382f537f783c33c9833bb83c4d86d571bd47503e7400698686f51a8a50efd2224c95a5409ab8ef719186d806afbfc4ea2af8d4fd7f8dce024 + REF 5f4caba4e7a9017816e47becdd918fcc872039ba + SHA512 46b0ceb0d2681c76ead9e6626557facf82622b6c22376d26225016d116f6d5b1528401635022f79c2dde97177264442be849ab7c0cbac4a43c0d46e0e3e9e6e5 HEAD_REF master ) @@ -20,4 +20,8 @@ vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/WIL) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +# Install natvis files +file(INSTALL "${SOURCE_PATH}/natvis/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/natvis") + +# Install copyright +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") \ No newline at end of file diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json index 9914ec02d6580e..e632f305e2022e 100644 --- a/ports/wil/vcpkg.json +++ b/ports/wil/vcpkg.json @@ -1,8 +1,9 @@ { "name": "wil", - "version-date": "2021-12-25", + "version-date": "2022-09-23", "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", "homepage": "https://github.com/microsoft/wil", + "license": "MIT", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 6a13c47102523f..4c7011bb65e07f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7849,7 +7849,7 @@ "port-version": 1 }, "wil": { - "baseline": "2021-12-25", + "baseline": "2022-09-23", "port-version": 0 }, "wildmidi": { diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 713da01061c08f..255e2c8b15c921 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1481b7907b914288a49773105eeeabaa9b4a6385", + "version-date": "2022-09-23", + "port-version": 0 + }, { "git-tree": "c918f3ae742f41c096f5758afd5af98fe7a194b5", "version-date": "2021-12-25", From 8f06ea42d93edb3e0134a2420101ffe1eeef1127 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 15 Oct 2022 01:32:33 +0200 Subject: [PATCH 789/791] Find Python interpreter to used for scripts/buildsystems/osx/applocal.py (#27179) The deployment script works with Python 2 and 3. On modern macOS machines Python 2 may not be available. Find either version and use it. Co-authored-by: Lily Wang <494550702@qq.com> --- scripts/buildsystems/vcpkg.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index db422b034920a8..cc6ed29d1b2bb7 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -603,8 +603,9 @@ function(add_executable) ) elseif(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "osx") if(NOT MACOSX_BUNDLE_IDX EQUAL -1) + find_package(Python COMPONENTS Interpreter) add_custom_command(TARGET "${target_name}" POST_BUILD - COMMAND python "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" + COMMAND "${Python_EXECUTABLE}" "${Z_VCPKG_TOOLCHAIN_DIR}/osx/applocal.py" "$" "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>" VERBATIM From a2261f65ea979eebf56074f604776160f0074b09 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sat, 15 Oct 2022 02:52:31 +0200 Subject: [PATCH 790/791] [opentelemetry-cpp] Update to 1.6.0 and fix abseil[cxx17] (#26857) * opentelemetry-cpp: Update to 1.6.0 and fix abseil[cxx17] * opentelemetry-cpp: Adjust versions json * opentelemetry-cpp: Re-add 1.5.0p1 version --- ports/opentelemetry-cpp/portfile.cmake | 18 +++++++++++------- .../opentelemetry-cpp/support_absl_cxx17.patch | 17 +++++++++++++++++ ports/opentelemetry-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/opentelemetry-cpp.json | 5 +++++ 5 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 ports/opentelemetry-cpp/support_absl_cxx17.patch diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 1f161405109706..2c2d7c40483851 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -5,9 +5,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.5.0 - SHA512 a506973223c49531d4b0c3febf5734dfe2e44c22f8854ed96935cda0783a14d0819cc3dbb2d3f8373f960f27acf78aafc777ee76aeb14828df9c4b4434e4fe6f + REF v1.6.0 + SHA512 ae0777451a3d2d676afd9f3142ab78c7afb08474f6038bd810ff0ee30fee6695e10100c901e7ffadf3faf16c7d19622acdea414cd720be8572f7720f2d528628 HEAD_REF main + PATCHES + support_absl_cxx17.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,16 +25,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. if(WITH_OTLP) - set(OTEL_PROTO_VERSION "0.17.0") + set(OTEL_PROTO_VERSION "0.18.0") vcpkg_download_distfile(ARCHIVE URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" - SHA512 b61d7fe7d6e1b5943d45ab9d17c22fe36c0f7a8312f668aea2b6685aa0f5c98aaa41e76659057310ec1f061d36ad9e66993be177039121f62f73858a6749d3d9 + SHA512 5176e93ddbb92d10b5900f42bb7b98cd718488fb261ad204e73127e1bf1feb6a20cf17d5c7d4fbdd89575cef6c7fa98127a28d83e50ffba61da01a73659ddae6 ) - vcpkg_extract_source_archive("${ARCHIVE}" "${SOURCE_PATH}/third_party") + vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}") file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto") - file(RENAME "${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION}" "${SOURCE_PATH}/third_party/opentelemetry-proto") + file(COPY "${src}/." DESTINATION "${SOURCE_PATH}/third_party/opentelemetry-proto") + # Create empty .git directory to prevent opentelemetry from cloning it during build time + file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git") endif() vcpkg_cmake_configure( @@ -46,7 +50,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opentelemetry-cpp) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/opentelemetry-cpp/support_absl_cxx17.patch b/ports/opentelemetry-cpp/support_absl_cxx17.patch new file mode 100644 index 00000000000000..44b841b118231a --- /dev/null +++ b/ports/opentelemetry-cpp/support_absl_cxx17.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1b69340..193c9e39 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -305,7 +305,11 @@ if(WITH_OTLP) + CACHE{WITH_OTLP_HTTP})) + find_package(CURL) + endif() +- ++ if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++ set(WITH_STL ON) ++ endif() + cmake_dependent_option( + WITH_OTLP_GRPC "Whether to include the OTLP gRPC exporter in the SDK" ON + "gRPC_FOUND" OFF) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index f34c950a124d54..caedbffb7f966f 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,8 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.5.0", - "port-version": 1, + "version-semver": "1.6.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." diff --git a/versions/baseline.json b/versions/baseline.json index 4c7011bb65e07f..04d0d6988b9ea5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5485,8 +5485,8 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.5.0", - "port-version": 1 + "baseline": "1.6.0", + "port-version": 0 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index d721e8038f983e..0901872edf5af1 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b85f6215a2936a5a21c752b11e16fc7250a102b2", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "49b229180a92d7c0148fd1c28a691a76c59aea51", "version-semver": "1.5.0", From 32b9ce2e3ac555859a255924be61b727444dd2ce Mon Sep 17 00:00:00 2001 From: Avery King Date: Fri, 14 Oct 2022 21:03:48 -0700 Subject: [PATCH 791/791] [wxWidgets] Remove overlay port. This is a port that intended to have fixes for building wxWidgets. The fixes came from vcpkg PR 18580 (https://github.com/microsoft/vcpkg/pull/17111). However, this PR was closed with all changes merged to PR (https://github.com/microsoft/vcpkg/pull/17111). Either way, vcpkg PR 18580 was closed, and the success that I found appears to be PR 17111. However, PR 17111 was closed in favor to PR 24047. This PR, unlike the others, has been merged. Therefore, it should be no longer necessary to maintain a separate wxWidgets port that carries these fixes. Signed-off-by: Avery King --- .../wxwidgets/disable-platform-lib-dir.patch | 13 - overlay/ports/wxwidgets/export-targets.patch | 223 ------------------ overlay/ports/wxwidgets/fix-build.patch | 13 - .../ports/wxwidgets/fix-file-generate.patch | 13 - .../ports/wxwidgets/fix-install-path.patch | 13 - .../ports/wxwidgets/fix-wx-config-path.patch | 38 --- .../wxwidgets/fix-wxconfig-libs-output.patch | 46 ---- overlay/ports/wxwidgets/portfile.cmake | 117 --------- overlay/ports/wxwidgets/setup.h.in | 5 - overlay/ports/wxwidgets/usage | 6 - .../ports/wxwidgets/vcpkg-cmake-wrapper.cmake | 25 -- .../wxwidgets/vcpkg-cmake-wrapper.cmake.in | 22 -- overlay/ports/wxwidgets/vcpkg.json | 17 -- 13 files changed, 551 deletions(-) delete mode 100644 overlay/ports/wxwidgets/disable-platform-lib-dir.patch delete mode 100644 overlay/ports/wxwidgets/export-targets.patch delete mode 100644 overlay/ports/wxwidgets/fix-build.patch delete mode 100644 overlay/ports/wxwidgets/fix-file-generate.patch delete mode 100644 overlay/ports/wxwidgets/fix-install-path.patch delete mode 100644 overlay/ports/wxwidgets/fix-wx-config-path.patch delete mode 100644 overlay/ports/wxwidgets/fix-wxconfig-libs-output.patch delete mode 100644 overlay/ports/wxwidgets/portfile.cmake delete mode 100644 overlay/ports/wxwidgets/setup.h.in delete mode 100644 overlay/ports/wxwidgets/usage delete mode 100644 overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake delete mode 100644 overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake.in delete mode 100644 overlay/ports/wxwidgets/vcpkg.json diff --git a/overlay/ports/wxwidgets/disable-platform-lib-dir.patch b/overlay/ports/wxwidgets/disable-platform-lib-dir.patch deleted file mode 100644 index 930477c010327d..00000000000000 --- a/overlay/ports/wxwidgets/disable-platform-lib-dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake -index d013e92..c03135d 100644 ---- a/build/cmake/init.cmake -+++ b/build/cmake/init.cmake -@@ -149,7 +149,7 @@ else() - set(wxCOMPILER_PREFIX) - endif() - --if(MSVC) -+if(MSVC AND NOT wxBUILD_DISABLE_PLATFORM_LIB_DIR) - if(wxBUILD_SHARED) - set(lib_suffix "dll") - else() diff --git a/overlay/ports/wxwidgets/export-targets.patch b/overlay/ports/wxwidgets/export-targets.patch deleted file mode 100644 index e305028d0bc51f..00000000000000 --- a/overlay/ports/wxwidgets/export-targets.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4063020..6dfe09c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -78,3 +78,51 @@ include(build/cmake/main.cmake) - if(wxBUILD_SAMPLES AND wxUSE_GUI) - set_directory_properties(PROPERTIES VS_STARTUP_PROJECT minimal) - endif() -+ -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-wxwidgets-config.cmake.in" -+[[include(CMakeFindDependencyMacro) -+if (@wxUSE_ZLIB@ STREQUAL "sys") -+ find_dependency(ZLIB) -+endif() -+if (@wxUSE_EXPAT@ STREQUAL "sys") -+ find_dependency(EXPAT) -+endif() -+if (@wxUSE_LIBJPEG@ STREQUAL "sys") -+ find_dependency(JPEG) -+endif() -+if (@wxUSE_LIBPNG@ STREQUAL "sys") -+ find_dependency(PNG) -+endif() -+if (@wxUSE_LIBTIFF@ STREQUAL "sys") -+ find_dependency(TIFF) -+endif() -+ -+list(APPEND TARGET_FILES wxregex wxscintilla wxbase wxcore) -+if (@wxUSE_OPENGL@) -+ list(APPEND TARGET_FILES wxgl) -+endif() -+if (@wxUSE_XML@) -+ list(APPEND TARGET_FILES wxxml) -+endif() -+list(APPEND TARGET_FILES wxhtml wxxrc wxstc wxwebview) -+if (@wxUSE_SOCKETS@) -+ list(APPEND TARGET_FILES wxnet) -+endif() -+list(APPEND TARGET_FILES wxpropgrid) -+if (@wxUSE_DEBUGREPORT@) -+ list(APPEND TARGET_FILES wxqa) -+endif() -+list(APPEND TARGET_FILES wxribbon wxrichtext) -+if (@wxUSE_MEDIACTRL@) -+ list(APPEND TARGET_FILES wxmedia) -+endif() -+list(APPEND TARGET_FILES wxadv wxaui) -+ -+foreach (TARGET_FILE ${TARGET_FILES}) -+ include("${CMAKE_CURRENT_LIST_DIR}/unofficial-${TARGET_FILE}Targets.cmake") -+endforeach() -+ -+set(wxWidgets_CONFIG_EXECUTABLE "${CMAKE_CURRENT_LIST_DIR}/../../tools/wxwidgets/wx-config") -+]]) -+configure_file(${CMAKE_CURRENT_BINARY_DIR}/unofficial-wxwidgets-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/unofficial-wxwidgets-config.cmake @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-wxwidgets-config.cmake DESTINATION share/unofficial-wxwidgets) -\ No newline at end of file -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index e99555e..468426e 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -257,13 +257,20 @@ function(wx_set_target_properties target_name is_base) - target_include_directories(${target_name} - BEFORE - PUBLIC -- ${wxSETUP_HEADER_PATH} -- ${wxSOURCE_DIR}/include -+ "$" -+ "$" -+ $ - ) - -+ if (NOT MSVC) -+ target_include_directories(${target_name} -+ PUBLIC $ -+ ) -+ endif() -+ - if(wxTOOLKIT_INCLUDE_DIRS) - target_include_directories(${target_name} -- PUBLIC ${wxTOOLKIT_INCLUDE_DIRS}) -+ PUBLIC "$") - endif() - - if (WIN32) -@@ -371,12 +378,14 @@ macro(wx_add_library name) - set_target_properties(${name} PROPERTIES PROJECT_LABEL ${name_short}) - - # Setup install -- wx_install(TARGETS ${name} -+ wx_install(TARGETS ${name} EXPORT unofficial-${name}Targets - LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}" - ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}" - RUNTIME DESTINATION "bin${wxPLATFORM_LIB_DIR}" - BUNDLE DESTINATION Applications/wxWidgets - ) -+ -+ install(EXPORT unofficial-${name}Targets NAMESPACE wx:: DESTINATION share/unofficial-wxwidgets) - endif() - endmacro() - -@@ -453,7 +462,18 @@ macro(wx_lib_include_directories name) - if (_LIB_INCLUDE_DIRS_PRIVATE) - set(INCLUDE_POS BEFORE) - endif() -- target_include_directories(${name};${INCLUDE_POS};${ARGN}) -+ if (_LIB_INCLUDE_DIRS_PUBLIC) -+ foreach (PUBLIC_DIR ${_LIB_INCLUDE_DIRS_PUBLIC}) -+ target_include_directories(${name};${INCLUDE_POS};PUBLIC;$) -+ endforeach() -+ endif() -+ if (_LIB_INCLUDE_DIRS_PRIVATE) -+ target_include_directories(${name};${INCLUDE_POS};PRIVATE;${_LIB_INCLUDE_DIRS_PRIVATE}) -+ endif() -+ target_include_directories(${name};PUBLIC;$) -+ if (NOT MSVC) -+ target_include_directories(${name};PUBLIC;$) -+ endif() - endif() - endmacro() - -@@ -514,8 +534,14 @@ function(wx_set_builtin_target_properties target_name) - target_include_directories(${target_name} - BEFORE - PUBLIC -- ${wxSETUP_HEADER_PATH} -+ "$" -+ $ - ) -+ if (NOT MSVC) -+ target_include_directories(${target_name} -+ PUBLIC $ -+ ) -+ endif() - - set_target_properties(${target_name} PROPERTIES FOLDER "Third Party Libraries") - -@@ -789,10 +815,10 @@ function(wx_add name group) - endif() - - if(group STREQUAL Samples) -- target_include_directories(${target_name} PRIVATE ${wxSOURCE_DIR}/samples) -+ target_include_directories(${target_name} PRIVATE "$") - elseif(group STREQUAL Tests) -- target_include_directories(${target_name} PRIVATE ${wxSOURCE_DIR}/tests) -- target_include_directories(${target_name} PRIVATE ${wxSOURCE_DIR}/3rdparty/catch/include) -+ target_include_directories(${target_name} PRIVATE "$") -+ target_include_directories(${target_name} PRIVATE "$") - endif() - - if(APP_DATA) -diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt -index 5c574c7..5497605 100644 ---- a/build/cmake/lib/CMakeLists.txt -+++ b/build/cmake/lib/CMakeLists.txt -@@ -86,11 +86,11 @@ if(wxBUILD_MONOLITHIC) - target_link_libraries(wxmono ${vis} ${wxMONO_LIBS_${vis}}) - endif() - if(wxMONO_INCLUDE_DIRS_${vis}) -- set(INCLUDE_POS) - if (vis STREQUAL PRIVATE) -- set(INCLUDE_POS BEFORE) -+ target_include_directories(wxmono BEFORE ${vis} ${wxMONO_INCLUDE_DIRS_${vis}}) -+ else() -+ target_include_directories(wxmono ${vis} "$") - endif() -- target_include_directories(wxmono ${INCLUDE_POS} ${vis} ${wxMONO_INCLUDE_DIRS_${vis}}) - endif() - if(wxMONO_DEFINITIONS_${vis}) - target_compile_definitions(wxmono ${vis} ${wxMONO_DEFINITIONS_${vis}}) -diff --git a/build/cmake/lib/regex.cmake b/build/cmake/lib/regex.cmake -index b28fc2c..a78c2da 100644 ---- a/build/cmake/lib/regex.cmake -+++ b/build/cmake/lib/regex.cmake -@@ -18,4 +18,13 @@ if(wxUSE_REGEX) - target_include_directories(wxregex PRIVATE ${wxSETUP_HEADER_PATH} ${wxSOURCE_DIR}/include) - set(REGEX_LIBRARIES wxregex) - set(REGEX_INCLUDE_DIRS ${wxSOURCE_DIR}/src/regex) -+ -+ install(TARGETS wxregex EXPORT unofficial-wxregexTargets -+ LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}" -+ ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}" -+ RUNTIME DESTINATION "bin${wxPLATFORM_LIB_DIR}" -+ BUNDLE DESTINATION Applications/wxWidgets -+ ) -+ -+ install(EXPORT unofficial-wxregexTargets NAMESPACE wx:: DESTINATION share/unofficial-wxwidgets) - endif() -diff --git a/build/cmake/lib/stc/CMakeLists.txt b/build/cmake/lib/stc/CMakeLists.txt -index bd6acd8..c8c5ff5 100644 ---- a/build/cmake/lib/stc/CMakeLists.txt -+++ b/build/cmake/lib/stc/CMakeLists.txt -@@ -182,6 +182,15 @@ if(wxBUILD_PRECOMP) - wx_target_enable_precomp(wxscintilla ${wxSCINTILLA_PREC_HEADER}) - endif() - -+install(TARGETS wxscintilla EXPORT unofficial-wxscintillaTargets -+ LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}" -+ ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}" -+ RUNTIME DESTINATION "bin${wxPLATFORM_LIB_DIR}" -+ BUNDLE DESTINATION Applications/wxWidgets -+ ) -+ -+install(EXPORT unofficial-wxscintillaTargets NAMESPACE wx:: DESTINATION share/unofficial-wxwidgets) -+ - wx_add_library(wxstc ${STC_FILES}) - wx_lib_include_directories(wxstc PRIVATE - ${wxSOURCE_DIR}/src/stc/scintilla/include -diff --git a/build/cmake/lib/webview/CMakeLists.txt b/build/cmake/lib/webview/CMakeLists.txt -index cc3298f..1d47e56 100644 ---- a/build/cmake/lib/webview/CMakeLists.txt -+++ b/build/cmake/lib/webview/CMakeLists.txt -@@ -132,8 +132,8 @@ if(WXGTK AND wxUSE_WEBVIEW_WEBKIT2) - ) - - target_include_directories(wxwebkit2_ext PUBLIC -- ${LIBSOUP_INCLUDE_DIRS} -- ${WEBKIT2_INCLUDE_DIR} -+ "$" -+ "$" - ) - target_link_libraries(wxwebkit2_ext PUBLIC - ${LIBSOUP_LIBRARIES} diff --git a/overlay/ports/wxwidgets/fix-build.patch b/overlay/ports/wxwidgets/fix-build.patch deleted file mode 100644 index e47bc97e601572..00000000000000 --- a/overlay/ports/wxwidgets/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 06116384c7..f82ff941bb 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -383,7 +383,7 @@ endmacro() - # Enable cotire for target, use optional second argument for prec. header - macro(wx_target_enable_precomp target_name) - target_compile_definitions(${target_name} PRIVATE WX_PRECOMP) -- if(NOT ${ARGV1} STREQUAL "") -+ if(${ARGC} GREATER 1 AND NOT ${ARGV1} STREQUAL "") - set_target_properties(${target_name} PROPERTIES - COTIRE_CXX_PREFIX_HEADER_INIT ${ARGV1}) - endif() diff --git a/overlay/ports/wxwidgets/fix-file-generate.patch b/overlay/ports/wxwidgets/fix-file-generate.patch deleted file mode 100644 index b98692b0ac74b3..00000000000000 --- a/overlay/ports/wxwidgets/fix-file-generate.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake -index bb69643..99b0cb6 100644 ---- a/build/cmake/modules/cotire.cmake -+++ b/build/cmake/modules/cotire.cmake -@@ -2371,7 +2371,7 @@ function (cotire_generate_target_script _language _configurations _target _targe - # use file(GENERATE ...) to expand generator expressions in the target script at CMake generate-time - set (_configNameOrNoneGeneratorExpression "$<$:None>$<$>:$>") - set (_targetCotireConfigScript "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${_language}_${_configNameOrNoneGeneratorExpression}_${_moduleName}") -- file (GENERATE OUTPUT "${_targetCotireConfigScript}" INPUT "${_targetCotireScript}") -+ file (GENERATE OUTPUT "${_targetCotireConfigScript}" INPUT "${_targetCotireScript}" TARGET "${_target}") - else() - set (_targetCotireConfigScript "${_targetCotireScript}") - endif() diff --git a/overlay/ports/wxwidgets/fix-install-path.patch b/overlay/ports/wxwidgets/fix-install-path.patch deleted file mode 100644 index f24290111df88f..00000000000000 --- a/overlay/ports/wxwidgets/fix-install-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake -index 902b7c5..e99555e 100644 ---- a/build/cmake/functions.cmake -+++ b/build/cmake/functions.cmake -@@ -374,7 +374,7 @@ macro(wx_add_library name) - wx_install(TARGETS ${name} - LIBRARY DESTINATION "lib${wxPLATFORM_LIB_DIR}" - ARCHIVE DESTINATION "lib${wxPLATFORM_LIB_DIR}" -- RUNTIME DESTINATION "lib${wxPLATFORM_LIB_DIR}" -+ RUNTIME DESTINATION "bin${wxPLATFORM_LIB_DIR}" - BUNDLE DESTINATION Applications/wxWidgets - ) - endif() diff --git a/overlay/ports/wxwidgets/fix-wx-config-path.patch b/overlay/ports/wxwidgets/fix-wx-config-path.patch deleted file mode 100644 index e4ce406b94d5d7..00000000000000 --- a/overlay/ports/wxwidgets/fix-wx-config-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake -index 968dff8..4699f63 100644 ---- a/build/cmake/install.cmake -+++ b/build/cmake/install.cmake -@@ -44,10 +44,12 @@ else() - ) - - install(DIRECTORY DESTINATION "bin") -+ install(FILES ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/bin RENAME wx-config -+ ) - install(CODE "execute_process( \ -- COMMAND ${CMAKE_COMMAND} -E create_symlink \ -- ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ -- ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ -+ COMMAND sh -c \"chmod u+x \ -+ ${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ - )" - ) - endif() -diff --git a/wx-config.in b/wx-config.in -index 441f88c..ca68a80 100644 ---- a/wx-config.in -+++ b/wx-config.in -@@ -402,7 +402,12 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } - - - # Determine the base directories we require. --prefix=${input_option_prefix-${this_prefix:-@prefix@}} -+base_folder=$(dirname $(readlink -f "$0")) -+if [ "@CMAKE_BUILD_TYPE@" = "Debug" ]; then -+ prefix=${input_option_prefix-${this_prefix:-${base_folder}/../../..}} -+else -+ prefix=${input_option_prefix-${this_prefix:-${base_folder}/../..}} -+fi - exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} - wxconfdir="@libdir@/wx/config" - diff --git a/overlay/ports/wxwidgets/fix-wxconfig-libs-output.patch b/overlay/ports/wxwidgets/fix-wxconfig-libs-output.patch deleted file mode 100644 index 37762f9165d055..00000000000000 --- a/overlay/ports/wxwidgets/fix-wxconfig-libs-output.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake -index 91d11ac..4e22ee9 100644 ---- a/build/cmake/config.cmake -+++ b/build/cmake/config.cmake -@@ -41,7 +41,40 @@ macro(wx_get_dependencies var lib) - endif() - set(dep_name "-l${dep_name}") - else() -- get_filename_component(dep_name ${dep} NAME) -+ if (CMAKE_BUILD_TYPE STREQUAL "Release") -+ # For "$<$:" -+ set(CONFIG_TYPE_INVERT "CONFIG:DEBUG>:") -+ else() -+ # For "$<$>:" -+ set(CONFIG_TYPE_INVERT "CONFIG:DEBUG>>:") -+ endif() -+ if (dep MATCHES "${CONFIG_TYPE_INVERT}") -+ continue() -+ endif() -+ string(REGEX REPLACE "^.+>:(.+)>$" "\\1" dep_path ${dep}) -+ if (NOT dep_path) -+ set(dep_name ${dep}) -+ else() -+ string(REGEX MATCH "^-.*$" ADDED_PREFIX ${dep_path}) -+ if (ADDED_PREFIX) -+ set(dep_name ${dep_path}) -+ else() -+ get_filename_component(abs_path ${dep_path} PATH) -+ if (NOT abs_path) -+ string(REGEX MATCH "^lib(.*).a$" CURR_STATIC_NAME ${dep_path}) -+ string(REGEX MATCH "^lib(.*).so$" CURR_DYNAMIC_NAME ${dep_path}) -+ if (CURR_STATIC_NAME) -+ set(dep_name "-l${CURR_STATIC_NAME}") -+ elseif (CURR_DYNAMIC_NAME) -+ set(dep_name "-l${CURR_DYNAMIC_NAME}") -+ else() -+ set(dep_name "-l${dep_path}") -+ endif() -+ else() -+ set(dep_name ${dep_path}) -+ endif() -+ endif() -+ endif() - endif() - wx_string_append(${var} "${dep_name} ") - endforeach() diff --git a/overlay/ports/wxwidgets/portfile.cmake b/overlay/ports/wxwidgets/portfile.cmake deleted file mode 100644 index 66134967e366f6..00000000000000 --- a/overlay/ports/wxwidgets/portfile.cmake +++ /dev/null @@ -1,117 +0,0 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO wxWidgets/wxWidgets - REF 9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1 #v3.1.5 - SHA512 33817f766b36d24e5e6f4eb7666f2e4c1ec305063cb26190001e0fc82ce73decc18697e8005da990a1c99dc1ccdac9b45bb2bbe5ba73e6e2aa860c768583314c - HEAD_REF master - PATCHES - disable-platform-lib-dir.patch - fix-build.patch - fix-wx-config-path.patch - fix-install-path.patch - export-targets.patch - fix-wxconfig-libs-output.patch # Remove this patch in the next update - fix-file-generate.patch # https://github.com/wxWidgets/wxWidgets/pull/2404 -) - -set(OPTIONS) -if(VCPKG_TARGET_IS_OSX) - set(OPTIONS -DCOTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=9999) -endif() - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL arm) - set(OPTIONS - -DwxUSE_OPENGL=OFF - -DwxUSE_STACKWALKER=OFF - ) -endif() - -# This may be set to ON by users in a custom triplet. -# wxUSE_STL=ON and wxUSE_STL=OFF are not API compatible which is why this must be set -# in a custom triplet rather than a port feature. -if(NOT DEFINED WXWIDGETS_USE_STL) - set(WXWIDGETS_USE_STL OFF) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DwxUSE_REGEX=builtin - -DwxUSE_ZLIB=sys - -DwxUSE_EXPAT=sys - -DwxUSE_LIBJPEG=sys - -DwxUSE_LIBPNG=sys - -DwxUSE_LIBTIFF=sys - -DwxUSE_STL=${WXWIDGETS_USE_STL} - -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON - ${OPTIONS} -) - -vcpkg_install_cmake() - -vcpkg_copy_pdbs() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-wxwidgets TARGET_PATH share/unofficial-wxwidgets) - -set(tools wxrc) -if(NOT VCPKG_TARGET_IS_WINDOWS) - list(APPEND tools wx-config wxrc-3.1) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - # Copy debug tools - vcpkg_copy_tools( - TOOL_NAMES ${tools} - SEARCH_DIR "${CURRENT_PACKAGES_DIR}/debug/bin" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug" - ) -endif() -vcpkg_copy_tools(TOOL_NAMES ${tools} AUTO_CLEAN) - -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") -endif() -foreach(INC IN LISTS INCLUDES) - file(READ "${INC}" _contents) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "defined(WXUSINGDLL)" "0" _contents "${_contents}") - else() - string(REPLACE "defined(WXUSINGDLL)" "1" _contents "${_contents}") - endif() - # Remove install prefix from setup.h to ensure package is relocatable - string(REGEX REPLACE "\n#define wxINSTALL_PREFIX [^\n]*" "\n#define wxINSTALL_PREFIX \"\"" _contents "${_contents}") - 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") - - 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) -endif() - -# Fix the abs path in wx-config -if (NOT VCPKG_TARGET_IS_WINDOWS) - file(READ "${CURRENT_PACKAGES_DIR}/tools/wxwidgets/wx-config" _contents) - string(REGEX REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REGEX REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - file(WRITE "${CURRENT_PACKAGES_DIR}/tools/wxwidgets/wx-config" "${_contents}") -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" - "${CURRENT_PACKAGES_DIR}/share/wxwidgets/vcpkg-cmake-wrapper.cmake" @ONLY) -file(INSTALL "${SOURCE_PATH}/docs/licence.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/overlay/ports/wxwidgets/setup.h.in b/overlay/ports/wxwidgets/setup.h.in deleted file mode 100644 index ad9579727c031d..00000000000000 --- a/overlay/ports/wxwidgets/setup.h.in +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef _DEBUG -#include "../../debug/lib/@WX_SETUP_H_DBG_RELATIVE@/setup.h" -#else -#include "../../lib/@WX_SETUP_H_REL_RELATIVE@/setup.h" -#endif diff --git a/overlay/ports/wxwidgets/usage b/overlay/ports/wxwidgets/usage deleted file mode 100644 index 98e0713e82fb22..00000000000000 --- a/overlay/ports/wxwidgets/usage +++ /dev/null @@ -1,6 +0,0 @@ -The package wxwidgets provides CMake integration: - - find_package(wxWidgets REQUIRED) - target_include_directories(main PRIVATE ${wxWidgets_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${wxWidgets_LIBRARIES}) - target_compile_options(main PRIVATE ${wxWidgets_FLAGS}) diff --git a/overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake b/overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 55557b36097a05..00000000000000 --- a/overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,25 +0,0 @@ -set(wxWidgets_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../.." CACHE INTERNAL "" FORCE) -set(WX_ROOT_DIR "${wxWidgets_ROOT_DIR}") -set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib" CACHE INTERNAL "" FORCE) -set(WX_LIB_DIR "${wxWidgets_LIB_DIR}") -find_library(WX_based NAMES wxbase31ud PATHS "${wxWidgets_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH) -file(GLOB WX_DEBUG_LIBS "${wxWidgets_ROOT_DIR}/debug/lib/wx*d_*.lib") -foreach(WX_DEBUG_LIB ${WX_DEBUG_LIBS}) - string(REGEX REPLACE ".*wx([^/]*)d_([^/\\.]*)\\.[^/\\.]*\$" "WX_\\2d" varname "${WX_DEBUG_LIB}") - set(${varname} "${WX_DEBUG_LIB}" CACHE INTERNAL "" FORCE) -endforeach() -_find_package(${ARGS}) -find_package(ZLIB QUIET) -find_package(libpng CONFIG QUIET) -find_package(TIFF QUIET) -find_package(expat CONFIG QUIET) - -if(wxWidgets_LIBRARIES AND NOT wxWidgets_LIBRARIES MATCHES "TIFF::TIFF;png;expat::expat;ZLIB::ZLIB") - list(APPEND wxWidgets_LIBRARIES "TIFF::TIFF;expat::expat;ZLIB::ZLIB") - - if (TARGET png) - list(APPEND wxWidgets_LIBRARIES "png") - elseif(TARGET png_static) - list(APPEND wxWidgets_LIBRARIES "png_static") - endif() -endif() diff --git a/overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake.in b/overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake.in deleted file mode 100644 index 680b303f090a6b..00000000000000 --- a/overlay/ports/wxwidgets/vcpkg-cmake-wrapper.cmake.in +++ /dev/null @@ -1,22 +0,0 @@ -_find_package(unofficial-wxwidgets CONFIG REQUIRED) - -set(wxWidgets_FOUND 1) -file(GLOB WX_TARGETS ${CMAKE_CURRENT_LIST_DIR}/../unofficial-wxwidgets/unofficial*Targets.cmake) -foreach(WX_TARGET ${WX_TARGETS}) - get_filename_component(TARGET_FILE ${WX_TARGET} NAME) - string(REGEX REPLACE "unofficial-(.+)Targets.cmake" "wx::\\1" TARGET_NAME ${TARGET_FILE}) - list(APPEND wxWidgets_LIBRARIES ${TARGET_NAME}) -endforeach() - -get_target_property(wxWidgets_INCLUDE_DIR wx::wxbase INTERFACE_INCLUDE_DIRECTORIES) -set(wxWidgets_INCLUDE_DIRS ${wxWidgets_INCLUDE_DIR}) - -# Get extra cpp flags -if (UNIX) - execute_process( - COMMAND @CURRENT_INSTALLED_DIR@/tools/wxwidgets/wx-config@VCPKG_TARGET_EXECUTABLE_SUFFIX@ --cxxflags - OUTPUT_VARIABLE OUTPUT_FLAGS - ) - - string(REGEX MATCHALL "(-D[^ ]+)" wxWidgets_FLAGS "${OUTPUT_FLAGS}") -endif() \ No newline at end of file diff --git a/overlay/ports/wxwidgets/vcpkg.json b/overlay/ports/wxwidgets/vcpkg.json deleted file mode 100644 index 540e2147fc7923..00000000000000 --- a/overlay/ports/wxwidgets/vcpkg.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "wxwidgets", - "version-semver": "3.1.5", - "port-version": 3, - "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." - ], - "homepage": "https://github.com/wxWidgets/wxWidgets", - "supports": "!uwp", - "dependencies": [ - "expat", - "libpng", - "tiff", - "zlib" - ] -}